From f04d2accf8a99ffa390ef38cdf2101d04acbe73f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 18 Mar 2020 19:14:40 +0000 Subject: [PATCH] Bug 24899: Reindent record matching rules template This patch reindents the template the record matching rules template. The only non-whitespace changes where lines were combined or split. The diff using the '-w' flag to ignore whitespace should highlight only moved lines. Test that functionality is unaffected: Administration -> Record matching rules. Test adding, editing, and deleting record matching rules. Test adding, editing, and deleting match points and match checks. Confirm that changes are saved correctly. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/admin/matching-rules.tt | 1061 ++++++++--------- 1 file changed, 524 insertions(+), 537 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 9eccfaa329..08dc372b1c 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 @@ -4,75 +4,82 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Record matching rules [% IF ( matching_rule_form ) %] - [% IF ( edit_matching_rule ) %] - › Modify record matching rule - [% ELSE %] - › Add record matching rule - [% END %] + [% IF ( edit_matching_rule ) %] + › Modify record matching rule + [% ELSE %] + › Add record matching rule + [% END %] [% END %] [% IF ( delete_matching_rule_form ) %] - › Confirm deletion of record matching rule "[% code | html %]" + › Confirm deletion of record matching rule "[% code | html %]" [% END %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK norms_text %] -[% SWITCH norm %] -[% CASE 'none' %]None -[% CASE 'remove_spaces' %]Remove spaces -[% CASE 'upper_case' %]Uppercase -[% CASE 'lower_case' %]Lowercase -[% CASE 'legacy_default' %]Legacy default -[% CASE 'ISBN' %]ISBN -[% CASE %][% norm | html %] -[% END %] + [% SWITCH norm %] + [% CASE 'none' %]None + [% CASE 'remove_spaces' %]Remove spaces + [% CASE 'upper_case' %]Uppercase + [% CASE 'lower_case' %]Lowercase + [% CASE 'legacy_default' %]Legacy default + [% CASE 'ISBN' %]ISBN + [% CASE %][% norm | html %] + [% END %] [% END %] [% BLOCK norms_options %] -[%# PARAMS: selected_norm %] -[% FOREACH norm IN valid_norms %] -[% IF ( norm == selected_norm ) %] - -[% ELSE %] - -[% END %] -[% END %] + [%# PARAMS: selected_norm %] + [% FOREACH norm IN valid_norms %] + [% IF ( norm == selected_norm ) %] + + [% ELSE %] + + [% END %] + [% END %] [% END %] [% BLOCK norms_select %] -[%# PARAMS: selected_norm, id, name %] -[% UNLESS valid_norms.grep(selected_norm).size %] -[%# Fallback to 'none' %] -[% selected_norm = 'none' %] -[% END %] + [%# PARAMS: selected_norm, id, name %] + [% UNLESS valid_norms.grep(selected_norm).size %] + [%# Fallback to 'none' %] + [% selected_norm = 'none' %] + [% END %] [% END %] [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] -