From 56839f05410c38777380d4e42b4046a55cf2b098 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 15 Sep 2015 10:40:15 +1200
Subject: [PATCH 1/2] Set HTML <title> values in all user menu and admin menu
 pages

Having proper HTML titles  increase usability and is important
eg. one can more easily find the right tag in the list of browser tabs
---
 plugins/API/lang/en.json                           |  2 +-
 plugins/API/templates/listAllAPI.twig              |  4 +++-
 .../CoreAdminHome/templates/generalSettings.twig   |  2 ++
 .../CoreAdminHome/templates/pluginSettings.twig    | 14 +++++++++-----
 .../templates/trackingCodeGenerator.twig           |  5 ++++-
 .../CorePluginsAdmin/templates/marketplace.twig    |  4 +++-
 plugins/CorePluginsAdmin/templates/plugins.twig    |  4 +++-
 plugins/CorePluginsAdmin/templates/themes.twig     |  4 +++-
 plugins/CustomAlerts                               |  2 +-
 plugins/DBStats/templates/index.twig               |  4 +++-
 plugins/DevicesDetection/Controller.php            |  2 +-
 plugins/DevicesDetection/Menu.php                  |  2 +-
 plugins/DevicesDetection/templates/detection.twig  |  4 +++-
 plugins/ExampleUI/templates/notifications.twig     |  4 +++-
 plugins/Feedback/templates/index.twig              |  4 +++-
 plugins/Goals/templates/manageGoals.twig           |  4 +++-
 .../Installation/templates/systemCheckPage.twig    |  4 +++-
 .../templates/searchTranslation.twig               |  4 +++-
 plugins/Login/templates/login.twig                 |  3 ++-
 plugins/MobileMessaging/templates/index.twig       |  4 +++-
 .../MobileMessaging/templates/userSettings.twig    |  5 +++--
 plugins/Morpheus/templates/admin.twig              |  2 +-
 plugins/Morpheus/templates/dashboard.twig          |  3 ++-
 plugins/Morpheus/templates/demo.twig               |  4 +++-
 plugins/Morpheus/templates/layout.twig             |  8 +++++++-
 plugins/Morpheus/templates/user.twig               |  2 +-
 .../PrivacyManager/templates/privacySettings.twig  |  4 +++-
 plugins/ScheduledReports/templates/index.twig      |  6 ++++--
 plugins/SecurityInfo                               |  2 +-
 plugins/SitesManager/templates/index.twig          |  2 ++
 plugins/TasksTimetable                             |  2 +-
 plugins/UserCountry/templates/adminIndex.twig      |  4 +++-
 .../UsersManager/templates/anonymousSettings.twig  |  4 +++-
 plugins/UsersManager/templates/index.twig          |  4 +++-
 plugins/UsersManager/templates/userSettings.twig   |  4 +++-
 plugins/VisitorGenerator                           |  2 +-
 plugins/Widgetize/templates/index.twig             |  4 +++-
 37 files changed, 101 insertions(+), 41 deletions(-)

diff --git a/plugins/API/lang/en.json b/plugins/API/lang/en.json
index b0780afc3a3..47ff86f0c86 100644
--- a/plugins/API/lang/en.json
+++ b/plugins/API/lang/en.json
@@ -5,7 +5,7 @@
         "LoadedAPIs": "Successfully loaded %s APIs",
         "MoreInformation": "For more information about the Piwik APIs, please have a look at the %s Introduction to Piwik API %s and the %s Piwik API Reference %s.",
         "PluginDescription": "All the data in Piwik is available through simple APIs. This plugin is the web service entry point, that you can call to get your Web Analytics data in xml, json, php, csv, etc.",
-        "QuickDocumentationTitle": "API quick documentation",
+        "ReportingApiReference": "Reporting API Reference",
         "TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in json, xml, etc.",
         "UserAuthentication": "User authentication",
         "UsingTokenAuth": "If you want to %s request data within a script, a crontab, etc. %s you need to add the parameter %s to the API calls URLs that require authentication."
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index fac185be86f..47a1327c36a 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -1,10 +1,12 @@
 {% extends 'user.twig' %}
 
