Attachment 158221 Details for Bug 34406 – Bug 34406: Fix inconsistencies in Identity providers/domains page titles, breadcrumbs, and headers

[patch] Bug 34406: Fix inconsistencies in Identity providers/domains page titles, breadcrumbs, and headers

Bug-34406-Fix-inconsistencies-in-Identity-provider.patch (text/plain), 9.86 KB, created by Katrin Fischer on 2023-11-01 22:22:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-11-01 22:22:03 UTC

Size: 9.86 KB

patch

obsolete

>From 04190b3d07cc12125251e71d2bdb6c2e7c740ed0 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <david@davidnind.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../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 %] &rsaquo;
>     [% ELSIF op == 'edit_form' %]
>-        [% t("Edit identity provider domain") | html %] &rsaquo;
>+        [% tx("Modify identity provider domain '{domain}'", {domain = identity_provider_domain.domain}) | html %] &rsaquo;
>     [% END %]
>+    [% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %] &rsaquo;
>     [% t("Identity providers") | html %] &rsaquo;
>     [% t("Administration") | html %] &rsaquo;
>     [% t("Koha") | html %]
>@@ -34,23 +35,23 @@
> 
>         [% IF op == 'add_form' %]
>             [% WRAPPER breadcrumb_item %]
>-                <a href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | uri -%]">Domains for [%- identity_provider_code | html -%]</a>
>+                <a href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | uri -%]">[% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]</a>
>             [% END %]
>             [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                <span>New domain</span>
>+                <span>New identity provider domain</span>
>             [% END %]
> 
>         [% ELSIF op == 'edit_form' %]
>             [% WRAPPER breadcrumb_item %]
>-                <a href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | uri -%]">Domains for [%- identity_provider_code | html -%]</a>
>+                <a href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | uri -%]">[% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]</a>
>             [% END %]
>             [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                <span>Edit domain</span>
>+                [% tx("Modify identity provider domain '{domain}'", {domain = identity_provider_domain.domain}) | html %]
>             [% END %]
> 
>         [% ELSE %]
>             [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                <span>Domains for [%- identity_provider_code | html -%]</span>
>+                <span>[% tx("Domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]</span>
>             [% END %]
>         [% END %]
>     [% END #/ WRAPPER breadcrumbs %]
>@@ -82,8 +83,8 @@
>     <div class="dialog alert"   id="identity_provider_domain_delete_error"   style="display: none;"></div>
> 
> [% IF op == 'add_form' %]
>-    <h1>New email domain</h1>
>-    <div class="page-section">
>+    <h1>[% tx("New identity provider domain for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]</h1>
>+
>         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="add" name="add" class="validated" method="post">
>             <input type="hidden" name="op" value="add" />
>             <input type="hidden" name="domain_ops" value="1" />
>@@ -159,12 +160,12 @@
>                 <a class="cancel" href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | html -%]">Cancel</a>
>             </fieldset>
>         </form>
>-    </div>
>+
> [% END %]
> 
> [% IF op == 'edit_form' %]
>-    <h1>Edit identity provider domain</h1>
>-    <div class="page-section">
>+    <h1>[% tx("Modify identity provider domain '{domain}'", {domain = identity_provider_domain.domain}) | html %]</h1>
>+
>         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="edit_save" name="edit_save" class="validated" method="post">
>             <input type="hidden" name="op" value="edit_save" />
>             <input type="hidden" name="domain_ops" value="1" />
>@@ -265,16 +266,16 @@
>                 <a class="cancel" href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | html -%]">Cancel</a>
>             </fieldset>
>         </form>
>-    </div>
>+
> [% END %]
> 
> [% IF op == 'list' %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default" id="new_identity_provider_domain" href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | html -%]&amp;op=add_form"><i class="fa fa-plus"></i> New email domain</a>
>+        <a class="btn btn-default" id="new_identity_provider_domain" href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | html -%]&amp;op=add_form"><i class="fa fa-plus"></i> New identity provider domain</a>
>     </div>
> 
>-    <h1>Identity provider email domains</h1>
>+    <h1>[% tx("Identity provider domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]</h1>
>     <div class="page-section">
>         <table id="identity_provider_domains">
>             <thead>
>@@ -298,7 +299,7 @@
>                     <div class="modal-content">
>                         <div class="modal-header">
>                             <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                            <h3 id="delete_confirm_modal_label">Delete identity provider domain</h3>
>+                            <h3 id="delete_confirm_modal_label">Confirm deletion of identity provider domain</h3>
>                         </div>
>                         <div class="modal-body">
>                             <div id="delete_confirm_dialog"></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
>index 239c116693..423d0be223 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
>@@ -9,7 +9,7 @@
>     [% IF op == 'add_form' %]
>         [% t("New identity provider") | html %] &rsaquo;
>     [% ELSIF op == 'edit_form' %]
>-        [% t("Edit identity provider") | html %] &rsaquo;
>+        [% tx("Modify identity provider '{id_provider}'", {id_provider = identity_provider.code}) | html %] &rsaquo;
>     [% END %]
>     [% t("Identity providers") | html %] &rsaquo;
>     [% t("Administration") | html %] &rsaquo;
>@@ -41,7 +41,7 @@
>                 <a href="/cgi-bin/koha/admin/identity_providers.pl">Identity providers</a>
>             [% END %]
>             [% WRAPPER breadcrumb_item bc_active= 1 %]
>-                <span>Edit identity provider</span>
>+                [% tx("Modify identity provider '{id_provider}'", {id_provider = identity_provider.code}) | html %]
>             [% END %]
> 
>         [% ELSE %]
>@@ -80,7 +80,7 @@
> 
> [% IF op == 'add_form' %]
>     <h1>New identity provider</h1>
>-    <div class="page-section">
>+
>         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="add" name="add" class="validated" method="post">
>             <input type="hidden" name="op" value="add" />
>             <fieldset class="rows">
>@@ -229,12 +229,12 @@
>                 <a class="cancel" href="/cgi-bin/koha/admin/identity_providers.pl">Cancel</a>
>             </fieldset>
>         </form>
>-    </div>
>+
> [% END %]
> 
> [% IF op == 'edit_form' %]
>-    <h1>Edit identity provider</h1>
>-    <div class="page-section">
>+    <h1>[% tx("Modify identity provider '{id_provider}'", {id_provider = identity_provider.code}) | html %]</h1>
>+
>         <form action="/cgi-bin/koha/admin/identity_providers.pl" id="edit_save" name="edit_save" class="validated" method="post">
>             <input type="hidden" name="op" value="edit_save" />
>             <input type="hidden" name="identity_provider_id" value="[%- identity_provider.identity_provider_id | html -%]" />
>@@ -342,7 +342,7 @@
>                 <a class="cancel" href="/cgi-bin/koha/admin/identity_providers.pl">Cancel</a>
>             </fieldset>
>         </form>
>-    </div>
>+
> [% END %]
> 
> [% IF op == 'list' %]
>@@ -371,7 +371,7 @@
>                     <div class="modal-content">
>                         <div class="modal-header">
>                             <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                            <h3 id="delete_confirm_modal_label">Delete identity provider</h3>
>+                            <h3 id="delete_confirm_modal_label">Confirm deletion of identity provider</h3>
>                         </div>
>                         <div class="modal-body">
>                             <div id="delete_confirm_dialog"></div>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 34406: 156622 | 158021 | 158221 | 158222