Merge pull request #8788 from piwik/nice_titles_in_admin_screens

Set HTML <title> values in all user menu and admin menu pages

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."

plugins/API/templates/listAllAPI.twig

 {% 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" %}
 

plugins/CoreAdminHome/templates/generalSettings.twig

 {% extends 'admin.twig' %}
 
+{% set title %}{{ 'CoreAdminHome_MenuGeneralSettings'|translate }}{% endset %}
+
 {% block content %}
     {% import 'macros.twig' as piwik %}
     {% import 'ajaxMacros.twig' as ajax %}

plugins/CoreAdminHome/templates/pluginSettings.twig

 
 {% 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 }}">
 

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">
 

plugins/CorePluginsAdmin/templates/marketplace.twig

 {% 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">

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 }}

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 %}

plugins/DBStats/templates/index.twig

 {% 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 }}

plugins/DevicesDetection/Controller.php

@@ -59,7 +59,7 @@ class Controller extends \Piwik\Plugin\Controller
         return $view->render();
     }
 
-    public function deviceDetection()
+    public function detection()
     {
         Piwik::checkUserHasSomeAdminAccess();
 

plugins/DevicesDetection/Menu.php

@@ -20,7 +20,7 @@ class Menu extends \Piwik\Plugin\Menu
     {
         if (Piwik::isUserHasSomeAdminAccess()) {
             $menu->addDiagnosticItem('DevicesDetection_DeviceDetection',
-                                     $this->urlForAction('deviceDetection'),
+                                     $this->urlForAction('detection'),
                                      $order = 40);
         }
     }

plugins/DevicesDetection/templates/detection.twig

 {% 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>
 

plugins/ExampleUI/templates/notifications.twig

 {% 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

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(

plugins/Goals/templates/manageGoals.twig

 {% 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" %}

plugins/Installation/templates/systemCheckPage.twig

 {% 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">

plugins/LanguagesManager/templates/searchTranslation.twig

 {% 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>
 

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' %}

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>

plugins/MobileMessaging/templates/userSettings.twig

 {% 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 %}