From 0b2cc01ca570748876e35818067ef7724806fe81 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 2 Oct 2023 16:14:21 +0000 Subject: [PATCH] Bug 34391: Fix inconsistencies in cash registers titles, breadcrumbs, and headers Fix inconsistencies in cash register page titles, breadcrumbs, and header This patch fixes a couple of inconsistencies in the cash register administration page, making sure the page title, breadcrumb navigation, and page headers are consistent with each other. To test, apply the patch and go to Administration -> Cash register. Test each variation of the page: - Main page - New cash register - Modify cash register Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/admin/cash_registers.tt | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt index 2c5cf2236a..c2b117cf0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -8,12 +8,12 @@ [% FILTER collapse %] [% IF op == 'add_form' %] [% IF cash_register %] - [% tx("Modify cash register {cash_register}", { cash_register = cash_register.id }) | html %] + [% tx("Modify cash register '{cash_register}'", { cash_register = cash_register.name }) | html %] [% ELSE %] [% t("New cash register") | html %] [% END %] › [% ELSIF op == 'delete_confirm' %] - [% tx("Confirm deletion of cash register '{cash_register}'", { cash_register = cash_register.id }) | html %] › + [% tx("Confirm deletion of cash register ''{cash_register}''", { cash_register = cash_register.name }) | html %] › [% END %] [% t("Cash registers") | html %] › [% t("Administration") | html %] › @@ -46,7 +46,7 @@ [% IF op == 'add_form' %] [% IF cash_register %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Modify cash register [% cash_register.id | html %]</span> + [% tx("Modify cash register '{cash_register}'", { cash_register = cash_register.name }) | html %] [% END %] [% ELSE %] [% WRAPPER breadcrumb_item bc_active= 1 %] @@ -56,7 +56,7 @@ [% ELSIF op == 'delete_confirm' %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Confirm deletion of cash register '[% cash_register.id | html %]'</span> + [% tx("Confirm deletion of cash register '{cash_register}'", { cash_register = cash_register.id }) | html %] [% END %] [% END %] @@ -94,7 +94,13 @@ [% END %] [% IF op == 'add_form' %] - <h1>[% IF cash_register %]Modify cash register[% ELSE %]Add new cash register[% END %]</h1> + <h1> + [% IF cash_register %] + [% tx("Modify cash register '{cash_register}'", { cash_register = cash_register.name }) | html %] + [% ELSE %] + <span>New cash register</span> + [% END %] + </h1> <form action="/cgi-bin/koha/admin/cash_registers.pl" id="Aform" name="Aform" class="validated" method="post"> <fieldset class="rows"> @@ -153,11 +159,11 @@ <h1>Cash registers</h1> <div class="page-section"> - <h2>Cash registers for <select id="branch_filter" name="branch_filter"> - <option value=""></option> - [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] - </select> - </h2> + <label for="branch_filter"><strong>Filter by branch:</strong></label> + <select id="branch_filter" name="branch_filter"> + <option value=""></option> + [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] + </select> [% IF cash_registers.count %] <table id="table_cash_registers"> -- 2.39.5