diff options
| author | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-18 03:17:13 +0000 |
|---|---|---|
| committer | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-18 03:17:13 +0000 |
| commit | f7c2b61c66cc33bb15842c4db07b145ace7ba7e9 (patch) | |
| tree | 82d878bee71b96b3ecd66eacfb1bf97788754c7d /frontends/php/screens.php | |
| parent | 715779b96fa92ec73fdb4e5d58791af6bb2e5683 (diff) | |
| download | zabbix-f7c2b61c66cc33bb15842c4db07b145ace7ba7e9.tar.gz zabbix-f7c2b61c66cc33bb15842c4db07b145ace7ba7e9.tar.xz zabbix-f7c2b61c66cc33bb15842c4db07b145ace7ba7e9.zip | |
Added preliminary host and user bulk loader. Still a lot more needs to be added.
zabbix/frontends/php/include/bulkloader.inc.php
zabbix/frontends/php/include/config.inc.php
zabbix/frontends/php/bulkloader.php
Applied SNMPv3 fix
zabbix/src/zabbix_server/poller/poller.c
zabbix/src/zabbix_server/poller/checks_snmp.c
Applied graph dropdown patch
zabbix/frontends/php/charts.php
zabbix/frontends/php/history.php
zabbix/frontends/php/screens.php
zabbix/frontends/php/include/graphs.inc.php
git-svn-id: svn://svn.zabbix.com/trunk@2334 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/screens.php')
| -rw-r--r-- | frontends/php/screens.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/frontends/php/screens.php b/frontends/php/screens.php index b3748a07..832a9a75 100644 --- a/frontends/php/screens.php +++ b/frontends/php/screens.php @@ -39,7 +39,7 @@ ?> <?php - navigation_bar_calc(); + $effectiveperiod=navigation_bar_calc(); ?> <?php @@ -155,11 +155,13 @@ { if($resource == 0) { - echo "<a href=charts.php?graphid=$resourceid><img src='chart2.php?graphid=$resourceid&width=$width&height=$height&".url_param("period").url_param("from")."border=0' border=0></a>"; + echo "<a href=charts.php?graphid=$resourceid".url_param("period").url_param("inc").url_param("dec")."><img src='chart2.php?graphid=$resourceid&width=$width&height=$height&period=$effectiveperiod".url_param("from")."border=0' border=0></a>"; + //echo "<a href=charts.php?graphid=$resourceid><img src='chart2.php?graphid=$resourceid&width=$width&height=$height&".url_param("period").url_param("from")."border=0' border=0></a>"; } else if($resource == 1) { - echo "<a href=history.php?action=showhistory&itemid=$resourceid><img src='chart.php?itemid=$resourceid&width=$width&height=$height&".url_param("period").url_param("from")."border=0' border=0></a>"; + echo "<a href=history.php?action=showhistory&itemid=$resourceid".url_param("period").url_param("inc").url_param("dec")."><img src='chart.php?itemid=$resourceid&width=$width&height=$height&period=$effectiveperiod".url_param("from")."border=0' border=0></a>"; + //echo "<a href=history.php?action=showhistory&itemid=$resourceid><img src='chart.php?itemid=$resourceid&width=$width&height=$height&".url_param("period").url_param("from")."border=0' border=0></a>"; } else if($resource == 2) { |