diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-07-22 17:47:38 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-07-22 17:47:38 +0000 |
| commit | 60b70ebb2393adb34d7dc3166954fafb23ecccde (patch) | |
| tree | a43839a56cb902365ccceaf49a3be370a7337bd5 | |
| parent | af05d3f623c44cd6fcc90c5804a5d9cd9e7528b4 (diff) | |
| download | zabbix-60b70ebb2393adb34d7dc3166954fafb23ecccde.tar.gz zabbix-60b70ebb2393adb34d7dc3166954fafb23ecccde.tar.xz zabbix-60b70ebb2393adb34d7dc3166954fafb23ecccde.zip | |
Minor changes
git-svn-id: svn://svn.zabbix.com/trunk@142 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | frontends/php/actions.html | 4 | ||||
| -rw-r--r-- | frontends/php/alerts.html | 2 | ||||
| -rw-r--r-- | frontends/php/hosts.html | 2 | ||||
| -rw-r--r-- | frontends/php/tr_status.html | 4 |
5 files changed, 8 insertions, 7 deletions
@@ -1,8 +1,9 @@ Changes for 1.0alpha8: + - status of triggers will not be shown for disabled and not-supported parameters + - fixed availability report - optimization of chart.html - - added trend.html - added trends.html - improved performance of network map diff --git a/frontends/php/actions.html b/frontends/php/actions.html index 528d343d..a3888967 100644 --- a/frontends/php/actions.html +++ b/frontends/php/actions.html @@ -126,7 +126,7 @@ { $good=1; $delay=30; - $subject=""; + $subject=$description; $message=""; } echo "<br>"; @@ -182,7 +182,7 @@ show_table2_v_delimiter(); echo "Message"; show_table2_h_delimiter(); - echo "<input name=\"message\" value=\"$message\" size=50>"; + echo "<textarea name=\"message\" cols=50 ROWS=\"5\" wrap=\"soft\">$message</TEXTAREA>"; show_table2_v_delimiter2(); echo "<input type=\"submit\" name=\"register\" value=\"add\">"; diff --git a/frontends/php/alerts.html b/frontends/php/alerts.html index 231bb852..679cfe88 100644 --- a/frontends/php/alerts.html +++ b/frontends/php/alerts.html @@ -41,7 +41,7 @@ echo "<TR>"; echo "<TD WIDTH=\"10%\"><FONT SIZE=+1>Time</FONT></TD>"; echo "<TD WIDTH=\"5%\"><FONT SIZE=+1>Type</FONT></TD>"; - echo "<TD><FONT SIZE=+1>Send to</FONT></TD>"; + echo "<TD WIDTH=\"15%\"><FONT SIZE=+1>Send to</FONT></TD>"; echo "<TD><FONT SIZE=+1>Subject</FONT></TD>"; echo "<TD><FONT SIZE=+1>Message</FONT></TD>"; echo "</TR>"; diff --git a/frontends/php/hosts.html b/frontends/php/hosts.html index be745194..1d0eb4e4 100644 --- a/frontends/php/hosts.html +++ b/frontends/php/hosts.html @@ -98,7 +98,7 @@ echo "</select>"; show_table2_v_delimiter(); - echo "Add items supported by zabbix_agent"; + echo "Add parameters supported by zabbix_agent"; show_table2_h_delimiter(); echo "<INPUT TYPE=\"CHECKBOX\" CHECKED "; echo " NAME=\"template\" VALUE=\"true\">"; diff --git a/frontends/php/tr_status.html b/frontends/php/tr_status.html index 219d8d16..7d4006a2 100644 --- a/frontends/php/tr_status.html +++ b/frontends/php/tr_status.html @@ -147,11 +147,11 @@ if($onlytrue=='true') { - $result=DBselect("select t.triggerid,t.istrue,t.description,t.lastcheck,t.expression,t.priority,t.lastchange,t.comments from triggers t,hosts h,items i,functions f where t.istrue=1 and f.itemid=i.itemid and h.hostid=i.hostid and t.triggerid=f.triggerid $cond order by t.priority desc, t.description"); + $result=DBselect("select t.triggerid,t.istrue,t.description,t.lastcheck,t.expression,t.priority,t.lastchange,t.comments from triggers t,hosts h,items i,functions f where t.istrue=1 and f.itemid=i.itemid and h.hostid=i.hostid and t.triggerid=f.triggerid and i.status in (0,2) $cond order by t.priority desc, t.description"); } else { - $result=DBselect("select t.triggerid,t.istrue,t.description,t.lastcheck,t.expression,t.priority,t.lastchange,t.comments from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.triggerid=f.triggerid $cond order by t.priority desc, t.description"); + $result=DBselect("select t.triggerid,t.istrue,t.description,t.lastcheck,t.expression,t.priority,t.lastchange,t.comments from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.triggerid=f.triggerid and i.status in (0,2) $cond order by t.priority desc, t.description"); } $col=0; for($i=0;$i<DBnum_rows($result);$i++) |