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 %}
-
{{ 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 ›{% 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 @@
{% endblock %}
-{% block pageTitle %}{{ siteName|raw }} - {% if not isCustomLogo %}Piwik ›{% 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 @@
-
Piwik UI demo
+
{{ title }}
This page is intended to show all the UI components and styles available to use in Piwik.
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 @@
{% block head %}
-
{% block pageTitle %}Piwik{% endblock %}
+
+ {%- block pageTitle -%}
+ {%- if title is defined %}{{ title }} - {% endif %}
+ {%- if categoryTitle is defined %}{{ categoryTitle }} - {% endif %}
+ {%- if not isCustomLogo %}Piwik{% endif %}
+ {%- endblock -%}
+
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 › {% 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 %}
{{ 'PrivacyManager_TeaserHeadline'|translate }}
+ help-url="http://piwik.org/docs/privacy/">{{ title }}
{{ 'PrivacyManager_Teaser'|translate('',"",'',"",'',"")|raw }}
{{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('','')|raw }}
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 %}
-
{{ 'ScheduledReports_PersonalEmailReports'|translate }}
+
{{ title }}
{% 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 %}
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 %}
{{ 'UserCountry_Geolocation'|translate }}
+ id="location-providers">{{ title }}
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 %}
-
{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}
+
{{ title }}
{% 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 %}
{{ 'UsersManager_ManageAccess'|translate }}
+ help-url="http://piwik.org/docs/manage-users/">{{ title }}
{{ 'UsersManager_MainDescription'|translate }}
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 %}
-{{ 'UsersManager_PersonalSettings'|translate }}
+{{ title }}
{{ 'UsersManager_ChangePasswordConfirm'|translate }}
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 %}
@@ -26,7 +28,7 @@
});
-
{{ 'General_Widgets'|translate }}
+{{ title }}
{% include "@CoreHome/_siteSelectHeader.twig" %}
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