From 66b81587ec29df50b9d5d9fa1bff85c95d5d561c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 19 Mar 2024 15:05:25 +0000 Subject: [PATCH] Bug 35895: Reindent tags review template This patch reindents the tags review template so that it has consistent indentation, with tab indentation coverted to space. The patch also adds "FILTER collapse" around the + [% FILTER collapse %] + [% IF ( filter_approved_ok ) %] + [% t("Approved") | html %] › + [% ELSIF ( filter_approved_pending ) %] + [% t("Pending") | html %] › + [% ELSIF ( filter_approved_rej ) %] + [% t("Rejected") | html %] › + [% END %] + [% t("Tags") | html %] › + [% t("Tools") | html %] › + [% t("Koha") | html %] + [% END %] + [% INCLUDE 'doc-head-close.inc' %] + [% FILTER collapse %][% END %] -[% WRAPPER 'header.inc' %] - [% INCLUDE 'cat-search.inc' %] -[% END %] + [% WRAPPER 'header.inc' %] + [% INCLUDE 'cat-search.inc' %] + [% END %] -[% WRAPPER 'sub-header.inc' %] - [% WRAPPER breadcrumbs %] - [% WRAPPER breadcrumb_item %] - Tools - [% END %] - [% IF ( filter_approved_ok || filter_approved_pending || filter_approved_rej ) %] + [% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] [% WRAPPER breadcrumb_item %] - Tags - [% END %] - [% ELSE %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - Tags - [% END %] - [% END %] - [% IF ( filter_approved_ok ) %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - [% t("Approved") | html %] + Tools [% END %] - [% ELSIF ( filter_approved_pending ) %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - [% t("Pending") | html %] + [% IF ( filter_approved_ok || filter_approved_pending || filter_approved_rej ) %] + [% WRAPPER breadcrumb_item %] + Tags + [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Tags + [% END %] [% END %] - [% ELSIF ( filter_approved_rej ) %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - [% t("Rejected") | html %] + [% IF ( filter_approved_ok ) %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% t("Approved") | html %] + [% END %] + [% ELSIF ( filter_approved_pending ) %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% t("Pending") | html %] + [% END %] + [% ELSIF ( filter_approved_rej ) %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% t("Rejected") | html %] + [% END %] [% END %] - [% END %] - [% END #/ WRAPPER breadcrumbs %] -[% END #/ WRAPPER sub-header.inc %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %] -
-
-
-
+
+
+
+
-
-
- [% INCLUDE 'messages.inc' %] -

Tags

-
- [% INCLUDE 'csrf-token.inc' %] -

- [% IF ( filter_approved_all ) %]Displaying all terms[% END %] - [% IF ( filter_approved_ok ) %]Displaying approved terms[% END %] - [% IF ( filter_approved_pending ) %]Displaying pending terms[% END %] - [% IF ( filter_approved_rej ) %]Displaying rejected terms[% END %] -

+
+
+ [% INCLUDE 'messages.inc' %] +

Tags

+ + [% INCLUDE 'csrf-token.inc' %] +

+ [% IF ( filter_approved_all ) %]Displaying all terms[% END %] + [% IF ( filter_approved_ok ) %]Displaying approved terms[% END %] + [% IF ( filter_approved_pending ) %]Displaying pending terms[% END %] + [% IF ( filter_approved_rej ) %]Displaying rejected terms[% END %] +

- [% IF ( op_count ) %] -
- [% IF ( op == 'cud-approve' ) %] Approved - [% ELSIF ( op == 'cud-reject' ) %] Rejected - [% ELSIF ( op == 'test' ) %] Tested - [% ELSE %]Unknown operation ([% op | html %]) on - [% END %] - [% op_count | html %] Term(s). -
- [% END %] - [% IF ( message_loop ) %] -
- [% FOREACH message_loo IN message_loop %] - [% IF ( message_loo.failed_ok ) %]Error: Failed to approve term ([% message_loo.failed_ok | html %]). - [% ELSIF ( message_loo.failed_rej ) %]Error: Failed to reject term ([% message_loo.failed_rej | html %]). - [% ELSIF ( message_loo.approver ) %]No match for user ([% message_loo.approver | html %]). FILTER REQUIRES BORROWERNUMBER (not name). - [% ELSIF ( message_loo.approved_by ) %]Error: No match for borrowernumber ([% message_loo.approved_by | html %]). - [% ELSE %]Unrecognized error! - [% END %] -
- [% END %] -
- [% END %] - [% IF ( pagination_bar ) %] -
- [% pagination_bar | $raw %] -
- [% END %] - [% IF ( tagloop ) %] -
-

- - - - - - - - - [% UNLESS ( filter_approved_pending ) %][% END %] - - - - - [% FOREACH tagloo IN tagloop %] - - - - - - [% IF ( tagloo.approved ) %] - - - [% ELSE %] - - [% UNLESS ( filter_approved_pending ) %][% END %] - [% END %] - - - [% END %] - -
 StatusTermWeightActionsReviewerDate
- [% IF ( tagloo.approved == 0 ) %] - - [% ELSIF ( tagloo.approved == 1 ) %] - - [% ELSE %] - - [% END %] - - [% IF ( tagloo.approved == -1 ) %] - - [% ELSIF ( tagloo.approved == 1 ) %] - - [% ELSE %] - - [% END %] - [% tagloo.term | html %] - [% tagloo.weight_total | html %] - - [% IF ( tagloo.approved_by_name ) %][% tagloo.approved_by_name | html %][% ELSE %] [% END %] - -   - [% tagloo.date_approved | $KohaDates %] -
-
- [% END %] - [% IF ( tagloop ) %]
- - -
[% END %] - -
-
- -
-
-
+
+ +
+
+ -
-
-
-
-
+ +
+
+ +
+
[% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] -- 2.30.2