generate pages instead of implementing them in each controller

3 files changed, 11 insertions, 7 deletions

diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php
index 259a164113..0ef3f0d631 100644
--- a/plugins/Resolution/Reports/Base.php
+++ b/plugins/Resolution/Reports/Base.php
@@ -15,7 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report
 {
     protected function init()
     {
-        $this->category = 'General_VisitorSettings';
+        $this->categoryId = 'General_Visitors';
     }
 
     protected function getBasicResolutionDisplayProperties(ViewDataTable $view)
diff --git a/plugins/Resolution/Reports/GetConfiguration.php b/plugins/Resolution/Reports/GetConfiguration.php
index c01c4f3b07..600f07edd9 100644
--- a/plugins/Resolution/Reports/GetConfiguration.php
+++ b/plugins/Resolution/Reports/GetConfiguration.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\Resolution\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Resolution\Columns\Configuration;
+use Piwik\Plugin\Reports;
 
 class GetConfiguration extends Base
 {
@@ -18,10 +19,11 @@ class GetConfiguration extends Base
     {
         parent::init();
         $this->dimension     = new Configuration();
-        $this->name          = Piwik::translate('Resolution_WidgetGlobalVisitors');
+        $this->name          = Piwik::translate('Resolution_Configurations');
         $this->documentation = Piwik::translate('Resolution_WidgetGlobalVisitorsDocumentation', '<br />');
         $this->order = 7;
-        $this->widgetTitle  = 'Resolution_WidgetGlobalVisitors';
+
+        $this->subcategoryId = 'DevicesDetection_Software';
     }
 
     public function configureView(ViewDataTable $view)
@@ -36,7 +38,7 @@ class GetConfiguration extends Base
     public function getRelatedReports()
     {
         return array(
-            self::factory('Resolution', 'getResolution'),
+            Reports::factory('Resolution', 'getResolution'),
         );
     }
 }
diff --git a/plugins/Resolution/Reports/GetResolution.php b/plugins/Resolution/Reports/GetResolution.php
index f9066ce19c..3b27236a86 100644
--- a/plugins/Resolution/Reports/GetResolution.php
+++ b/plugins/Resolution/Reports/GetResolution.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\Resolution\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Resolution\Columns\Resolution;
+use Piwik\Plugin\Reports;
 
 class GetResolution extends Base
 {
@@ -20,8 +21,9 @@ class GetResolution extends Base
         $this->dimension     = new Resolution();
         $this->name          = Piwik::translate('Resolution_WidgetResolutions');
         $this->documentation = ''; // TODO
-        $this->order = 0;
-        $this->widgetTitle  = 'Resolution_WidgetResolutions';
+        $this->order = 8;
+
+        $this->subcategoryId = 'DevicesDetection_Devices';
     }
 
     public function configureView(ViewDataTable $view)
@@ -34,7 +36,7 @@ class GetResolution extends Base
     public function getRelatedReports()
     {
         return array(
-            self::factory('Resolution', 'getConfiguration'),
+            Reports::factory('Resolution', 'getConfiguration'),
         );
     }
 }