From f90a8e863b4ce5cbbdc753044bd2bbbbc2d27b6d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 17 Nov 2022 15:26:48 +0000 Subject: [PATCH] Bug 32213: Reindent item search fields templates This patch reindents three item search field templates so that they have consistent indentation. To test, apply the patch and go to Administration -> Item search fields. Test all aspects of viewing, adding, and deleting item search fields. Everything should look correct and work correctly. Signed-off-by: David Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Edit: changed intendation on a tiny bit (cherry picked from commit 3381a6463cad9300bae89384fd47749a9887a0c7) Signed-off-by: Martin Renvoize --- .../admin-items-search-field-form.inc | 56 ++--- .../en/modules/admin/items_search_field.tt | 109 +++++---- .../en/modules/admin/items_search_fields.tt | 230 +++++++++--------- 3 files changed, 198 insertions(+), 197 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc index e7286bf62a..bf320e527e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc @@ -1,35 +1,35 @@ [% PROCESS 'html_helpers.inc' %]
    -
  1. - [% IF field %] - Name: - [% field.name | html %] - - [% ELSE %] - - - Required - [% END %] -
  2. -
  3. - +
  4. + [% IF field %] + Name: + [% field.name | html %] + + [% ELSE %] + + + Required + [% END %] +
  5. +
  6. + - Required -
  7. -
  8. - + Required +
  9. +
  10. + Required -
  11. -
  12. - +
  13. +
  14. + -
  15. -
  16. - - -
  17. + +
  18. + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt index 7aa147d30b..81f98ba7ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt @@ -3,75 +3,76 @@ [% SET footerjs = 1 %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] - Item search fields › Administration › Koha - [% INCLUDE 'doc-head-close.inc' %] + Item search fields › Administration › Koha + [% INCLUDE 'doc-head-close.inc' %] + - [% WRAPPER 'header.inc' %] - [% INCLUDE 'prefs-admin-search.inc' %] -[% END %] + [% WRAPPER 'header.inc' %] + [% INCLUDE 'prefs-admin-search.inc' %] + [% END %] [% WRAPPER 'sub-header.inc' %] - [% END %] -
-
-
-
+
+
+
+
-

Item search field: [% field.label | html %]

+

Item search field: [% field.label | html %]

-
-
- Edit field - [% INCLUDE 'admin-items-search-field-form.inc' field=field %] -
- -
-
-
- - Cancel -
-
+
+
+ Edit field + [% INCLUDE 'admin-items-search-field-form.inc' field=field %] +
+ +
+
+
+ + Cancel +
+
-
-
+
+
-
- -
-
+
+ +
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index 9c9837f2dc..95bf00979d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -3,131 +3,131 @@ [% SET footerjs = 1 %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] - Item search fields › Administration › Koha - [% INCLUDE 'doc-head-close.inc' %] + Item search fields › Administration › Koha + [% INCLUDE 'doc-head-close.inc' %] - [% WRAPPER 'header.inc' %] - [% INCLUDE 'prefs-admin-search.inc' %] -[% END %] + [% WRAPPER 'header.inc' %] + [% INCLUDE 'prefs-admin-search.inc' %] + [% END %] -[% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER 'sub-header.inc' %] + + [% END %] -
-
-
-
+
+
+
+
- + - [% IF field_added %] -
- Field successfully added: [% field_added.label | html %] -
- [% ELSIF field_not_added %] -
-

Failed to add field. Please make sure the field name doesn't already exist.

-

Check logs for more details.

-
- [% ELSIF field_deleted %] -
- Field successfully deleted. -
- [% ELSIF field_not_deleted %] -
-

Failed to delete field.

-

Check logs for more details.

-
- [% ELSIF field_updated %] -
- Field successfully updated: [% field_updated.label | html %] -
- [% ELSIF field_not_updated %] -
-

Failed to update field.

-

Check logs for more details.

-
- [% END %] - [% IF fields.size %] -
-

Item search fields

-
- - - - - - - - - - - - - [% FOREACH field IN fields %] - - - - - - - - - [% END %] - -
NameLabelMARC fieldMARC subfieldAuthorised values categoryActions
[% field.name | html %][% field.label | html %][% field.tagfield | html %][% field.tagsubfield | html %][% field.authorised_values_category | html %] - Edit - Delete -
-
-
- [% ELSE %] -

Item search fields

-
- There are no item search fields defined. -
- [% END %] + [% IF field_added %] +
+ Field successfully added: [% field_added.label | html %] +
+ [% ELSIF field_not_added %] +
+

Failed to add field. Please make sure the field name doesn't already exist.

+

Check logs for more details.

+
+ [% ELSIF field_deleted %] +
+ Field successfully deleted. +
+ [% ELSIF field_not_deleted %] +
+

Failed to delete field.

+

Check logs for more details.

+
+ [% ELSIF field_updated %] +
+ Field successfully updated: [% field_updated.label | html %] +
+ [% ELSIF field_not_updated %] +
+

Failed to update field.

+

Check logs for more details.

+
+ [% END %] + [% IF fields.size %] +
+

Item search fields

+
+ + + + + + + + + + + + + [% FOREACH field IN fields %] + + + + + + + + + [% END %] + +
NameLabelMARC fieldMARC subfieldAuthorised values categoryActions
[% field.name | html %][% field.label | html %][% field.tagfield | html %][% field.tagsubfield | html %][% field.authorised_values_category | html %] + Edit + Delete +
+
+
+ [% ELSE %] +

Item search fields

+
+ There are no item search fields defined. +
+ [% END %] -
-
-

Add a new field

- [% INCLUDE 'admin-items-search-field-form.inc' field=undef %] - -
-
- - Cancel -
-
+
+
+

Add a new field

+ [% INCLUDE 'admin-items-search-field-form.inc' field=undef %] + +
+
+ + Cancel +
+
-
-
+
+
-
- -
-
+
+ +
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] -- 2.39.5