diff options
Diffstat (limited to 'plugins/Actions')
27 files changed, 200 insertions, 131 deletions
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 891400e122..e475f4240c 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -22,6 +22,7 @@ use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; use Piwik\Plugins\CustomVariables\API as APICustomVariables; use Piwik\Plugins\Actions\Actions\ActionSiteSearch; +use Piwik\Plugin\Reports; use Piwik\Tracker\Action; use Piwik\Tracker\PageUrl; @@ -55,7 +56,7 @@ class API extends \Piwik\Plugin\API { Piwik::checkUserHasViewAccess($idSite); - $report = Report::factory("Actions", "get"); + $report = Reports::factory("Actions", "get"); $archive = Archive::build($idSite, $period, $date, $segment); $requestedColumns = Piwik::getArrayFromApiParameter($columns); diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 557e4c77b8..bca4396271 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Actions; use Piwik\ArchiveProcessor; use Piwik\Common; use Piwik\Db; +use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines; use Piwik\Site; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; diff --git a/plugins/Actions/Categories/DownloadsSubcategory.php b/plugins/Actions/Categories/DownloadsSubcategory.php new file mode 100644 index 0000000000..ac432b11d1 --- /dev/null +++ b/plugins/Actions/Categories/DownloadsSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class DownloadsSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'General_Downloads'; + protected $order = 35; + +} diff --git a/plugins/Actions/Categories/EntryPagesSubcategory.php b/plugins/Actions/Categories/EntryPagesSubcategory.php new file mode 100644 index 0000000000..d4ee657b79 --- /dev/null +++ b/plugins/Actions/Categories/EntryPagesSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class EntryPagesSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'Actions_SubmenuPagesEntry'; + protected $order = 10; + +} diff --git a/plugins/Actions/Categories/ExitPagesSubcategory.php b/plugins/Actions/Categories/ExitPagesSubcategory.php new file mode 100644 index 0000000000..b1a5a636c6 --- /dev/null +++ b/plugins/Actions/Categories/ExitPagesSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class ExitPagesSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'Actions_SubmenuPagesExit'; + protected $order = 15; + +} diff --git a/plugins/Actions/Categories/OutlinksSubcategory.php b/plugins/Actions/Categories/OutlinksSubcategory.php new file mode 100644 index 0000000000..975ca9003e --- /dev/null +++ b/plugins/Actions/Categories/OutlinksSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class OutlinksSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'General_Outlinks'; + protected $order = 30; + +} diff --git a/plugins/Actions/Categories/PageTitlesSubcategory.php b/plugins/Actions/Categories/PageTitlesSubcategory.php new file mode 100644 index 0000000000..1a88b6dbd2 --- /dev/null +++ b/plugins/Actions/Categories/PageTitlesSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class PageTitlesSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'Actions_SubmenuPageTitles'; + protected $order = 20; + +} diff --git a/plugins/Actions/Categories/PagesSubcategory.php b/plugins/Actions/Categories/PagesSubcategory.php new file mode 100644 index 0000000000..5d407859b1 --- /dev/null +++ b/plugins/Actions/Categories/PagesSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class PagesSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'General_Pages'; + protected $order = 5; + +} diff --git a/plugins/Actions/Categories/SiteSearchSubcategory.php b/plugins/Actions/Categories/SiteSearchSubcategory.php new file mode 100644 index 0000000000..e915803679 --- /dev/null +++ b/plugins/Actions/Categories/SiteSearchSubcategory.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\Actions\Categories; + +use Piwik\Category\Subcategory; + +class SiteSearchSubcategory extends Subcategory +{ + protected $categoryId = 'General_Actions'; + protected $id = 'Actions_SubmenuSitesearch'; + protected $order = 25; + +} diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php deleted file mode 100644 index 51c7d7ba3a..0000000000 --- a/plugins/Actions/Controller.php +++ /dev/null @@ -1,45 +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\Actions; - -use Piwik\Plugin\Report; -use Piwik\View; - -/** - * Actions controller - * - */ -class Controller extends \Piwik\Plugin\Controller -{ - // - // Actions that render whole pages - // - - public function indexSiteSearch() - { - $view = new View('@Actions/indexSiteSearch'); - - $keyword = Report::factory($this->pluginName, 'getSiteSearchKeywords'); - $noResult = Report::factory($this->pluginName, 'getSiteSearchNoResultKeywords'); - $pageUrls = Report::factory($this->pluginName, 'getPageUrlsFollowingSiteSearch'); - - $view->keywords = $keyword->render(); - $view->noResultKeywords = $noResult->render(); - $view->pagesUrlsFollowingSiteSearch = $pageUrls->render(); - - $categoryTrackingEnabled = Actions::isCustomVariablesPluginsEnabled(); - if ($categoryTrackingEnabled) { - $categories = Report::factory($this->pluginName, 'getSiteSearchCategories'); - $view->categories = $categories->render(); - } - - return $view->render(); - } - -} diff --git a/plugins/Actions/Menu.php b/plugins/Actions/Menu.php deleted file mode 100644 index 9a7424b4e9..0000000000 --- a/plugins/Actions/Menu.php +++ /dev/null @@ -1,29 +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\Actions; - -use Piwik\Common; -use Piwik\Menu\MenuReporting; - -class Menu extends \Piwik\Plugin\Menu -{ - public function configureReportingMenu(MenuReporting $menu) - { - $menu->addActionsItem('', $this->urlForAction('menuGetPageUrls'), 15); - - $idSite = Common::getRequestVar('idSite', 0, 'int'); - $idSites = Common::getRequestVar('idSites', '', 'string'); - - $actions = new Actions(); - if ($actions->isSiteSearchEnabled($idSites, $idSite)) { - $menu->addActionsItem('Actions_SubmenuSitesearch', $this->urlForAction('indexSiteSearch'), 5); - } - } - -} diff --git a/plugins/Actions/Reports/Base.php b/plugins/Actions/Reports/Base.php index 45c9c0af9c..20e35593d8 100644 --- a/plugins/Actions/Reports/Base.php +++ b/plugins/Actions/Reports/Base.php @@ -21,7 +21,7 @@ abstract class Base extends \Piwik\Plugin\Report { protected function init() { - $this->category = 'General_Actions'; + $this->categoryId = 'General_Actions'; $this->processedMetrics = false; $this->recursiveLabelSeparator = '/'; } diff --git a/plugins/Actions/Reports/GetDownloads.php b/plugins/Actions/Reports/GetDownloads.php index f168cba878..92975b969e 100644 --- a/plugins/Actions/Reports/GetDownloads.php +++ b/plugins/Actions/Reports/GetDownloads.php @@ -26,8 +26,7 @@ class GetDownloads extends Base $this->actionToLoadSubTables = $this->action; $this->order = 9; - $this->menuTitle = 'General_Downloads'; - $this->widgetTitle = 'General_Downloads'; + $this->subcategoryId = 'General_Downloads'; } public function getMetrics() diff --git a/plugins/Actions/Reports/GetEntryPageTitles.php b/plugins/Actions/Reports/GetEntryPageTitles.php index 7c029f4b02..9df1d74450 100644 --- a/plugins/Actions/Reports/GetEntryPageTitles.php +++ b/plugins/Actions/Reports/GetEntryPageTitles.php @@ -15,6 +15,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; +use Piwik\Plugin\Reports; +use Piwik\Report\ReportWidgetFactory; +use Piwik\Widget\WidgetsList; class GetEntryPageTitles extends Base { @@ -35,8 +38,11 @@ class GetEntryPageTitles extends Base ); $this->order = 6; $this->actionToLoadSubTables = $this->action; + } - $this->widgetTitle = 'Actions_WidgetEntryPageTitles'; + public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory) + { + $widgetsList->addWidgetConfig($factory->createWidget()->setName('Actions_WidgetEntryPageTitles')); } public function getProcessedMetrics() @@ -79,8 +85,8 @@ class GetEntryPageTitles extends Base public function getRelatedReports() { return array( - self::factory('Actions', 'getPageTitles'), - self::factory('Actions', 'getEntryPageUrls') + Reports::factory('Actions', 'getPageTitles'), + Reports::factory('Actions', 'getEntryPageUrls') ); } } diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php index f3795db099..c934c7ab10 100644 --- a/plugins/Actions/Reports/GetEntryPageUrls.php +++ b/plugins/Actions/Reports/GetEntryPageUrls.php @@ -17,6 +17,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; +use Piwik\Plugin\Reports; +use Piwik\Report\ReportWidgetFactory; +use Piwik\Widget\WidgetsList; class GetEntryPageUrls extends Base { @@ -40,8 +43,7 @@ class GetEntryPageUrls extends Base $this->actionToLoadSubTables = $this->action; - $this->menuTitle = 'Actions_SubmenuPagesEntry'; - $this->widgetTitle = 'Actions_WidgetPagesEntry'; + $this->subcategoryId = 'Actions_SubmenuPagesEntry'; } public function getProcessedMetrics() @@ -83,7 +85,7 @@ class GetEntryPageUrls extends Base public function getRelatedReports() { return array( - self::factory('Actions', 'getEntryPageTitles'), + Reports::factory('Actions', 'getEntryPageTitles'), ); } } diff --git a/plugins/Actions/Reports/GetExitPageTitles.php b/plugins/Actions/Reports/GetExitPageTitles.php index 6cc5b1f320..53f235209d 100644 --- a/plugins/Actions/Reports/GetExitPageTitles.php +++ b/plugins/Actions/Reports/GetExitPageTitles.php @@ -15,6 +15,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; +use Piwik\Plugin\Reports; +use Piwik\Report\ReportWidgetFactory; +use Piwik\Widget\WidgetsList; class GetExitPageTitles extends Base { @@ -37,8 +40,13 @@ class GetExitPageTitles extends Base $this->order = 7; $this->actionToLoadSubTables = $this->action; + } - $this->widgetTitle = 'Actions_WidgetExitPageTitles'; + public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory) + { + // we have to do it manually since it's only done automatically if a subcategoryId is specified, + // we do not set a subcategoryId since this report is not supposed to be shown in the UI + $widgetsList->addWidgetConfig($factory->createWidget()); } public function getProcessedMetrics() @@ -86,8 +94,8 @@ class GetExitPageTitles extends Base public function getRelatedReports() { return array( - self::factory('Actions', 'getPageTitles'), - self::factory('Actions', 'getExitPageUrls'), + Reports::factory('Actions', 'getPageTitles'), + Reports::factory('Actions', 'getExitPageUrls'), ); } } diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php index 2ef5d7a957..f46ac478cd 100644 --- a/plugins/Actions/Reports/GetExitPageUrls.php +++ b/plugins/Actions/Reports/GetExitPageUrls.php @@ -17,6 +17,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; +use Piwik\Plugin\Reports; +use Piwik\Report\ReportWidgetFactory; +use Piwik\Widget\WidgetsList; class GetExitPageUrls extends Base { @@ -40,8 +43,7 @@ class GetExitPageUrls extends Base $this->order = 4; - $this->menuTitle = 'Actions_SubmenuPagesExit'; - $this->widgetTitle = 'Actions_WidgetPagesExit'; + $this->subcategoryId = 'Actions_SubmenuPagesExit'; } public function getProcessedMetrics() @@ -97,7 +99,7 @@ class GetExitPageUrls extends Base public function getRelatedReports() { return array( - self::factory('Actions', 'getExitPageTitles'), + Reports::factory('Actions', 'getExitPageTitles'), ); } diff --git a/plugins/Actions/Reports/GetOutlinks.php b/plugins/Actions/Reports/GetOutlinks.php index adf21c572c..fb5e13e831 100644 --- a/plugins/Actions/Reports/GetOutlinks.php +++ b/plugins/Actions/Reports/GetOutlinks.php @@ -29,8 +29,7 @@ class GetOutlinks extends Base $this->actionToLoadSubTables = $this->action; - $this->menuTitle = 'General_Outlinks'; - $this->widgetTitle = 'General_Outlinks'; + $this->subcategoryId = 'General_Outlinks'; } public function getMetrics() diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php index 8f7e193f9b..0c70086611 100644 --- a/plugins/Actions/Reports/GetPageTitles.php +++ b/plugins/Actions/Reports/GetPageTitles.php @@ -17,6 +17,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; +use Piwik\Plugin\Reports; +use Piwik\Report\ReportWidgetFactory; +use Piwik\Widget\WidgetsList; class GetPageTitles extends Base { @@ -40,8 +43,7 @@ class GetPageTitles extends Base $this->actionToLoadSubTables = $this->action; - $this->menuTitle = 'Actions_SubmenuPageTitles'; - $this->widgetTitle = 'Actions_WidgetPageTitles'; + $this->subcategoryId = 'Actions_SubmenuPageTitles'; } public function getMetrics() @@ -81,8 +83,8 @@ class GetPageTitles extends Base public function getRelatedReports() { return array( - self::factory('Actions', 'getEntryPageTitles'), - self::factory('Actions', 'getExitPageTitles'), + Reports::factory('Actions', 'getEntryPageTitles'), + Reports::factory('Actions', 'getExitPageTitles'), ); } } diff --git a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php index 657e88211d..3d50ba4f95 100644 --- a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php +++ b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php @@ -15,6 +15,7 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; +use Piwik\Plugin\Reports; class GetPageTitlesFollowingSiteSearch extends SiteSearchBase { @@ -32,7 +33,8 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase new AveragePageGenerationTime() ); $this->order = 19; - $this->widgetTitle = 'Actions_WidgetPageTitlesFollowingSearch'; + + $this->subcategoryId = 'Actions_SubmenuSitesearch'; } public function configureView(ViewDataTable $view) @@ -80,7 +82,7 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase public function getRelatedReports() { return array( - self::factory('Actions', 'getPageUrlsFollowingSiteSearch'), + Reports::factory('Actions', 'getPageUrlsFollowingSiteSearch'), ); } } diff --git a/plugins/Actions/Reports/GetPageUrls.php b/plugins/Actions/Reports/GetPageUrls.php index 0af899ef0e..2c850a5339 100644 --- a/plugins/Actions/Reports/GetPageUrls.php +++ b/plugins/Actions/Reports/GetPageUrls.php @@ -15,6 +15,8 @@ use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\PageUrl; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; +use Piwik\Report\ReportWidgetFactory; +use Piwik\Widget\WidgetsList; class GetPageUrls extends Base { @@ -37,10 +39,13 @@ class GetPageUrls extends Base new AveragePageGenerationTime() ); - $this->segmentSql = 'log_visit.visit_entry_idaction_url'; + $this->segmentSql = 'log_visit.visit_entry_idaction_url'; + $this->subcategoryId = 'General_Pages'; + } - $this->menuTitle = 'General_Pages'; - $this->widgetTitle = 'General_Pages'; + public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory) + { + $widgetsList->addWidgetConfig($factory->createWidget()->setName($this->subcategoryId)); } public function getMetrics() diff --git a/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php index 2d8ba1a3a2..063d3855b5 100644 --- a/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php +++ b/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Actions\Reports; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\Actions\Columns\DestinationPage; +use Piwik\Plugin\Reports; class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch { @@ -20,8 +21,9 @@ class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch $this->dimension = new DestinationPage(); $this->name = Piwik::translate('Actions_WidgetPageUrlsFollowingSearch'); $this->documentation = Piwik::translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik::translate('General_UsePlusMinusIconsDocumentation'); - $this->order = 18; - $this->widgetTitle = 'Actions_WidgetPageUrlsFollowingSearch'; + $this->order = 16; + + $this->subcategoryId = 'Actions_SubmenuSitesearch'; } public function configureView(ViewDataTable $view) @@ -34,7 +36,7 @@ class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch public function getRelatedReports() { return array( - self::factory('Actions', 'getPageTitlesFollowingSiteSearch'), + Reports::factory('Actions', 'getPageTitlesFollowingSiteSearch'), ); } } diff --git a/plugins/Actions/Reports/GetSiteSearchCategories.php b/plugins/Actions/Reports/GetSiteSearchCategories.php index 6d41e3c334..5388ff9198 100644 --- a/plugins/Actions/Reports/GetSiteSearchCategories.php +++ b/plugins/Actions/Reports/GetSiteSearchCategories.php @@ -23,8 +23,9 @@ class GetSiteSearchCategories extends SiteSearchBase $this->name = Piwik::translate('Actions_WidgetSearchCategories'); $this->documentation = Piwik::translate('Actions_SiteSearchCategories1') . '<br/>' . Piwik::translate('Actions_SiteSearchCategories2'); $this->metrics = array('nb_visits', 'nb_pages_per_search', 'exit_rate'); - $this->order = 17; - $this->widgetTitle = 'Actions_WidgetSearchCategories'; + $this->order = 20; + + $this->subcategoryId = 'Actions_SubmenuSitesearch'; } protected function isEnabledForIdSites($idSites, $idSite) diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php index d88684cd15..dc4b5e2d16 100644 --- a/plugins/Actions/Reports/GetSiteSearchKeywords.php +++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php @@ -33,7 +33,7 @@ class GetSiteSearchKeywords extends SiteSearchBase new AveragePageGenerationTime() ); $this->order = 15; - $this->widgetTitle = 'Actions_WidgetSearchKeywords'; + $this->subcategoryId = 'Actions_SubmenuSitesearch'; } public function getMetrics() diff --git a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php index 94b19e8566..c1c01ca504 100644 --- a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php +++ b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php @@ -31,8 +31,9 @@ class GetSiteSearchNoResultKeywords extends SiteSearchBase new ExitRate(), new AveragePageGenerationTime() ); - $this->order = 16; - $this->widgetTitle = 'Actions_WidgetSearchNoResultKeywords'; + $this->order = 18; + + $this->subcategoryId = 'Actions_SubmenuSitesearch'; } public function getMetrics() diff --git a/plugins/Actions/Reports/SiteSearchBase.php b/plugins/Actions/Reports/SiteSearchBase.php index e30a2243d8..d4715e04e6 100644 --- a/plugins/Actions/Reports/SiteSearchBase.php +++ b/plugins/Actions/Reports/SiteSearchBase.php @@ -18,7 +18,7 @@ abstract class SiteSearchBase extends Base protected function init() { parent::init(); - $this->category = 'Actions_SubmenuSitesearch'; + $this->categoryId = 'General_Actions'; } public function isEnabled() diff --git a/plugins/Actions/templates/indexSiteSearch.twig b/plugins/Actions/templates/indexSiteSearch.twig deleted file mode 100644 index 8d9eaa0909..0000000000 --- a/plugins/Actions/templates/indexSiteSearch.twig +++ /dev/null @@ -1,21 +0,0 @@ -<div class="row"> - - <div class="col-md-6"> - <h2 piwik-enriched-headline>{{ 'Actions_WidgetSearchKeywords'|translate }}</h2> - {{ keywords|raw }} - - <h2 piwik-enriched-headline>{{ 'Actions_WidgetSearchNoResultKeywords'|translate }}</h2> - {{ noResultKeywords|raw }} - - {% if categories is defined %} - <h2 piwik-enriched-headline>{{ 'Actions_WidgetSearchCategories'|translate }}</h2> - {{ categories|raw }} - {% endif %} - </div> - - <div class="col-md-6"> - <h2 piwik-enriched-headline>{{ 'Actions_WidgetPageUrlsFollowingSearch'|translate }}</h2> - {{ pagesUrlsFollowingSiteSearch|raw }} - </div> - -</div> |