+{% set title %}{{ 'API_ReportingApiReference'|translate }}{% endset %}
+
 {% block content %}
 
 <div class="api-list">
 
-    <h2>{{ 'API_QuickDocumentationTitle'|translate }}</h2>
+    <h2>{{ title }}</h2>
 
     {% include "@CoreHome/_siteSelectHeader.twig" %}
 
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index 77be52bcc44..c990217cf49 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -1,5 +1,7 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'CoreAdminHome_MenuGeneralSettings'|translate }}{% endset %}
+
 {% block content %}
     {% import 'macros.twig' as piwik %}
     {% import 'ajaxMacros.twig' as ajax %}
diff --git a/plugins/CoreAdminHome/templates/pluginSettings.twig b/plugins/CoreAdminHome/templates/pluginSettings.twig
index 0cf729bf9f5..dd55ab30489 100644
--- a/plugins/CoreAdminHome/templates/pluginSettings.twig
+++ b/plugins/CoreAdminHome/templates/pluginSettings.twig
@@ -1,17 +1,21 @@
 
 {% extends mode == 'user' ? "user.twig" : "admin.twig" %}
 
+{% set title %}
+{% if mode == 'user' -%}
+    {{ 'CoreAdminHome_PersonalPluginSettings'|translate }}
+{%- else -%}
+    {{ 'CoreAdminHome_SystemPluginSettings'|translate }}
+{% endif %}
+{% endset %}
+
 {% block content %}
 
     {% import 'macros.twig' as piwik %}
     {% import 'ajaxMacros.twig' as ajax %}
     {% import 'settingsMacros.twig' as settingsMacro %}
 
-    {% if mode == 'user' %}
-        <h2 piwik-enriched-headline>{{ 'CoreAdminHome_PersonalPluginSettings'|translate }}</h2>
-    {% else %}
-        <h2 piwik-enriched-headline>{{ 'CoreAdminHome_SystemPluginSettings'|translate }}</h2>
-    {% endif %}
+    <h2 piwik-enriched-headline>{{ title }}</h2>
 
     <input type="hidden" name="setpluginsettingsnonce" value="{{ nonce }}">
 
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index e3dcd543ca1..25d03527330 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -6,12 +6,15 @@
     <script type="text/javascript" src="plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js"></script>
 {% endblock %}
 
+
+{% set title %}{{ 'CoreAdminHome_JavaScriptTracking'|translate }}{% endset %}
+
 {% block content %}
 <div id="js-tracking-generator-data" max-custom-variables="{{ maxCustomVariables|e('html_attr') }}" data-currencies="{{ currencySymbols|json_encode }}"></div>
 
 <h2 piwik-enriched-headline
     feature-name="{{ 'CoreAdminHome_TrackingCode'|translate }}"
-    help-url="http://piwik.org/docs/tracking-api/">{{ 'CoreAdminHome_JavaScriptTracking'|translate }}</h2>
+    help-url="http://piwik.org/docs/tracking-api/">{{ title }}</h2>
 
 <div id="js-code-options">
 
