@@ -, +, @@ - Go to Circulation -> Holds queue. - Submit the form with one or more filters selected. - On the results page the queue should be correctly filtered and the sidebar should show your search fields preselected. - Test with the CircSidebar preference enabled and disabled. The circulation menu should appear correctly, with the filter form only displaying in the sidebar after submitting the form. --- .../prog/css/src/staff-global.scss | 5 + .../prog/en/modules/circ/view_holdsqueue.tt | 104 ++++++++++-------- 2 files changed, 65 insertions(+), 44 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -223,6 +223,11 @@ aside { margin-right: 3px; width: calc(100% - 20px); } + + &+.action { + margin-left: 0; + padding: 0; + } } } } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -202,58 +202,74 @@ [% END %] [% END %] -[% UNLESS ( total ) %] -
-
-
    -
  1. - - -
  2. -
  3. - - -
  4. -
  5. - - -
  6. -
  7. - - -
  8. -
-
-
-
-[% END %] + [% UNLESS ( total ) %] + [% PROCESS filter_form %] + [% END %] - [% IF Koha.Preference('CircSidebar') %] - -
-
+ [% IF ( total || Koha.Preference('CircSidebar') ) %] +
+ -
- + [% END %] + + [% END %] + +[% BLOCK filter_form %] +
+ [% IF ( total ) %] +
+ [% ELSE -%] +
+ [% END %] +
    +
  1. + + +
  2. +
  3. + + +
  4. +
  5. + + +
  6. +
  7. + + +
  8. +
+
+
+ + +
+ +[% END %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] --