@@ -, +, @@ rule when OnSiteCheckoutsForce is on being expired or restricted). --- .../intranet-tmpl/prog/en/css/staff-global.css | 15 +++--- .../prog/en/modules/circ/circulation.tt | 50 ++++++++++++-------- 2 files changed, 38 insertions(+), 27 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -968,7 +968,8 @@ tr.highlight th[scope=row] { margin: .2em 0; } -.date-select { +.date-select, +.onsite_checkout-select { font-size : 85%; padding-top : .3em; } @@ -2715,16 +2716,16 @@ span.browse-button { color : #FFF; } -.onsite_checkout-select { - font-size : 85%; - font-weight: normal; - padding-top : .3em; -} #circ_circulation_issue .onsite_checkout-select label, .onsite_checkout-select label { font-size : inherit; font-weight: normal; } span.onsite_checkout { - color: red; + color: #cc0000; } +.onsite-checkout-only { + background-color : rgba(255, 242, 206, 0.5); + border-radius: 4px; + border : 1px solid #FFF2CE; +} --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -536,29 +536,39 @@ No patron matched [% message %] - [% IF ( SpecifyDueDate ) %]
-
Specify due date [% INCLUDE 'date-format.inc' %]:
- [% IF ( duedatespec ) %][% ELSE %] -[% END %] - -[% IF ( stickyduedate ) %] - -[% ELSE %] - -[% END %] - -
[% END %] + [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] + [% IF ( SpecifyDueDate ) %] +
+
Specify due date [% INCLUDE 'date-format.inc' %]:
+ [% IF ( duedatespec ) %] + + [% ELSE %] + + [% END %] + + [% IF ( stickyduedate ) %] + + [% ELSE %] + + [% END %] + +
+ [% END %] + [% END %] - [% IF Koha.Preference('OnSiteCheckouts') %] + [% IF Koha.Preference('OnSiteCheckouts') %]
- [% IF noissues %] - - - [% ELSE %] - - [% END %] + [% IF noissues %] +
+ + + +
+ [% ELSE %] + + [% END %]
- [% END %] + [% END %] --