diff --git a/plugins/CorePluginsAdmin/templates/marketplace.twig b/plugins/CorePluginsAdmin/templates/marketplace.twig
index 9dd302f5ace..a42b57682c5 100644
--- a/plugins/CorePluginsAdmin/templates/marketplace.twig
+++ b/plugins/CorePluginsAdmin/templates/marketplace.twig
@@ -1,12 +1,14 @@
 {% extends mode is defined and mode == 'user' ? "user.twig" : "admin.twig" %}
 {% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
 
+{% set title %}{{ 'CorePluginsAdmin_Marketplace'|translate }}{% endset %}
+
 {% block content %}
 
     <div class="marketplace">
 
         <h2 piwik-enriched-headline feature-name="{{ 'CorePluginsAdmin_Marketplace'|translate }}">
-            {{ 'CorePluginsAdmin_Marketplace'|translate }}
+            {{ title }}
         </h2>
 
         <ul class="nav nav-pills">
diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
index 8a9c593715c..61db76e6229 100644
--- a/plugins/CorePluginsAdmin/templates/plugins.twig
+++ b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -2,6 +2,8 @@
 
 {% import '@CorePluginsAdmin/macros.twig' as plugins %}
 
+{% set title %}{{ 'CorePluginsAdmin_PluginsManagement'|translate }}{% endset %}
+
 {% block content %}
 <div class="pluginsManagement">
 
@@ -13,7 +15,7 @@
         {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, activateNonce, 0) }}
     {% endif %}
 
-    <h2 piwik-enriched-headline>{{ 'CorePluginsAdmin_PluginsManagement'|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ title }}</h2>
 
     <p>{{ 'CorePluginsAdmin_PluginsExtendPiwik'|translate }}
         {{ 'CorePluginsAdmin_OncePluginIsInstalledYouMayActivateHere'|translate }}
diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig
index b5e52666d9c..4f226956b79 100644
--- a/plugins/CorePluginsAdmin/templates/themes.twig
+++ b/plugins/CorePluginsAdmin/templates/themes.twig
@@ -2,10 +2,12 @@
 
 {% import '@CorePluginsAdmin/macros.twig' as plugins %}
 
+{% set title %}{{ 'CorePluginsAdmin_ThemesManagement'|translate }}{% endset %}
+
 {% block content %}
 <div style="max-width:980px;">
 
-    <h2 piwik-enriched-headline>{{ 'CorePluginsAdmin_ThemesManagement'|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ title }}</h2>
 
     <p>{{ 'CorePluginsAdmin_ThemesDescription'|translate }}
     {% if otherUsersCount > 0 %}
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 3aa24d45435..7f69ee8885f 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 3aa24d4543573fabeb4c34cfaff4c1c590af9b7b
+Subproject commit 7f69ee8885f32fc2cb386ba0615d0952407b9fb2
diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig
index 89e41951889..a28a2a3944e 100755
--- a/plugins/DBStats/templates/index.twig
+++ b/plugins/DBStats/templates/index.twig
@@ -1,8 +1,10 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'DBStats_DatabaseUsage'|translate }}{% endset %}
+
 {% block content %}
 
-<h2 id="databaseUsageSummary">{{ 'DBStats_DatabaseUsage'|translate }}</h2>
+<h2 id="databaseUsageSummary">{{ title }}</h2>
 <p>
     {{ 'DBStats_MainDescription'|translate(totalSpaceUsed) }}<br/>
     {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }}
diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
index 636a757d05b..10c55a8a968 100644
--- a/plugins/DevicesDetection/Controller.php
+++ b/plugins/DevicesDetection/Controller.php
@@ -59,7 +59,7 @@ public function software()
         return $view->render();
     }
 
-    public function deviceDetection()
+    public function detection()
     {
         Piwik::checkUserHasSomeAdminAccess();
 
diff --git a/plugins/DevicesDetection/Menu.php b/plugins/DevicesDetection/Menu.php
index ad214081aeb..7ddb1dc6686 100644
--- a/plugins/DevicesDetection/Menu.php
+++ b/plugins/DevicesDetection/Menu.php
@@ -20,7 +20,7 @@ public function configureAdminMenu(MenuAdmin $menu)
     {
         if (Piwik::isUserHasSomeAdminAccess()) {
             $menu->addDiagnosticItem('DevicesDetection_DeviceDetection',
-                                     $this->urlForAction('deviceDetection'),
+                                     $this->urlForAction('detection'),
                                      $order = 40);
         }
     }
diff --git a/plugins/DevicesDetection/templates/detection.twig b/plugins/DevicesDetection/templates/detection.twig
index 0b9168413ea..7a0b5240644 100644
--- a/plugins/DevicesDetection/templates/detection.twig
+++ b/plugins/DevicesDetection/templates/detection.twig
@@ -1,5 +1,7 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'DevicesDetection_DeviceDetection'|translate }}{% endset %}
+
 {% block content %}
 
     <script type="text/javascript">
