From 99779530d9c3dd43d75521ba34aefd3a133de6b5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 31 Jan 2025 18:22:53 +0000 Subject: [PATCH] Bug 38718: (follow-up) Use container wrapper on tags page --- .../prog/en/includes/main-container.inc | 1 + .../prog/en/includes/tags-filter.inc | 50 +++++++++++++++++ .../prog/en/modules/tags/review.tt | 56 ++----------------- 3 files changed, 55 insertions(+), 52 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc index 71f5727db07..e23c227aa71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc @@ -31,6 +31,7 @@ [% CASE 'serials-advsearch_brief' %][% INCLUDE 'serials-advsearch.inc' brief=1 %] [% CASE 'serials-menu' %][% INCLUDE 'serials-menu.inc' %] [% CASE 'subscriptions-search' %][% INCLUDE 'subscriptions-search.inc' %] + [% CASE 'tags-filter' %][% INCLUDE 'tags-filter.inc' %] [% CASE 'tools-menu' %][% INCLUDE 'tools-menu.inc' %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc new file mode 100644 index 00000000000..f7eb46c36a2 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc @@ -0,0 +1,50 @@ +
+
+

Filters

+
    +
  1. + +
  2. +
  3. + + +
  4. +
  5. + +
  6. +
  7. + + +
    [% INCLUDE 'date-format.inc' %]
    + + + +
    [% INCLUDE 'date-format.inc' %]
    +
  8. +
+
+
+ +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index 322a9b9cd13..b8bf303eed3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -76,11 +76,8 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -
-
-
-
- [% INCLUDE 'messages.inc' %] +[% WRAPPER 'main-container.inc' asides=['tags-filter', 'tools-menu'] %] +

Tags

@@ -267,53 +264,8 @@
-
- -
-
- -
-
- + +[% END %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] -- 2.39.5