summaryrefslogtreecommitdiffstats
path: root/frontends/php/charts.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-17 15:02:02 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-17 15:02:02 +0000
commitb82812f00576369e65c996ef51264de66ce63d57 (patch)
treea3ba8c407e03edd1905f591aa2d14bf32acc4f9b /frontends/php/charts.php
parentcd6be85dfcfccb202f2d2a9ca9db062725e45d5c (diff)
downloadzabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.gz
zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.xz
zabbix-b82812f00576369e65c996ef51264de66ce63d57.zip
- [DEV-137] fixes in graph zoom for KQ (Artem)
- [DEV-137] fixes for possible errors under Oracle (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5632 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/charts.php')
-rw-r--r--frontends/php/charts.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index c0002264..10e7b8ec 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -367,9 +367,10 @@ include_once 'include/page_header.php';
A_SBOX["'.$dom_graph_id.'"].shiftT = 17;
A_SBOX["'.$dom_graph_id.'"].shiftL = '.$shiftXleft.';
- var ZBX_G_WIDTH = get_bodywidth();
+ var ZBX_G_WIDTH = get_bodywidth();
+ if(!is_number(ZBX_G_WIDTH)) ZBX_G_WIDTH = 900;
+
ZBX_G_WIDTH-= parseInt('.($shiftXleft+$shiftXright).'+parseInt((SF)?27:27));
- //ZBX_G_WIDTH-= '.($shiftXleft+$shiftXright+27).';
document.write(\'<img id="'.$dom_graph_id.'" src="chart2.php?graphid='.$_REQUEST['graphid'].url_param('stime').
'&period='.$effectiveperiod.'&width=\'+ZBX_G_WIDTH+\'" /><br />\');
@@ -395,10 +396,10 @@ include_once 'include/page_header.php';
$script = 'scrollinit(0,0,0,'.$effectiveperiod.','.$stime.',0,'.$bstime.'); showgraphmenu("graph");';
- if(($graphtype == GRAPH_TYPE_NORMAL) || ($graphtype == GRAPH_TYPE_STACKED)){
+ if(($graphtype == GRAPH_TYPE_NORMAL) || ($graphtype == GRAPH_TYPE_STACKED)){
$script.= 'graph_zoom_init("'.$dom_graph_id.'",'.$bstime.','.$effectiveperiod.',ZBX_G_WIDTH,'.$graph_height.');';
}
-
+
zbx_add_post_js($script);
// navigation_bar('charts.php',array('groupid','hostid','graphid'));
//-------------