From 1d17e36e366167db25caed5dcf4b2906cc84b241 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 29 Oct 2014 11:17:56 -0400
Subject: [PATCH] Bug 643 [Template follow-up] Allow override of 'debarred'
 status

This minor followup makes two changes:

- Replaced instances of "Debarment" with "Restriction"
- Moved the override button into the block where the "View restrictions"
  button is, making the section slightly more compact.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Some small template changes, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/modules/circ/circulation.tt          | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 a9ea8f54ed..ca492efd31 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -425,7 +425,7 @@ $(document).ready(function() {
         </ul>
 
         [% IF (forceallow) %]
-            <li>Debarment overridden temporarily</li>
+            <li>Restriction overridden temporarily</li>
         [% END %]
 
 </div></div>
@@ -435,7 +435,7 @@ $(document).ready(function() {
 [% END %]
 
   [% IF (forceallow) %]
-      <div id="overridden_debarment" class="dialog alert">Debarment overridden temporarily</div>
+      <div id="overridden_debarment" class="dialog alert">Restriction overridden temporarily</div>
   [% END %]
 
     [% END %] <!-- /impossible -->
@@ -603,6 +603,11 @@ No patron matched <span class="ex">[% message %]</span>
 
                    <br/>
                    <a class="btn btn-small" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="icon-ban-circle"></i> View restrictions</a>
+                    [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %]
+                        <span class="override_debarment">
+                            <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% borrowernumber %]" class="btn btn-small">Override restriction temporarily</a>
+                        </span>
+                    [% END %]
                </li>
             [% END %]
 
@@ -627,13 +632,6 @@ No patron matched <span class="ex">[% message %]</span>
 
 
 			</ul>
-
-[% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %]
-<div class="override_debarment">
-<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% borrowernumber %]" class="btn btn-small">Override debarment temporarily</a>
-</div>
-[% END %]
-
         </div>
 
 			[% IF ( WaitingReserveLoop ) %]
-- 
2.39.5