diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-03-10 02:58:08 +0300 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2016-03-10 02:58:08 +0300 |
| commit | 1854f5c456a76af807431d52bcb19ad207ba658e (patch) | |
| tree | 6445a40013d17339b3a170176eb2bbd6aeb2abac /plugins/DevicePlugins | |
| parent | dd408624eb63ce74385a94f4ab471b35e23fa21b (diff) | |
| parent | 09dc2dbb041e63100c651879e83c8ac73b9d4f3e (diff) | |
Merge pull request #9905 from piwik/3.0
Merge 3.0 => 3.x-dev
Diffstat (limited to 'plugins/DevicePlugins')
3 files changed, 6 insertions, 4 deletions
diff --git a/plugins/DevicePlugins/Reports/Base.php b/plugins/DevicePlugins/Reports/Base.php index 81116f4d1d..b6f8755b13 100644 --- a/plugins/DevicePlugins/Reports/Base.php +++ b/plugins/DevicePlugins/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 getBasicDevicePluginsDisplayProperties(ViewDataTable $view) diff --git a/plugins/DevicePlugins/Reports/GetPlugin.php b/plugins/DevicePlugins/Reports/GetPlugin.php index 151bf3e1a6..42fef1cb89 100644 --- a/plugins/DevicePlugins/Reports/GetPlugin.php +++ b/plugins/DevicePlugins/Reports/GetPlugin.php @@ -23,8 +23,9 @@ class GetPlugin extends Base $this->metrics = array('nb_visits'); $this->constantRowsCount = true; $this->processedMetrics = array('nb_visits_percentage'); - $this->order = 4; - $this->widgetTitle = 'DevicePlugins_WidgetPlugins'; + $this->order = 13; + + $this->subcategoryId = 'DevicesDetection_Software'; } public function configureView(ViewDataTable $view) diff --git a/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml index 9a4f403963..a1ab29592e 100644 --- a/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml +++ b/plugins/DevicePlugins/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getPlugin___API.getMetadata_day.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <category>Visitor Settings</category> + <category>Visitors</category> + <subcategory>Software</subcategory> <name>Browser Plugins</name> <module>DevicePlugins</module> <action>getPlugin</action> |