From 7daf1ff10e71fd26a7120c80dd236ddb80476c94 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 31 Oct 2014 11:50:35 -0400
Subject: [PATCH] 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>
---
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt      |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index c971f04..bd1e11d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -556,7 +556,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') ) %]
@@ -569,7 +577,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:
-- 
1.7.10.4