Merge pull request #165 from Thomas-Gelf/fix/zoom-for-special-pages

controllers/page|special: use zgraph dimensions
lingej · Mar 20, 2021 · 442c666 · 442c666
2 parents 3f3c8ec + 796afe5
commit 442c666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/share/pnp/application/controllers/page.php b/share/pnp/application/controllers/page.php
@@ -13,8 +13,8 @@ public function __construct(){
         $this->template                = $this->add_view('template');
         $this->template->page          = $this->add_view('page');
         $this->template->zoom_header   = $this->add_view('zoom_header');
-        $this->template->zoom_header->graph_width  = ($this->config->conf['graph_width'] + 140);
-        $this->template->zoom_header->graph_height = ($this->config->conf['graph_height'] + 230);
+        $this->template->zoom_header->graph_width  = ($this->config->conf['zgraph_width'] + 140);
+        $this->template->zoom_header->graph_height = ($this->config->conf['zgraph_height'] + 230);
         $this->template->page->graph_content  = $this->add_view('graph_content');
         $this->template->page->graph_content->graph_width = ($this->config->conf['graph_width'] + 85);
         $this->template->page->graph_content->timerange_select = $this->add_view('timerange_select');

diff --git a/share/pnp/application/controllers/special.php b/share/pnp/application/controllers/special.php
@@ -25,8 +25,8 @@ public function __construct()
     public function index(){
 	$this->url = "?tpl=".$this->tpl;
         $this->template->zoom_header   = $this->add_view('zoom_header');
-        $this->template->zoom_header->graph_width  = ($this->config->conf['graph_width'] + 140);
-        $this->template->zoom_header->graph_height = ($this->config->conf['graph_height'] + 230);
+        $this->template->zoom_header->graph_width  = ($this->config->conf['zgraph_width'] + 140);
+        $this->template->zoom_header->graph_height = ($this->config->conf['zgraph_height'] + 230);
         $this->template->graph->graph_content = $this->add_view('graph_content_special');
         $this->template->graph->graph_content->graph_width = ($this->config->conf['graph_width'] + 85);
         $this->template->graph->graph_content->timerange_select = $this->add_view('timerange_select');