From b75bcd7e9400fabc35144261cf16b2333e426e60 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Oct 2023 12:20:23 +0000 Subject: [PATCH] Bug 34406: Fix inconsistencies in Identity providers/domains page titles, breadcrumbs, and headers This patch fixes some inconsistencies in the templates for identity providers and identity provider domains, making sure the page title, breadcrumb navigation, and page headers are consistent with each other. To test, apply the patch and check these views: - Administration -> Identity providers - New identity provider - Edit identity provider - Confirm deletion of identity provider - Manage domains - New domain - Edit domain - Confirm deletion of domain Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../admin/identity_provider_domains.tt | 31 ++++++++++--------- .../en/modules/admin/identity_providers.tt | 16 +++++----- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt index eb58e7b7df..150fc07a6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt @@ -9,8 +9,9 @@ [% IF op == 'add_form' %] [% t("New identity provider domain") | html %] › [% ELSIF op == 'edit_form' %] - [% t("Edit identity provider domain") | html %] › + [% tx("Modify identity provider domain '{domain}'", {domain = identity_provider_domain.domain}) | html %] › [% END %] + [% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %] › [% t("Identity providers") | html %] › [% t("Administration") | html %] › [% t("Koha") | html %] @@ -34,23 +35,23 @@ [% IF op == 'add_form' %] [% WRAPPER breadcrumb_item %] - Domains for [%- identity_provider_code | html -%] + [% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - New domain + New identity provider domain [% END %] [% ELSIF op == 'edit_form' %] [% WRAPPER breadcrumb_item %] - Domains for [%- identity_provider_code | html -%] + [% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Edit domain + [% tx("Modify identity provider domain '{domain}'", {domain = identity_provider_domain.domain}) | html %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Domains for [%- identity_provider_code | html -%] + [% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %] [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] @@ -82,8 +83,8 @@ [% IF op == 'add_form' %] -

New email domain

-
+

[% tx("New identity provider domain for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]

+
@@ -159,12 +160,12 @@ Cancel
-
+ [% END %] [% IF op == 'edit_form' %] -

Edit identity provider domain

-
+

[% tx("Modify identity provider domain '{domain}'", {domain = identity_provider_domain.domain}) | html %]

+
@@ -265,16 +266,16 @@ Cancel
-
+ [% END %] [% IF op == 'list' %] -

Identity provider email domains

+

[% tx("Identity provider domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]

@@ -298,7 +299,7 @@