@@ -, +, @@ process - Go to Administration -> System preferences and set HoldsSplitQueue to "nothing." - Perform a search in the staff client catalog and place multiple holds titles from that result set on hold for a patron. - Perform the same search and select one or more of the titles you selected before in addition to one or more titles with no holds. - After clicking the "Place hold" button you should see a page with the heading "Search patrons or clubs" showing information about existing holds. This section of the page should be clear and readable, with clear distinction between each section of information about each hold. - Test this page again under each different option for the "HoldsSplitQueue" system preference by changing the preference and reloading the page. --- .../intranet-tmpl/prog/css/src/holds.scss | 36 +++ .../prog/css/src/staff-global.scss | 10 + .../prog/en/includes/holds_table.inc | 19 +- .../prog/en/modules/reserve/request.tt | 259 +++++++++++------- 4 files changed, 218 insertions(+), 106 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/css/src/holds.scss --- a/koha-tmpl/intranet-tmpl/prog/css/src/holds.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/holds.scss @@ -0,0 +1,36 @@ +.hold_title { + border: 1px solid #b9d8d9; + border-bottom-color: darken( #b9d8d9, 15% ); + border-top-color: lighten( #b9d8d9, 10% ); + border-radius: 5px; + margin: .5em 0; + padding-bottom: 1em; + padding: 1em; +} + +.holds_table { + margin-bottom: 1em; + width: 100%; +} + +.holds_by_library, +.holds_by_itemtype { + margin-bottom: 1em; + margin-left: 1em; + + &:last-child { + .holds_table { + margin-bottom: 0; + } + } +} + +.holds_by_library { + .itemtype_holds { + color: #5D6A8A; + } + + &:last-child { + margin-bottom: 0; + } +} --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -927,6 +927,12 @@ fieldset { } } } + + table { + display: inline-block; + font-size: 105%; + margin: 0; + } } p { @@ -2460,6 +2466,10 @@ td { font-size: 105%; line-height: 200%; + h3 & { + font-size: 70%; + } + a, span { background-color: #E4ECF5; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -190,15 +190,22 @@ [%- END -%] [%- END -%] - - Cancel + + Cancel - [%- IF Koha.Preference('SuspendHoldsIntranet') -%] - [%- UNLESS ( hold.found ) -%] - - [%- IF Koha.Preference('AutoResumeSuspendedHolds') -%] + [% IF Koha.Preference('SuspendHoldsIntranet') %] + [% UNLESS ( hold.found ) %] + + + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] [%- ELSE -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -10,6 +10,7 @@ [% USE AuthorisedValues %] [% USE Price %] [% USE TablesSettings %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% UNLESS ( multi_hold ) %] @@ -18,6 +19,7 @@ Confirm holds › Holds › Circulation › Koha [% END %] [% INCLUDE 'doc-head-close.inc' %] +[% Asset.css("css/holds.css") | $raw %] @@ -54,9 +56,21 @@ Catalog
  • - - Confirm holds - + [% IF ( patron ) %] + + Place holds + + [% ELSE %] + [% IF clubcount %] + + Search patrons or clubs + + [% ELSE %] + + Search patrons + + [% END %] + [% END %]
  • @@ -102,12 +116,20 @@ [% END %] - [% UNLESS ( nobiblio ) %] - [% UNLESS ( multi_hold ) %] -

    Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]

    - [% ELSE %] -

    Confirm holds

    - [% END %] + [% UNLESS ( multi_hold ) %] +

    Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]

    + [% ELSE %] +

    + [% IF ( patron ) %] + Place holds + [% ELSE %] + [% IF clubcount %] + Search patrons or clubs + [% ELSE %] + Search patrons + [% END %] + [% END %] +

    [% END %] [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %] @@ -125,10 +147,12 @@ [% END %]
    - [% IF clubcount %] - - [% ELSE %] - + [% UNLESS multi_hold %] + [% IF clubcount %] + + [% ELSE %] + + [% END %] [% END %]