generate pages instead of implementing them in each controller

3 files changed, 22 insertions, 3 deletions

diff --git a/plugins/CustomVariables/Categories/CustomVariablesSubcategory.php b/plugins/CustomVariables/Categories/CustomVariablesSubcategory.php
new file mode 100644
index 0000000000..d81b56568c
--- /dev/null
+++ b/plugins/CustomVariables/Categories/CustomVariablesSubcategory.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\CustomVariables\Categories;
+
+use Piwik\Category\Subcategory;
+
+class CustomVariablesSubcategory extends Subcategory
+{
+    protected $categoryId = 'General_Visitors';
+    protected $id = 'CustomVariables_CustomVariables';
+    protected $order = 10;
+
+}
diff --git a/plugins/CustomVariables/Reports/Base.php b/plugins/CustomVariables/Reports/Base.php
index be48bf4d44..0c6bcbec0b 100644
--- a/plugins/CustomVariables/Reports/Base.php
+++ b/plugins/CustomVariables/Reports/Base.php
@@ -14,7 +14,7 @@ abstract class Base extends \Piwik\Plugin\Report
 
     protected function init()
     {
-        $this->category = 'General_Visitors';
+        $this->categoryId = 'General_Visitors';
     }
 
 }
diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php
index 2ddedc4e97..c6b28b6562 100644
--- a/plugins/CustomVariables/Reports/GetCustomVariables.php
+++ b/plugins/CustomVariables/Reports/GetCustomVariables.php
@@ -23,8 +23,8 @@ class GetCustomVariables extends Base
                                array('<br />', '<a href="http://piwik.org/docs/custom-variables/" rel="noreferrer"  target="_blank">', '</a>'));
         $this->actionToLoadSubTables = 'getCustomVariablesValuesFromNameId';
         $this->order = 10;
-        $this->widgetTitle  = 'CustomVariables_CustomVariables';
-        $this->menuTitle    = 'CustomVariables_CustomVariables';
+
+        $this->subcategoryId    = 'CustomVariables_CustomVariables';
         $this->hasGoalMetrics = true;
     }