@@ -41,7 +43,7 @@
         }
     </style>
 
-    <h2>{{ 'DevicesDetection_DeviceDetection'|translate }}</h2>
+    <h2>{{ title }}</h2>
 
     <h3>{{ 'DevicesDetection_UserAgent'|translate }}</h3>
 
diff --git a/plugins/ExampleUI/templates/notifications.twig b/plugins/ExampleUI/templates/notifications.twig
index 3782ff86f7f..ca69fcd8de1 100644
--- a/plugins/ExampleUI/templates/notifications.twig
+++ b/plugins/ExampleUI/templates/notifications.twig
@@ -1,7 +1,9 @@
 {% extends 'user.twig' %}
 
+{% set title %}UI Notification demo{% endset %}
+
 {% block content %}
-    <h2>Inline notification example:</h2>
+    <h2>Inline notification example</h2>
 
     <div style="display:inline-block;margin-top:10px;" id="exampleUI_notifications">
         <div piwik-notification
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 0d0d0254449..503685c3521 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -3,12 +3,14 @@
 {% set test_piwikUrl='http://demo.piwik.org/' %}
 {% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/'}}{% endset %}
 
+{% set title %}{{ 'General_AboutPiwikX'|translate(piwikVersion) }}{% endset %}
+
 {% block content %}
 
     <div id="feedback-faq" class="admin">
         <h2 piwik-enriched-headline
             feature-name="{{ 'General_Help'|translate }}"
-            >{{ 'General_AboutPiwikX'|translate(piwikVersion) }}</h2>
+            >{{ title }}</h2>
 
         <div class="header_full">
             <p>{{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate(
diff --git a/plugins/Goals/templates/manageGoals.twig b/plugins/Goals/templates/manageGoals.twig
index f71cd383008..4e3a4ce855e 100644
--- a/plugins/Goals/templates/manageGoals.twig
+++ b/plugins/Goals/templates/manageGoals.twig
@@ -1,5 +1,7 @@
 {% extends 'user.twig' %}
 
+{% set title %}{{ 'Goals_ManageGoals'|translate }}{% endset %}
+
 {% block content %}
 
     <h2 piwik-enriched-headline>
@@ -15,7 +17,7 @@
                 {% endset %}
                 {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }}
             {% endif %}</div>
-        {{ 'Goals_ManageGoals'|translate }}
+        {{ title }}
     </h2>
 
     {% include "@CoreHome/_siteSelectHeader.twig" %}
diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig
index d5a16dca1f6..db925107e25 100755
--- a/plugins/Installation/templates/systemCheckPage.twig
+++ b/plugins/Installation/templates/systemCheckPage.twig
@@ -1,8 +1,10 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'Installation_SystemCheck'|translate }}{% endset %}
+
 {% block content %}
 
-    <h2 piwik-enriched-headline>{{ 'Installation_SystemCheck'|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ title }}</h2>
 
     {% if diagnosticReport.hasErrors() %}
         <div class="alert alert-danger">
diff --git a/plugins/LanguagesManager/templates/searchTranslation.twig b/plugins/LanguagesManager/templates/searchTranslation.twig
index f8ca9a37c72..0f1f5f7e663 100644
--- a/plugins/LanguagesManager/templates/searchTranslation.twig
+++ b/plugins/LanguagesManager/templates/searchTranslation.twig
@@ -1,8 +1,10 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'LanguagesManager_TranslationSearch'|translate }}{% endset %}
+
 {% block content %}
 
