Browse Source

Bug 13179 - Circulation page layout problem when OnSiteCheckoutsForce is enabled

The circulation page layout needs to work correctly for various
combinations of restrictions, no restrictions, and restrictions with
OnSiteCheckoutsForce enabled. This patch makes some minor accomodation
for all.

To test, load a patron for checkout under the following conditions:

1. OnSiteCheckoutsForce and patron is not blocked from checkout
2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for
   being expired or restricted).
3. OnSiteCheckoutsForce is on and patron is not blocked from checkout
4. OnSiteCheckoutsForce is on and patron is blocked from checkout

The page layout should look correct for all these cases, with a clean
two-column layout of [ checkout form | messages ] in all cases except

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Applied on top of 10860. Works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
3.18.x
Owen Leonard 8 years ago
committed by Tomas Cohen Arazi
parent
commit
c2a44cb08e
  1. 12
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

12
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

@ -572,7 +572,15 @@ No patron matched <span class="ex">[% message %]</span>
</fieldset>
</form></div>[% END %]<!-- /unless noissues -->
[% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %]
[% IF ( noissues ) %]
[% IF ( Koha.Preference('OnSiteCheckoutsForce') ) %]
<div class="yui-u">
[% ELSE %]
<div>
[% END %]
[% ELSE %]
<div class="yui-u">
[% END %]
[% IF flagged %]
[% IF NOT noissues || ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
@ -585,7 +593,7 @@ No patron matched <span class="ex">[% message %]</span>
[% IF noissues %]
Cannot check out!
[% IF Koha.Preference('OnSiteCheckoutsForce') %]
<span style="color:red;">Only on-site checkouts are allowed</span>
<span class="circ-hlt">Only on-site checkouts are allowed</span>
[% END %]
[% ELSE %]
Attention:

Loading…
Cancel
Save