From 92632177717ed8216501c6e176896e7ccdbb174f Mon Sep 17 00:00:00 2001 From: Lupe Camacho Date: Fri, 3 May 2024 13:23:38 -0700 Subject: [PATCH 01/11] Update secondary nav toggle to have consistent label between screens; move content heading up to h1 and add unique page titles to pages in My Account region --- src/controllers/EditUserTrait.php | 5 ++++- src/templates/_layouts/cp.twig | 4 ++-- src/web/assets/admintable/dist/js/app.js | 2 +- src/web/assets/admintable/dist/js/app.js.map | 2 +- src/web/assets/cp/dist/cp.js | 2 +- src/web/assets/cp/dist/cp.js.map | 2 +- src/web/assets/cp/dist/css/cp.css | 2 +- src/web/assets/cp/dist/css/cp.css.map | 2 +- src/web/assets/cp/src/css/_cp.scss | 6 ++++++ src/web/assets/cp/src/js/CP.js | 3 ++- src/web/assets/pluginstore/dist/js/app.js | 2 +- src/web/assets/pluginstore/dist/js/app.js.map | 2 +- 12 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/controllers/EditUserTrait.php b/src/controllers/EditUserTrait.php index 5d873275db6..1404b7b85f9 100644 --- a/src/controllers/EditUserTrait.php +++ b/src/controllers/EditUserTrait.php @@ -122,7 +122,10 @@ protected function asEditUserScreen(User $user, string $screen): Response $response = $this->asCpScreen(); if ($user->getIsCurrent()) { - $response->title(Craft::t('app', 'My Account')); + $screenName = $screens[$screen]["label"]; + $regionName = Craft::t('app', 'My Account'); + $responseTitle = "$screenName - $regionName"; + $response->title($responseTitle); } else { $response->title($user->getUiLabel()); } diff --git a/src/templates/_layouts/cp.twig b/src/templates/_layouts/cp.twig index 831e4a91eec..5b265e438c3 100644 --- a/src/templates/_layouts/cp.twig +++ b/src/templates/_layouts/cp.twig @@ -216,7 +216,7 @@ history.replaceState(undefined, undefined, window.location.href.match(/^[^#]*/)[
{% block pageTitle %} {% if title is defined and title|length %} -

{{ title }}

+

{{ title }}

{% endif %} {% endblock %}
@@ -262,7 +262,7 @@ history.replaceState(undefined, undefined, window.location.href.match(/^[^#]*/)[ aria-controls="sidebar-container" aria-expanded="false" > - + {{ 'Show sidebar'|t('app') }}