From 76aa938c379a96a94ddfff55dc811ee72cb36a02 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 31 Jan 2025 17:32:19 +0000 Subject: [PATCH] Bug 38718: (follow-up) Use main-container.inc on ILL requests page --- .../prog/en/includes/ill-filter.inc | 58 ++++++++++++++ .../prog/en/includes/main-container.inc | 1 + .../prog/en/modules/ill/ill-requests.tt | 78 ++----------------- 3 files changed, 65 insertions(+), 72 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc new file mode 100644 index 00000000000..52f71ac9506 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc @@ -0,0 +1,58 @@ +[% USE raw %] +[% USE Koha %] +[% PROCESS 'html_helpers.inc' %] +[% USE Branches %] + +
+
+

Filters

+
    +
  1. + + +
  2. +
  3. + + +
  4. +
  5. + + +
  6. +
  7. + + +
  8. +
  9. + + +
  10. +
  11. + + +
  12. +
  13. + + +
  14. +
  15. + + +
  16. +
  17. + + +
  18. +
+
+
+ + +
+
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 76bbffa0ab6..71f5727db07 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc @@ -23,6 +23,7 @@ [% CASE 'circ-nav' %][% INCLUDE 'circ-nav.inc' %] [% CASE 'facets' %][% INCLUDE 'facets.inc' %] [% CASE 'guided-reports-view' %][% INCLUDE 'guided-reports-view.inc' %] + [% CASE 'ill-filter' %][% INCLUDE 'ill-filter.inc' %] [% CASE 'vendor-menu' %][% INCLUDE 'vendor-menu.inc' %] [% CASE 'pos-menu' %][% INCLUDE 'pos-menu.inc' %] [% CASE 'prefs-menu' %][% INCLUDE 'prefs-menu.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index b9671a3f876..7444aff9c13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -52,80 +52,16 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -
-
+[% WRAPPER 'main-container.inc' wide_centered => ( op == 'illlist' ? 0 : 1 ) aside = ( op == 'illlist' ? 'ill-filter' : '' ) %] [% IF op == 'illlist' %] -
- -
- [% END %] - [% IF op == 'illlist' %] - [% SET div_class = 'col-sm-10' %] - [% ELSE %] - [% SET div_class = 'col-sm-10 offset-sm-2' %] [% END %] -
-
- [% INCLUDE 'messages.inc' %] -
+ +
+ [% IF !backends_available || !has_branch || ill_deprecated_backend_freeform_is_installed %]
ILL module configuration problem. Take a look at the about page
[% ELSE %] @@ -927,10 +863,8 @@ [% END %] [% END %]
-
-
-
-
+ +[% END %] [% MACRO jsinclude BLOCK %] -- 2.39.5