diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-26 12:46:19 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-26 12:46:19 +0000 |
| commit | 9d240eca134c2433ac0a548a2b7fbe1fccc7c66d (patch) | |
| tree | cd3d46256d09ca370f385dccf2082d0d33d96e78 /frontends/php/include | |
| parent | 63ce91166a8ecd8550db063ba9d9d914ec270e4c (diff) | |
| download | zabbix-9d240eca134c2433ac0a548a2b7fbe1fccc7c66d.tar.gz zabbix-9d240eca134c2433ac0a548a2b7fbe1fccc7c66d.tar.xz zabbix-9d240eca134c2433ac0a548a2b7fbe1fccc7c66d.zip | |
- [DEV-177] added checkbox range selection (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5800 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/classes/chart.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/page_footer.php | 7 | ||||
| -rw-r--r-- | frontends/php/include/page_header.php | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/frontends/php/include/classes/chart.inc.php b/frontends/php/include/classes/chart.inc.php index d1565831..d1d69b88 100644 --- a/frontends/php/include/classes/chart.inc.php +++ b/frontends/php/include/classes/chart.inc.php @@ -728,8 +728,7 @@ class Chart extends Graph{ ' AND clock<='.$to_time. ' GROUP BY itemid,'.$calc_field ); - -// $this->items[$i]['delay'] = max(($this->items[$i]['delay']*ZBX_GRAPH_MAX_DELAY),ZBX_MAX_TREND_DIFF)/ZBX_GRAPH_MAX_DELAY + 1; + $this->items[$i]['delay'] = max($this->items[$i]['delay'],3600); } //SDI($sql_arr); diff --git a/frontends/php/include/page_footer.php b/frontends/php/include/page_footer.php index 042d0ab3..a7e749d5 100644 --- a/frontends/php/include/page_footer.php +++ b/frontends/php/include/page_footer.php @@ -48,6 +48,13 @@ function zbxCallPostScripts(){ } ?> } + +//try{ + chkbx_range_ext.init(); +//} +//catch(e){ +// throw('Chekbox extension failed!'); +//} --> </script> <?php diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 87526d15..57372097 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -409,6 +409,7 @@ COpt::profiling_start("page"); <script type="text/javascript" src="js/common.js"></script> <script type="text/javascript" src="js/prototype.js"></script> <script type="text/javascript" src="js/url.js"></script> + <script type="text/javascript" src="js/chkbxrange.js"></script> <?php if(isset($page['scripts']) && is_array($page['scripts'])){ foreach($page['scripts'] as $id => $script){ |
