From e1ea3a97ea89b02651579f813413c0044c6421ed Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 31 May 2017 14:04:34 +0200 Subject: [PATCH 1/7] added templates panel for suggestions --- src/TracyPanel/Panel/TemplatesPanel.php | 69 +++++++++++++++++++++++++ src/TracyPanel/Plugin.php | 1 + vqmod/xml/tracy.xml | 28 ++++++++-- 3 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 src/TracyPanel/Panel/TemplatesPanel.php diff --git a/src/TracyPanel/Panel/TemplatesPanel.php b/src/TracyPanel/Panel/TemplatesPanel.php new file mode 100644 index 0000000..5427592 --- /dev/null +++ b/src/TracyPanel/Panel/TemplatesPanel.php @@ -0,0 +1,69 @@ + {$this->title}"; + } + + /** + * Renders HTML code for custom panel. + * @return string + */ + public function getPanel() + { + $output = "

{$this->title}

+
+ + + + + + + "; + + $total = sizeof($this->getLog()); + foreach ($this->getLog() as $key => $tpl) + { + $output.=" + + + "; + } + + $output.=" + + + + + + +
template name
{$tpl}
Total: {$total} files
+
"; + + return $output; + } +} diff --git a/src/TracyPanel/Plugin.php b/src/TracyPanel/Plugin.php index 03ca438..a4deee4 100644 --- a/src/TracyPanel/Plugin.php +++ b/src/TracyPanel/Plugin.php @@ -14,6 +14,7 @@ public function __construct() Debugger::getBar() ->addPanel(new \TracyPanel\SystemPanel()) ->addPanel(new \TracyPanel\SqlPanel()) + ->addPanel(new \TracyPanel\TemplatesPanel()) ->addPanel(new \TracyPanel\VariablePanel()) ; } diff --git a/vqmod/xml/tracy.xml b/vqmod/xml/tracy.xml index e7a4e93..1c6b465 100644 --- a/vqmod/xml/tracy.xml +++ b/vqmod/xml/tracy.xml @@ -23,13 +23,26 @@ // register opencart panels $panels = new TracyPanel\Plugin(); + } + ]]> + + + - } else { + + + + render($route . '.tpl');]]> + + + ' . $output . ''; - } - ]]> + } + ]]> @@ -61,7 +74,7 @@ - + set('session', $session); + + // clear last session about Tracy + if(isset($_SESSION['_tracy']['templates_log'])) { + unset($_SESSION['_tracy']['templates_log']); + } ]]> From 01c77b0e2e3d3e13c30e9f36a061044385892052 Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 31 May 2017 14:12:58 +0200 Subject: [PATCH 2/7] renamed panel --- src/TracyPanel/Panel/TemplatesPanel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TracyPanel/Panel/TemplatesPanel.php b/src/TracyPanel/Panel/TemplatesPanel.php index 5427592..eca403a 100644 --- a/src/TracyPanel/Panel/TemplatesPanel.php +++ b/src/TracyPanel/Panel/TemplatesPanel.php @@ -7,7 +7,7 @@ class TemplatesPanel implements IBarPanel { /** @var string */ - private $title = "Templates suggestion"; + private $title = "Templates"; /** @var string */ private $icon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADWSURBVDjLlZNNCsIwEEZzKW/jyoVbD+Aip/AGgmvRldCKNxDBv4LSfSG7kBZix37BQGiapA48ZpjMvIZAGRExwDmnESw7MMvsHnMFTdOQUsqjrmtXsggKEEVReCDseZc/HbOgoCxLDytwUEFBVVUe/fjNDguEEFGSAiml4Xq+DdZJAV78sM1oOpnT/fI0oEYPZ0lBtjuaBWSttcHtRQWvx9sMrlcb7+HQwxlmojfI9ycziGyj34sK3AV8zd7KFSYFCCwO1aMFsQgK8DO1bRsFM0HBP9i9L2ONMKHNZV7xAAAAAElFTkSuQmCC"; @@ -26,7 +26,7 @@ private function getLog() */ public function getTab() { - return " {$this->title}"; + return " {$this->title} (" . sizeof($this->getLog()) . ")"; } /** From 296d4363d8c1234f828659a3fa4cd0c29b50fcfa Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 31 May 2017 14:18:17 +0200 Subject: [PATCH 3/7] commented html changes about templates, think about better solution --- vqmod/xml/tracy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vqmod/xml/tracy.xml b/vqmod/xml/tracy.xml index 1c6b465..5f151f8 100644 --- a/vqmod/xml/tracy.xml +++ b/vqmod/xml/tracy.xml @@ -39,7 +39,7 @@ if (!empty($_SESSION[$_COOKIE['default']]['user_id'])) { $_SESSION['_tracy']['templates_log'][] = $route; - $output = '' . $output . ''; + //$output = '' . $output . ''; } ]]> From 7c049e345ca214e7a10f20a3d2724e862910657c Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 7 Jun 2017 14:13:48 +0200 Subject: [PATCH 4/7] removed condition to user login --- vqmod/xml/tracy.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/vqmod/xml/tracy.xml b/vqmod/xml/tracy.xml index 5f151f8..b447129 100644 --- a/vqmod/xml/tracy.xml +++ b/vqmod/xml/tracy.xml @@ -36,12 +36,8 @@ ' . $output . ''; - - } + $_SESSION['_tracy']['templates_log'][] = $route; + $output = '' . $output . ''; ]]> From 55f559064eaf52605c04388f901b7476b22d52f5 Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 7 Jun 2017 14:28:35 +0200 Subject: [PATCH 5/7] removed html suggestions right now --- vqmod/xml/tracy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vqmod/xml/tracy.xml b/vqmod/xml/tracy.xml index b447129..4299d30 100644 --- a/vqmod/xml/tracy.xml +++ b/vqmod/xml/tracy.xml @@ -37,7 +37,7 @@ ' . $output . ''; + //$output = '' . $output . ''; ]]> From 379f7be9b4040246c10ab4e80c994ea6099dd036 Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 7 Jun 2017 14:30:13 +0200 Subject: [PATCH 6/7] fixed session undefined index --- src/TracyPanel/Panel/TemplatesPanel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TracyPanel/Panel/TemplatesPanel.php b/src/TracyPanel/Panel/TemplatesPanel.php index eca403a..043b52a 100644 --- a/src/TracyPanel/Panel/TemplatesPanel.php +++ b/src/TracyPanel/Panel/TemplatesPanel.php @@ -17,7 +17,7 @@ class TemplatesPanel implements IBarPanel */ private function getLog() { - return $_SESSION['_tracy']['templates_log']; + return isset($_SESSION['_tracy']['templates_log']) ? $_SESSION['_tracy']['templates_log'] : array(); } /** From 8ab4cc2d60a1710301d84a4d89ee22978b891a3b Mon Sep 17 00:00:00 2001 From: Michal Landsman Date: Wed, 7 Jun 2017 15:34:06 +0200 Subject: [PATCH 7/7] moved tracy start from startup.php to framework.php - problem with AJAX tracy vs. session start --- vqmod/xml/tracy.xml | 48 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/vqmod/xml/tracy.xml b/vqmod/xml/tracy.xml index 4299d30..b0407d0 100644 --- a/vqmod/xml/tracy.xml +++ b/vqmod/xml/tracy.xml @@ -5,30 +5,6 @@ 2.6.0 Michal Landsman - - - - - - - - - - - @@ -37,7 +13,8 @@ ' . $output . ''; + // todo: think about this for future - some javascript tooltips + // $output = '' . $output . ''; ]]> @@ -90,6 +67,27 @@ ]]> + + + + + + + +