From eedd3223bc45e3722396e9b7718586de5201788d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Oct 2023 11:24:49 +0000 Subject: [PATCH] Bug 34405: Fix inconsistencies in EDI accounts/Library EAN page titles, breadcrumbs, and headers This patch fixes some inconsistencies in templates for EDI accounts and Library EANs, 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 -> EDI accounts - New EDI account - Edit EDI account - Confirm deletion of EDI account - Administration -> Library EANs - New library EAN - Edit library EAN - Confirm deletion of EDI account - With an account for a specific library - With an account for any library Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/admin/edi_accounts.tt | 33 +++++++------ .../prog/en/modules/admin/edi_ean_accounts.tt | 47 ++++++++++++------- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index 9ca20268fe..a22ac9117d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -7,13 +7,13 @@ [% FILTER collapse %] [% IF acct_form %] [% IF account %] - [% t("Modify account") | html %] + [% tx("Modify account '{edi_account}' for vendor '{vendor}'", { edi_account = account.description, vendor = account.vendor.name }) %] [% ELSE %] - [% t("Add new account") | html %] + [% t("New account") | html %] [% END %] › [% END %] [% IF delete_confirm %] - [% t("Confirm deletion of account") | html %] › + [% tx("Confirm deletion of account '{edi_account}' for vendor '{vendor}'", { edi_account = account.description, vendor = account.vendor.name }) %] [% END %] [% t("EDI accounts") | html %] › [% t("Administration") | html %] › @@ -45,17 +45,17 @@ [% IF acct_form %] [% IF account %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Modify account</span> + [% tx("Modify account '{edi_account}' for vendor '{vendor}'", { edi_account = account.description, vendor = account.vendor.name }) %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Add new account</span> + <span>New account</span> [% END %] [% END %] [% ELSIF delete_confirm %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Confirm deletion of account</span> + [% tx("Confirm deletion of account '{edi_account}' for vendor '{vendor}'", { edi_account = account.description, vendor = account.vendor.name }) %] [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] @@ -88,16 +88,15 @@ [% IF account %] <input type="hidden" name="id" value="[% account.id | html %]" /> [% END %] + <h1> + [% IF account %] + [% tx("Modify account '{edi_account}' for vendor '{vendor}'", { edi_account = account.description, vendor = account.vendor.name }) %] + [% ELSE %] + <span>New account</span> + [% END %] + </h1> <fieldset class="rows"> - <legend> - <h1> - [% IF account %] - Modify account - [% ELSE %] - New account - [% END %] - </h1> - </legend> + <legend class="sr-only">Account details</legend> <ol> <li> @@ -265,7 +264,7 @@ [% END %] [% IF delete_confirm %] <div class="dialog alert"> -<h1>Delete this account?</h1> +<h1>Confirm deletion of account?</h1> <table> <tr> <th>Vendor</th> @@ -294,7 +293,7 @@ [% END %] [% IF display %] [% IF ( ediaccounts ) %] -<h1>Vendor EDI accounts</h1> +<h1>EDI accounts</h1> <div class="page-section"> <table> <tr> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index 9ece137035..36f934ad38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -6,13 +6,17 @@ <title>[% FILTER collapse %] [% IF ean_form %] [% IF ean %] - [% t("Modify library EAN") | html %] + [% tx("Modify library EAN '{ean}'", { ean = ean.description }) %] [% ELSE %] - [% t("Add new library EAN") | html %] + [% t("New library EAN") | html %] [% END %] › [% END %] [% IF delete_confirm %] - [% t("Confirm deletion of EAN") | html %] › + [% IF ( ean.branch.branchname ) %] + [% tx("Confirm deletion of EAN '{ean}' for '{library}'?", { ean = ean.description, library = ean.branch.branchname }) %] + [% ELSE %] + [% tx("Confirm deletion of EAN '{ean}'?", { ean = ean.description }) %] + [% END %] › [% END %] [% t("Library EANs") | html %] › [% t("Administration") | html %] › @@ -37,9 +41,9 @@ [% END %] [% WRAPPER breadcrumb_item bc_active= 1%] [% IF ean %] - <span>Modify library EAN</span> + [% tx("Modify library EAN '{ean}'", { ean = ean.description }) %] [% ELSE %] - <span>Add new library EAN</span> + <span>New library EAN</span> [% END %] [% END %] @@ -48,7 +52,11 @@ <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a> [% END %] [% WRAPPER breadcrumb_item bc_active= 1%] - <span>Confirm deletion of EAN</span> + [% IF ( ean.branch.branchname ) %] + [% tx("Confirm deletion of EAN '{ean}' for '{library}'?", { ean = ean.description, library = ean.branch.branchname }) %] + [% ELSE %] + [% tx("Confirm deletion of EAN '{ean}'?", { ean = ean.description }) %] + [% END %] [% END %] [% ELSE %] @@ -81,16 +89,16 @@ <input type="hidden" name="id" value="[% ean.id | html %]" /> [% END %] + <h1> + [% IF ean %] + [% tx("Modify library EAN '{ean}'", { ean = ean.description }) %] + [% ELSE %] + <span>New EAN</span> + [% END %] + </h1> + <fieldset class="rows"> - <legend> - <h1> - [% IF ean %] - Modify EAN - [% ELSE %] - New EAN - [% END %] - </h1> - </legend> + <legend class="sr-only">EAN details</legend> <ol> <li> @@ -142,7 +150,14 @@ [% IF delete_confirm %] <div class="dialog alert"> -<h1>Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?</h1> + <h1> + [% IF ( ean.branch.branchname ) %] + [% tx("Confirm deletion of EAN '{ean}' for '{library}'?", { ean = ean.description, library = ean.branch.branchname }) %] + [% ELSE %] + [% tx("Confirm deletion of EAN '{ean}'?", { ean = ean.description }) %] + [% END %] + </h1> + <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post"> <input type="hidden" name="op" value="delete_confirmed" /> <input type="hidden" name="id" value="[% ean.id | html %]" /> -- 2.20.1