-    <h2 piwik-enriched-headline>{{ 'LanguagesManager_TranslationSearch'|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ title }}</h2>
 
     <div piwik-translation-search></div>
 
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index 68e371079fe..4bcef0d7995 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -23,7 +23,8 @@
     </script>
 {% endblock %}
 
-{% block pageTitle %}{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}{% endblock %}
+{% set title %}{{ 'Login_LogIn'|translate }}{% endset %}
+
 {% block pageDescription %}{{ 'General_OpenSourceWebAnalytics'|translate }}{% endblock %}
 
 {% set bodyId = 'loginPage' %}
diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig
index b0b74c7f352..5a405a462ee 100644
--- a/plugins/MobileMessaging/templates/index.twig
+++ b/plugins/MobileMessaging/templates/index.twig
@@ -2,10 +2,12 @@
 
 {% import '@MobileMessaging/macros.twig' as macro %}
 
+{% set title %}{{ 'MobileMessaging_SettingsMenu'|translate }}{% endset %}
+
 {% block content %}
 
     {% if isSuperUser %}
-        <h2>{{ 'General_Settings'|translate }}</h2>
+        <h2>{{ title }}</h2>
 
         <div class="form-group">
             <label>{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }}</label>
diff --git a/plugins/MobileMessaging/templates/userSettings.twig b/plugins/MobileMessaging/templates/userSettings.twig
index e552551b3a4..c4a4417a772 100644
--- a/plugins/MobileMessaging/templates/userSettings.twig
+++ b/plugins/MobileMessaging/templates/userSettings.twig
@@ -1,5 +1,7 @@
 {% extends 'user.twig' %}
 
+{% set title %}{{ 'MobileMessaging_Settings_SMSProvider'|translate }}{% endset %}
+
 {% block content %}
 
     {% import 'ajaxMacros.twig' as ajax %}
@@ -11,8 +13,7 @@
     {% import '@MobileMessaging/macros.twig' as macro %}
 
     {% if accountManagedByCurrentUser and delegatedManagement %}
-        <h2 piwik-enriched-headline
-                >{{ 'MobileMessaging_Settings_SMSProvider'|translate }}</h2>
+        <h2 piwik-enriched-headline>{{ title }}</h2>
 
         {{ macro.manageSmsApi(credentialSupplied, creditLeft, smsProviders, provider) }}
     {% endif %}
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index 00c7b4b9635..c51e3d378cd 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -1,6 +1,6 @@
 {% extends 'layout.twig' %}
 
