Index: frontends/php/include/views/configuration.graph.edit.php
===================================================================
--- frontends/php/include/views/configuration.graph.edit.php (revision 30453)
+++ frontends/php/include/views/configuration.graph.edit.php (working copy)
@@ -65,12 +65,15 @@
$itemsTable->setHeader(array(
new CCol(SPACE, null, null, 15),
new CCol(SPACE, null, null, 15),
- new CCol(_('Name'), null, null, ($this->data['graphtype'] != GRAPH_TYPE_NORMAL) ? 360 : 280),
+ new CCol(_('Name'), null, null,
+ ($this->data['graphtype'] != GRAPH_TYPE_NORMAL && $this->data['graphtype'] != GRAPH_TYPE_NORMAL_LOGARITHMIC) ? 360 : 280),
($this->data['graphtype'] == GRAPH_TYPE_PIE || $this->data['graphtype'] == GRAPH_TYPE_EXPLODED)
? new CCol(_('Type'), null, null, 80) : null,
new CCol(_('Function'), null, null, 80),
- ($this->data['graphtype'] == GRAPH_TYPE_NORMAL) ? new CCol(_('Draw style'), 'nowrap', null, 80) : null,
- ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_STACKED)
+ ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_NORMAL_LOGARITHMIC)
+ ? new CCol(_('Draw style'), 'nowrap', null, 80) : null,
+ ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_NORMAL_LOGARITHMIC
+ || $this->data['graphtype'] == GRAPH_TYPE_STACKED || $this->data['graphtype'] == GRAPH_TYPE_STACKED_LOGARITHMIC)
? new CCol(_('Y axis side'), 'nowrap', null, 80) : null,
new CCol(_('Colour'), null, null, 100),
new CCol(_('Action'), null, null, 50)
@@ -126,11 +129,12 @@
$graphFormList->addRow(_('Show legend'), new CCheckBox('legend', $this->data['legend'], null, 1));
// append graph types to form list
-if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_STACKED) {
+if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_NORMAL_LOGARITHMIC
+ || $this->data['graphtype'] == GRAPH_TYPE_STACKED || $this->data['graphtype'] == GRAPH_TYPE_STACKED_LOGARITHMIC) {
$graphFormList->addRow(_('Show working time'), new CCheckBox('showworkperiod', $this->data['showworkperiod'], null, 1));
$graphFormList->addRow(_('Show triggers'), new CCheckBox('showtriggers', $this->data['showtriggers'], null, 1));
- if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL) {
+ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_NORMAL_LOGARITHMIC) {
if (is_numeric($this->data['percent_left'])) {
$this->data['percent_left'] = sprintf('%2.2f', $this->data['percent_left']);
}
@@ -260,6 +264,7 @@
'&srcfld2=name", 0, 0, "zbx_popup_item");',
'formlist'
);
+ $graphFormList->addRow(_('Y axis MAX value'), $yaxisMaxData);
}
}
else {
Index: frontends/php/include/views/js/configuration.graph.edit.js.php
===================================================================
--- frontends/php/include/views/js/configuration.graph.edit.js.php (revision 30453)
+++ frontends/php/include/views/js/configuration.graph.edit.js.php (working copy)
@@ -41,7 +41,7 @@
- data['graphtype'] == GRAPH_TYPE_NORMAL): ?>
+ data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_NORMAL_LOGARITHMIC): ?>
@@ -52,7 +52,7 @@
- data['graphtype'] == GRAPH_TYPE_NORMAL): ?>
+ data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] == GRAPH_TYPE_NORMAL_LOGARITHMIC): ?>
|