diff options
| author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-07-12 07:22:36 +0400 |
|---|---|---|
| committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-07-12 07:22:36 +0400 |
| commit | c792ca8e35f1d104bbd16cdcc9f93708f31d9f6c (patch) | |
| tree | 058286136d242f43d4b3de633fc4b8ae8b9e2966 /plugins | |
| parent | 55f487ca9503a134f7414cd7a1e515fcc80ddc30 (diff) | |
Refs #4041, make getVisitorLog.twig more like _dataTable.twig.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Live/Controller.php | 8 | ||||
| -rw-r--r-- | plugins/Live/Live.php | 2 | ||||
| -rw-r--r-- | plugins/Live/templates/getVisitorLog.twig | 7 | ||||
| -rw-r--r-- | plugins/Live/templates/indexVisitorLog.twig | 3 |
4 files changed, 14 insertions, 6 deletions
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index 2c05998497..53e7083d61 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -73,6 +73,14 @@ class Piwik_Live_Controller extends Piwik_Controller } echo $rendered; } + + public function indexVisitorLog() + { + $view = new Piwik_View('@Live/indexVisitorLog.twig'); + $view->filterEcommerce = Piwik_Common::getRequestVar('filterEcommerce', 0, 'int'); + $view->visitorLog = $this->getVisitorLog($fetch = true); + echo $view->render(); + } public function getVisitorLog($fetch = false) { diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index 95a86d96e2..72c849c4e4 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -47,7 +47,7 @@ class Piwik_Live extends Piwik_Plugin function addMenu() { - Piwik_AddMenu('General_Visitors', 'Live_VisitorLog', array('module' => 'Live', 'action' => 'getVisitorLog'), true, $order = 5); + Piwik_AddMenu('General_Visitors', 'Live_VisitorLog', array('module' => 'Live', 'action' => 'indexVisitorLog'), true, $order = 5); } public function addWidget() diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig index 49ca33f796..4294dbfa06 100644 --- a/plugins/Live/templates/getVisitorLog.twig +++ b/plugins/Live/templates/getVisitorLog.twig @@ -2,11 +2,8 @@ data-report="{{ properties.report_id }}" data-params="{{ javascriptVariablesToSet|json_encode }}"> -{% if not isWidget %} - <h2>{% if javascriptVariablesToSet.filterEcommerce %}{{ 'Goals_EcommerceLog'|translate }}{% else %}{{ 'Live_VisitorLog'|translate }}{% endif %}</h2> - {% if reportDocumentation is not empty %} - <div class="reportDocumentation"><p>{{ reportDocumentation|raw }}</p></div> - {% endif %} +{% if reportDocumentation is not empty %} + <div class="reportDocumentation"><p>{{ reportDocumentation|raw }}</p></div> {% endif %} {% set displayVisitorsInOwnColumn %}{% if isWidget %}0{% else %}1{% endif %}{% endset %} diff --git a/plugins/Live/templates/indexVisitorLog.twig b/plugins/Live/templates/indexVisitorLog.twig new file mode 100644 index 0000000000..f19ac34eea --- /dev/null +++ b/plugins/Live/templates/indexVisitorLog.twig @@ -0,0 +1,3 @@ +<h2>{% if filterEcommerce %}{{ 'Goals_EcommerceLog'|translate }}{% else %}{{ 'Live_VisitorLog'|translate }}{% endif %}</h2> + +{{ visitorLog|raw }} |