-{% block pageTitle %}{% if not isCustomLogo %}Piwik &rsaquo;{% endif %} {{ 'CoreAdminHome_Administration'|translate }}{% endblock %}
+{% set categoryTitle %}{{ 'CoreAdminHome_Administration'|translate }}{% endset %}
 
 {% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
 
diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig
index 7f63382d1e5..08230e0e9be 100644
--- a/plugins/Morpheus/templates/dashboard.twig
+++ b/plugins/Morpheus/templates/dashboard.twig
@@ -8,7 +8,8 @@
     <![endif]-->
 {% endblock %}
 
-{% block pageTitle %}{{ siteName|raw }} - {% if not isCustomLogo %}Piwik &rsaquo;{% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endblock %}
+{% set title %}{{ siteName|raw }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %}
+
 {% block pageDescription %}Web Analytics report for {{ siteName|escape("html_attr") }} - Piwik{% endblock %}
 
 {% set bodyClass = postEvent('Template.bodyClass', 'dashboard') %}
diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig
index f95af421175..0995add8c3d 100644
--- a/plugins/Morpheus/templates/demo.twig
+++ b/plugins/Morpheus/templates/demo.twig
@@ -1,5 +1,7 @@
 {% extends 'layout.twig' %}
 
+{% set title %}Piwik UI demo{% endset %}
+
 {% block head %}
     {{ parent() }}
 
@@ -62,7 +64,7 @@
 
     <div class="container">
 
-        <h1>Piwik UI demo</h1>
+        <h1>{{ title }}</h1>
         <p>
             This page is intended to show all the UI components and styles available to use in Piwik.
         </p>
diff --git a/plugins/Morpheus/templates/layout.twig b/plugins/Morpheus/templates/layout.twig
index 229ffddc3a4..1e9f1f0d5c5 100644
--- a/plugins/Morpheus/templates/layout.twig
+++ b/plugins/Morpheus/templates/layout.twig
@@ -3,7 +3,13 @@
     <head>
         {% block head %}
             <meta charset="utf-8">
-            <title>{% block pageTitle %}Piwik{% endblock %}</title>
+            <title>
+                {%- block pageTitle -%}
+                    {%- if title is defined %}{{ title }} - {% endif %}
+                    {%- if categoryTitle is defined %}{{ categoryTitle }} - {% endif %}
+                    {%- if not isCustomLogo %}Piwik{% endif %}
+                {%- endblock -%}
+            </title>
             <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
             <meta name="viewport" content="initial-scale=1.0"/>
             <meta name="generator" content="Piwik - free/libre analytics platform"/>
diff --git a/plugins/Morpheus/templates/user.twig b/plugins/Morpheus/templates/user.twig
index 346aa1f7f44..416f12e1167 100644
--- a/plugins/Morpheus/templates/user.twig
+++ b/plugins/Morpheus/templates/user.twig
@@ -1,6 +1,6 @@
 {% extends 'layout.twig' %}
 
-{% block pageTitle %}{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}{% endblock %}
+{% set categoryTitle %}{{ 'CoreAdminHome_Administration'|translate }}{% endset %}
 
 {% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
 
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 332b772b83f..98f6f58efb5 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -1,10 +1,12 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'PrivacyManager_TeaserHeadline'|translate }}{% endset %}
+
 {% block content %}
 {% import 'macros.twig' as piwik %}
 {% if isSuperUser %}
     <h2 piwik-enriched-headline
-        help-url="http://piwik.org/docs/privacy/">{{ 'PrivacyManager_TeaserHeadline'|translate }}</h2>
+        help-url="http://piwik.org/docs/privacy/">{{ title }}</h2>
     <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }}
         {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="http://piwik.org/privacy/" rel="noreferrer"  target="_blank">','</a>')|raw }}</p>
 
diff --git a/plugins/ScheduledReports/templates/index.twig b/plugins/ScheduledReports/templates/index.twig
index 09539ef8cd9..65ba2ba53ac 100644
--- a/plugins/ScheduledReports/templates/index.twig
+++ b/plugins/ScheduledReports/templates/index.twig
@@ -1,10 +1,12 @@
 {% extends 'user.twig' %}
 
+
+{% set title %}{{ 'ScheduledReports_PersonalEmailReports'|translate }}{% endset %}
+
 {% block content %}
 
 <div class="emailReports">
-    <h2 piwik-enriched-headline
-        help-url="http://piwik.org/docs/email-reports/">{{ 'ScheduledReports_PersonalEmailReports'|translate }}</h2>
+    <h2 piwik-enriched-headline help-url="http://piwik.org/docs/email-reports/">{{ title }}</h2>
 
     {% include "@CoreHome/_siteSelectHeader.twig" %}
 
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index 0c630c24096..47eeb6f373e 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit 0c630c240963446c90396939d323416852b3ea48
+Subproject commit 47eeb6f373eb4c9a2ae99c26aca6c24b969a329a
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 1d4994fd5fb..7935ae8a0d5 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -1,5 +1,7 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'SitesManager_WebsitesManagement'|translate }}{% endset %}
+
 {% block content %}
 
     <div ng-include="'plugins/SitesManager/templates/index.html?cb={{ cacheBuster }}'"></div>
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index 6c37dfee309..194ab49f539 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit 6c37dfee30982eda5c439b8c4422f5ecbd40a331
+Subproject commit 194ab49f5393f020524e1a3e35ead05230bf3624
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index fed5874b53c..c9b41dca971 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -1,11 +1,13 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'UserCountry_Geolocation'|translate }}{% endset %}
+
 {% block content %}
 {% import 'macros.twig' as piwik %}
 
 <h2 piwik-enriched-headline
     help-url="http://piwik.org/docs/geo-locate/"
