generate pages instead of implementing them in each controller

8 files changed, 44 insertions, 69 deletions

diff --git a/plugins/VisitTime/Categories/TimesSubcategory.php b/plugins/VisitTime/Categories/TimesSubcategory.php
new file mode 100644
index 0000000000..220a568ad3
--- /dev/null
+++ b/plugins/VisitTime/Categories/TimesSubcategory.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\VisitTime\Categories;
+
+use Piwik\Category\Subcategory;
+
+class TimesSubcategory extends Subcategory
+{
+    protected $categoryId = 'General_Visitors';
+    protected $id = 'VisitTime_SubmenuTimes';
+    protected $order = 35;
+
+}
diff --git a/plugins/VisitTime/Controller.php b/plugins/VisitTime/Controller.php
deleted file mode 100644
index 08af238213..0000000000
--- a/plugins/VisitTime/Controller.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\VisitTime;
-
-use Piwik\View;
-
-/**
- *
- */
-class Controller extends \Piwik\Plugin\Controller
-{
-    public function index()
-    {
-        $view = new View('@VisitTime/index');
-        $view->dataTableVisitInformationPerLocalTime = $this->renderReport('getVisitInformationPerLocalTime');
-        $view->dataTableVisitInformationPerServerTime = $this->renderReport('getVisitInformationPerServerTime');
-        return $view->render();
-    }
-}
diff --git a/plugins/VisitTime/Menu.php b/plugins/VisitTime/Menu.php
deleted file mode 100644
index ffa3a5b015..0000000000
--- a/plugins/VisitTime/Menu.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\VisitTime;
-
-use Piwik\Menu\MenuReporting;
-
-class Menu extends \Piwik\Plugin\Menu
-{
-    public function configureReportingMenu(MenuReporting $menu)
-    {
-        $menu->addVisitorsItem('VisitTime_SubmenuTimes', $this->urlForAction('index'), $order = 65);
-    }
-}
diff --git a/plugins/VisitTime/Reports/Base.php b/plugins/VisitTime/Reports/Base.php
index 89b553cd44..2dfbf0e169 100644
--- a/plugins/VisitTime/Reports/Base.php
+++ b/plugins/VisitTime/Reports/Base.php
@@ -15,7 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report
 {
     protected function init()
     {
-        $this->category = 'VisitsSummary_VisitsSummary';
+        $this->categoryId = 'General_Visitors';
     }
 
     public function getDefaultTypeViewDataTable()
diff --git a/plugins/VisitTime/Reports/GetByDayOfWeek.php b/plugins/VisitTime/Reports/GetByDayOfWeek.php
index d9a3a58ee8..a93c6f21ee 100644
--- a/plugins/VisitTime/Reports/GetByDayOfWeek.php
+++ b/plugins/VisitTime/Reports/GetByDayOfWeek.php
@@ -14,6 +14,7 @@ use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\VisitTime\Columns\DayOfTheWeek;
 use Piwik\Period;
+use Piwik\Plugin\Reports;
 use Piwik\Site;
 
 class GetByDayOfWeek extends Base
@@ -28,7 +29,7 @@ class GetByDayOfWeek extends Base
         $this->documentation = Piwik::translate('VisitTime_WidgetByDayOfWeekDocumentation');
         $this->constantRowsCount = true;
         $this->order = 25;
-        $this->widgetTitle  = 'VisitTime_VisitsByDayOfWeek';
+        $this->subcategoryId = 'VisitTime_SubmenuTimes';
     }
 
     public function configureView(ViewDataTable $view)
@@ -73,4 +74,11 @@ class GetByDayOfWeek extends Base
         }
         return $dateRange;
     }
+
+    public function getRelatedReports()
+    {
+        return array(
+            Reports::factory('VisitTime', 'getVisitInformationPerLocalTime')
+        );
+    }
 }
diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php
index 6546463cd1..9372875619 100644
--- a/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php
+++ b/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php
@@ -13,6 +13,7 @@ use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\VisitTime\Columns\LocalTime;
+use Piwik\Plugin\Reports;
 
 class GetVisitInformationPerLocalTime extends Base
 {
@@ -23,11 +24,12 @@ class GetVisitInformationPerLocalTime extends Base
     {
         parent::init();
         $this->dimension     = new LocalTime();
-        $this->name          = Piwik::translate('VisitTime_WidgetLocalTime');
+        $this->name          = Piwik::translate('VisitTime_LocalTime');
         $this->documentation = Piwik::translate('VisitTime_WidgetLocalTimeDocumentation', array('<strong>', '</strong>'));
         $this->constantRowsCount = true;
-        $this->order = 20;
-        $this->widgetTitle  = 'VisitTime_WidgetLocalTime';
+        $this->order = 15;
+
+        $this->subcategoryId = 'VisitTime_SubmenuTimes';
     }
 
     public function configureView(ViewDataTable $view)
@@ -42,10 +44,12 @@ class GetVisitInformationPerLocalTime extends Base
         if ($view->isViewDataTableId(Graph::ID)) {
             $view->config->max_graph_elements = false;
         }
+    }
 
-        // add the visits by day of week as a related report, if the current period is not 'day'
-        if (Common::getRequestVar('period', 'day') != 'day') {
-            $view->config->addRelatedReport('VisitTime.getByDayOfWeek', Piwik::translate('VisitTime_VisitsByDayOfWeek'));
-        }
+    public function getRelatedReports()
+    {
+        return array(
+            Reports::factory('VisitTime', 'getByDayOfWeek')
+        );
     }
 }
diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
index ce213fb211..871f760046 100644
--- a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
+++ b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
@@ -22,12 +22,13 @@ class GetVisitInformationPerServerTime extends Base
     {
         parent::init();
         $this->dimension     = new ServerTime();
-        $this->name          = Piwik::translate('VisitTime_WidgetServerTime');
+        $this->name          = Piwik::translate('VisitTime_ServerTime');
         $this->documentation = Piwik::translate('VisitTime_WidgetServerTimeDocumentation', array('<strong>', '</strong>'));
         $this->constantRowsCount = true;
         $this->hasGoalMetrics = true;
-        $this->order = 15;
-        $this->widgetTitle  = 'VisitTime_WidgetServerTime';
+        $this->order = 20;
+
+        $this->subcategoryId = 'VisitTime_SubmenuTimes';
     }
 
     public function configureView(ViewDataTable $view)
diff --git a/plugins/VisitTime/templates/index.twig b/plugins/VisitTime/templates/index.twig
deleted file mode 100644
index 688cde0338..0000000000
--- a/plugins/VisitTime/templates/index.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="row">
-
-    <div class="col-md-6">
-        <h2 piwik-enriched-headline>{{ 'VisitTime_LocalTime'|translate }}</h2>
-        {{ dataTableVisitInformationPerLocalTime|raw }}
-    </div>
-
-    <div class="col-md-6">
-        <h2 piwik-enriched-headline>{{ 'VisitTime_ServerTime'|translate }}</h2>
-        {{ dataTableVisitInformationPerServerTime|raw }}
-    </div>
-
-</div>