diff options
Diffstat (limited to 'plugins/CoreHome')
| -rw-r--r-- | plugins/CoreHome/Controller.php | 7 | ||||
| -rw-r--r-- | plugins/CoreHome/CoreHome.php | 3 | ||||
| -rw-r--r-- | plugins/CoreHome/DataTableRowAction/RowEvolution.php | 5 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_dataTable.twig | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index 08eabcbf82..c95b5d61ce 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -10,6 +10,7 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Date; use Piwik\Site; /** @@ -31,7 +32,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller // User preference: default report to load is the All Websites dashboard if ($defaultReport == 'MultiSites' - && PluginsManager::getInstance()->isPluginActivated('MultiSites') + && \Piwik\PluginsManager::getInstance()->isPluginActivated('MultiSites') ) { $module = 'MultiSites'; } @@ -76,8 +77,8 @@ class Piwik_CoreHome_Controller extends Piwik_Controller if ($websiteId) { $website = new Site($websiteId); $datetimeCreationDate = $this->site->getCreationDate()->getDatetime(); - $creationDateLocalTimezone = Piwik_Date::factory($datetimeCreationDate, $website->getTimezone())->toString('Y-m-d'); - $todayLocalTimezone = Piwik_Date::factory('now', $website->getTimezone())->toString('Y-m-d'); + $creationDateLocalTimezone = Date::factory($datetimeCreationDate, $website->getTimezone())->toString('Y-m-d'); + $todayLocalTimezone = Date::factory('now', $website->getTimezone())->toString('Y-m-d'); if ($creationDateLocalTimezone == $todayLocalTimezone) { Piwik::redirectToModule('CoreHome', 'index', array('date' => 'today', diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 07820ffe01..56c4dbbfd2 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -8,12 +8,13 @@ * @category Piwik_Plugins * @package Piwik_CoreHome */ +use Piwik\Plugin; /** * * @package Piwik_CoreHome */ -class Piwik_CoreHome extends Piwik_Plugin +class Piwik_CoreHome extends Plugin { /** * @see Piwik_Plugin::getListHooksRegistered diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 4d16253e6b..3b3bea686c 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -10,6 +10,7 @@ */ use Piwik\Common; use Piwik\Metrics; +use Piwik\Date; /** * ROW EVOLUTION @@ -45,7 +46,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution /** * The data - * @var Piwik_DataTable_Array + * @var DataTable */ protected $dataTable; @@ -68,7 +69,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution * The constructor * Initialize some local variables from the request * @param int $idSite - * @param Piwik_Date $date ($this->date from controller) + * @param Date $date ($this->date from controller) * @param null|string $graphType * @throws Exception */ diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig index d6b51d34f1..73eb6f1143 100644 --- a/plugins/CoreHome/templates/_dataTable.twig +++ b/plugins/CoreHome/templates/_dataTable.twig @@ -1,3 +1,4 @@ +{% set summaryRowId = -1 %}{# ID_SUMMARY_ROW #} {% set isSubtable = javascriptVariablesToSet.idSubtable is defined and javascriptVariablesToSet.idSubtable != 0 %} <div class="dataTable {{ properties.datatable_css_class }} {% if isSubtable %}subDataTable{% endif %}" data-table-type="{{ properties.datatable_js_type|default('dataTable') }}" @@ -26,7 +27,7 @@ <tbody> {% for rowId, row in dataTable.getRows() %} {%- set rowHasSubtable = row.getIdSubDataTable() and javascriptVariablesToSet.controllerActionCalledWhenRequestSubTable is not null -%} - {%- set shouldHighlightRow = rowId == constant("Piwik_DataTable::ID_SUMMARY_ROW") and properties.highlight_summary_row -%} + {%- set shouldHighlightRow = rowId == summaryRowId and properties.highlight_summary_row -%} {# display this row if it doesn't have a subtable or if we don't replace the row with the subtable #} {% if not rowHasSubtable or not properties.show_expanded|default(false) or not properties.replace_row_with_subtable|default(false) %} |