From 6443c68acc30698466ca41877ea725d13c78bdac Mon Sep 17 00:00:00 2001 From: Andre Fremaux Date: Tue, 19 Jan 2016 15:00:41 +1300 Subject: [PATCH 1/2] Page titles should include the date and period #9556 --- core/Plugin/Controller.php | 1 + plugins/Morpheus/templates/dashboard.twig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index cf38fbd5700..e6a21fd6f41 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -629,6 +629,7 @@ protected function setGeneralVariablesView($view) $view->date = $this->strDate; $view->prettyDate = self::getCalendarPrettyDate($period); + $view->prettyDateLong = $period->getLocalizedLongString(); $view->rawDate = $rawDate; $view->startDate = $dateStart; $view->endDate = $dateEnd; diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig index afccc7bd4c1..36382b5e573 100644 --- a/plugins/Morpheus/templates/dashboard.twig +++ b/plugins/Morpheus/templates/dashboard.twig @@ -8,7 +8,7 @@ {% endblock %} -{% set title %}{{ siteName|raw }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %} +{% set title %}{{ siteName|raw }} - {{ prettyDateLong }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %} {% block pageDescription %}Web Analytics report for {{ siteName|escape("html_attr") }} - Piwik{% endblock %} From 00a630f63bb7769838ba0a230108c04726d6b7ab Mon Sep 17 00:00:00 2001 From: Andre Fremaux Date: Tue, 19 Jan 2016 16:02:15 +1300 Subject: [PATCH 2/2] Fixed date in title when no data has been recorded. --- plugins/Morpheus/templates/dashboard.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig index 36382b5e573..280de942c0d 100644 --- a/plugins/Morpheus/templates/dashboard.twig +++ b/plugins/Morpheus/templates/dashboard.twig @@ -8,7 +8,7 @@ {% endblock %} -{% set title %}{{ siteName|raw }} - {{ prettyDateLong }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %} +{% set title %}{{ siteName|raw }}{% if prettyDateLong is defined %} - {{ prettyDateLong }}{% endif %} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %} {% block pageDescription %}Web Analytics report for {{ siteName|escape("html_attr") }} - Piwik{% endblock %}