From 34e21e2012ba6b0b1da1831cb75c6be37c755dcb Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 3 Oct 2023 16:59:16 +0000 Subject: [PATCH] Bug 34398: Fix inconsistencies in Record matching rules page titles, breadcrumbs, and headers This patch fixes some inconsistencies in the record matching rules administration page, making sure the page title, breadcrumb navigation, and page headers are consistent with each other. Some controls on this page have been updated to use Bootstrap link style with Font Awesome icons added. Test each page to confirm that page title, heading, and breadcrumbs are consistent: - Administration -> Record matching rules - New record matching rule - Edit record matching rule - Delete record matching rule - Test the process of adding new match points and new match checks, and removing match points and match checks. Signed-off-by: David Nind Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Katrin Fischer (cherry picked from commit 6cce6f9e1c1c3cc7697da15793fe99453115bd66) Signed-off-by: Fridolin Somers --- .../prog/en/modules/admin/matching-rules.tt | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 0c1e292215..dea65e1bed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -6,9 +6,9 @@ [% FILTER collapse %] [% IF ( matching_rule_form ) %] [% IF ( edit_matching_rule ) %] - [% t("Modify record matching rule") | html %] › + [% tx("Modify record matching rule '{code}'", { code = code }) | html %] › [% ELSE %] - [% t("Add record matching rule") | html %] › + [% t("New record matching rule") | html %] › [% END %] [% END %] [% IF ( delete_matching_rule_form ) %] @@ -79,9 +79,9 @@ [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF ( edit_matching_rule ) %] - <span>Modify record matching rule</span> + [% tx("Modify record matching rule '{code}'", { code = code }) | html %] [% ELSE %] - <span>Add record matching rule</span> + <span>New record matching rule</span> [% END %] [% END %] @@ -90,7 +90,7 @@ <a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a> [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Confirm deletion of record matching rule '[% code | html %]'</span> + [% tx("Confirm deletion of record matching rule '{code}'", { code = code }) | html %] [% END %] [% ELSE %] @@ -108,9 +108,9 @@ [% IF ( matching_rule_form ) %] [% IF ( edit_matching_rule ) %] - <h1>Modify record matching rule</h1> + <h1>[% tx("Modify record matching rule '{code}'", { code = code }) | html %]</h1> [% ELSE %] - <h1>Add record matching rule</h1> + <h1>New record matching rule</h1> [% END %] <form action="[% script_name | html %]" name="Aform" method="post"> <input type="hidden" name="op" value="[% confirm_op | html %]" /> @@ -158,11 +158,11 @@ [% ELSE %] <p id="addMatchPoint"> [% END %] - <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> + <a href="#" class="btn btn-link" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match point</a> </p> [% ELSE %] - <p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"> - Add match point</a> + <p id="addMatchPoint" style="display:none;"><a href="#" class="btn btn-link" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"> + <i class="fa fa-plus" aria-hidden="true"></i> New match point</a> </p> [% END %] @@ -170,7 +170,8 @@ [% FOREACH matchpoint IN matchpoints %] <div id="mp_[% matchpoint.mp_num | html %]" class="matchgroup"> <fieldset class="rows"> - <legend>Match point [% matchpoint.mp_num | html %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num | html %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend> + <legend>Match point [% matchpoint.mp_num | html %]</legend> + <p><a href="#" class="btn btn-link" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num | html %]', 'mp_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match point</a> <a href="#" class="btn btn-link" onclick="DeleteMatchpoint(this); return false;"><i class="fa fa-trash-can" aria-hidden="true"></i> Remove this match point</a></p> <ol> <li> <label for="mp_[% matchpoint.mp_num | html %]_search_index">Search index: </label> @@ -221,7 +222,8 @@ [% ELSE # IF ( edit_matching_rule ) %] <div id="mp_1" class="matchgroup"> <fieldset class="rows"> - <legend>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend> + <legend>Match point 1</legend> + <p><a href="#" class="btn btn-link" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match point</a> | <a href="#" class="btn btn-link" onclick="DeleteMatchpoint(this); return false;"><i class="fa fa-trash-can" aria-hidden="true"></i> Remove this match point</a></p> <ol> <li> <label for="mp_1_search_index">Search index: </label> @@ -271,16 +273,17 @@ [% ELSE %] <p id="addMatchCheck"> [% END %] - <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p> + <a href="#" class="btn btn-link" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match check</a></p> [% ELSE %] - <p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p> + <p id="addMatchCheck" style="display:none;"><a href="#" class="btn btn-link" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match check</a></p> [% END %] [% IF ( edit_matching_rule ) %] [% FOREACH matchcheck IN matchchecks %] <div id="mc_[% matchcheck.mc_num | html %]" class="matchgroup"> <fieldset class="rows"> - <legend>Match check [% matchcheck.mc_num | html %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num | html %]', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend> + <legend>Match check [% matchcheck.mc_num | html %]</legend> + <p><a href="#" class="btn btn-link" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num | html %]', 'mc_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match check</a> | <a href="#" class="btn btn-link" onclick="DeleteMatchcheck(this); return false;"><i class="fa fa-trash-can" aria-hidden="true"></i> Remove this match check</a></p> <input type="hidden" id="mc_[% matchcheck.mc_num | html %]_id" name="mc_[% matchcheck.mc_num | html %]_id" value="1" /> [% FOREACH src_component IN matchcheck.src_components %] <fieldset class="rows" id="mc_[% src_component.mc_num | html %]_src_c_[% src_component.comp_num | html %]"> @@ -350,7 +353,8 @@ [% ELSE # IF ( edit_matching_rule ) %] <div id="mc_1" class="matchgroup"> <fieldset class="rows"> - <legend>Match check 1 | <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend> + <legend>Match check 1</legend> + <p><a href="#" class="btn btn-link" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match check</a> | <a href="#" class="btn btn-link" onclick="DeleteMatchcheck(this); return false;"><i class="fa fa-trash-can" aria-hidden="true"></i> Remove this match check</a></p> <input type="hidden" id="mc_1_id" name="mc_1_id" value="1" /> <fieldset class="rows" id="mc_1_src_c_1"> <legend>Source (incoming) record check field</legend> @@ -482,7 +486,8 @@ [% IF ( matching_rule_form ) %] <div id="mp_template" class="matchgroup" style="display:none;"> <fieldset class="rows"> - <legend>Match point <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend> + <legend>Match point <span class="counter"></span></legend> + <p><a href="#" class="btn btn-link" onclick="DeleteMatchpoint(this); return false;"><i class="fa fa-trash-can" aria-hidden="true"></i> Remove this match point</a></p> <ol> <li> <label for="mp_num_search_index">Search index: </label> @@ -524,7 +529,8 @@ <div id="mc_template" class="matchgroup" style="display:none"> <fieldset class="rows"> - <legend>Match check <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend> + <legend>Match check <span class="counter"></span></legend> + <p><a href="#" class="button" onclick="DeleteMatchcheck(this); return false;"><i class="fa fa-trash-can" aria-hidden="true"></i> Remove this match check</a></p> <input type="hidden" id="mc_num_id" name="mc_num_id" value="1" /> <fieldset class="rows" id="mc_num_src_c_1"> <legend>Source (incoming) record check field</legend> -- 2.39.2