-    id="location-providers">{{ 'UserCountry_Geolocation'|translate }}</h2>
+    id="location-providers">{{ title }}</h2>
 
 <div style="width:900px;">
 
diff --git a/plugins/UsersManager/templates/anonymousSettings.twig b/plugins/UsersManager/templates/anonymousSettings.twig
index 905236359ba..32c606499f4 100644
--- a/plugins/UsersManager/templates/anonymousSettings.twig
+++ b/plugins/UsersManager/templates/anonymousSettings.twig
@@ -1,9 +1,11 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}{% endset %}
+
 {% block content %}
 {% if isSuperUser %}
 
-    <h2 piwik-enriched-headline>{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ title }}</h2>
 
     {% if anonymousSites|length == 0 %}
 
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index f3ae34af9c6..8c48ad2f33f 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -1,9 +1,11 @@
 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'UsersManager_ManageAccess'|translate }}{% endset %}
+
 {% block content %}
 
 <h2 piwik-enriched-headline
-    help-url="http://piwik.org/docs/manage-users/">{{ 'UsersManager_ManageAccess'|translate }}</h2>
+    help-url="http://piwik.org/docs/manage-users/">{{ title }}</h2>
 <div id="sites" class="usersManager">
     <section class="sites_selector_container">
         <p>{{ 'UsersManager_MainDescription'|translate }}</p>
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index e964ecc1d60..b202407a073 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -1,8 +1,10 @@
 {% extends 'user.twig' %}
 
+{% set title %}{{ 'UsersManager_PersonalSettings'|translate }}{% endset %}
+
 {% block content %}
 
-<h2 piwik-enriched-headline>{{ 'UsersManager_PersonalSettings'|translate }}</h2>
+<h2 piwik-enriched-headline>{{ title }}</h2>
 
 <div class="ui-confirm" id="confirmPasswordChange">
     <h2>{{ 'UsersManager_ChangePasswordConfirm'|translate }}</h2>
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index 4fcc7da73a3..9e85db49aac 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit 4fcc7da73a376d0b077c4ffa30bd03acad265bfe
+Subproject commit 9e85db49aacb211d061d7b7f6aa42e280b49a0cb
diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
index 299e0282f9f..49a2b5f6c1a 100644
--- a/plugins/Widgetize/templates/index.twig
+++ b/plugins/Widgetize/templates/index.twig
@@ -1,5 +1,7 @@
 {% extends 'user.twig' %}
 
+{% set title %}{{ 'General_Widgets'|translate }}{% endset %}
+
 {% block content %}
 
 <div>
@@ -26,7 +28,7 @@
     });
 </script>
 
-<h2 piwik-enriched-headline>{{ 'General_Widgets'|translate }}</h2>
+<h2 piwik-enriched-headline>{{ title }}</h2>
 
 {% include "@CoreHome/_siteSelectHeader.twig" %}
 

From b5600905d710ccb77192dd1b855aa2a44fde9ba4 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 15 Sep 2015 10:53:57 +1200
Subject: [PATCH 2/2] UI tests: widget layout fixed #8769

---
 tests/UI/expected-ui-screenshots | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
index a54dac9f03b..0be2d603d0d 160000
--- a/tests/UI/expected-ui-screenshots
+++ b/tests/UI/expected-ui-screenshots
@@ -1 +1 @@
-Subproject commit a54dac9f03b96d8cba13b3d7917ae2728657855e
+Subproject commit 0be2d603d0dd9f2c8edb0d8b4b92f807aacefec3