diff options
Diffstat (limited to 'plugins')
6 files changed, 11 insertions, 11 deletions
diff --git a/plugins/CoreHome/Categories/GenericCategory.php b/plugins/CoreHome/Categories/GenericCategory.php index 3d3cefe2d8..a2bd78008b 100644 --- a/plugins/CoreHome/Categories/GenericCategory.php +++ b/plugins/CoreHome/Categories/GenericCategory.php @@ -12,6 +12,6 @@ use Piwik\Category\Category; class GenericCategory extends Category { - protected $id = 'General_Generic'; - protected $order = 70; + protected $id = 'General_KpiMetric'; + protected $order = 1; } diff --git a/plugins/CoreVisualizations/Widgets/SingleMetricView.php b/plugins/CoreVisualizations/Widgets/SingleMetricView.php index fa5bc910bf..4d866f10e2 100644 --- a/plugins/CoreVisualizations/Widgets/SingleMetricView.php +++ b/plugins/CoreVisualizations/Widgets/SingleMetricView.php @@ -25,8 +25,8 @@ class SingleMetricView extends \Piwik\Widget\Widget $column = Common::getRequestVar('column', '', 'string'); $config->addParameters(['column' => $column]); - $config->setCategoryId('General_Generic'); - $config->setName('General_Metric'); + $config->setCategoryId('General_KpiMetric'); + $config->setName('General_KpiMetric'); $config->setIsWidgetizable(); } diff --git a/plugins/Dashboard/javascripts/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js index 5a7b1afbaa..f3752eb6e3 100644 --- a/plugins/Dashboard/javascripts/widgetMenu.js +++ b/plugins/Dashboard/javascripts/widgetMenu.js @@ -327,7 +327,7 @@ widgetsHelper.loadWidgetAjax = function (widgetUniqueId, widgetParameters, onWid var widgetUniqueId = widgets[j]["uniqueId"]; var widgetCategoryId = widgets[j].category ? widgets[j].category.id : null; var widgetClass = ''; - if (!settings.isWidgetAvailable(widgetUniqueId) && widgetCategoryId !== 'General_Generic') { + if (!settings.isWidgetAvailable(widgetUniqueId) && widgetCategoryId !== 'General_KpiMetric') { widgetClass += ' ' + settings.unavailableClass; } diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png index 6cfc36c9fb..807855b89b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ed9e0f0d3a3144adb539054fe2401cee7fc72103785bb180a9a7a6f76de0c7f -size 52934 +oid sha256:0b614eaac72f9867c6809786e6b353021b08accd1ec0f9fed685625ae517a1cc +size 53012 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 2298a33ad7..1df3f81cc4 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:623c7fb55718ae5493afa7d4993f5ca53c6b1cc64a597df140abbd9a55ce43e0 -size 66476 +oid sha256:915d175062ff0ce2d6105a3f7b10613ae89d84398915ebb3383bfb26acc88b31 +size 66569 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index c996b3405a..27bd0ba947 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ada55ecf1fde49a5e7f2b43e24e474586a8d58eb542240b3cde8b16452fd784d -size 77969 +oid sha256:54f6f0f0a9c6d53ff8686e874c7536a3633eddec600f463f700e5b7f01a96870 +size 78171 |
