From 1d17e36e366167db25caed5dcf4b2906cc84b241 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Some small template changes, no problems found. Signed-off-by: Tomas Cohen Arazi --- .../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() { [% IF (forceallow) %] -
  • Debarment overridden temporarily
  • +
  • Restriction overridden temporarily
  • [% END %] @@ -435,7 +435,7 @@ $(document).ready(function() { [% END %] [% IF (forceallow) %] -
    Debarment overridden temporarily
    +
    Restriction overridden temporarily
    [% END %] [% END %] @@ -603,6 +603,11 @@ No patron matched [% message %]
    View restrictions + [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] + + Override restriction temporarily + + [% END %] [% END %] @@ -627,13 +632,6 @@ No patron matched [% message %] - -[% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] - -[% END %] - [% IF ( WaitingReserveLoop ) %] -- 2.39.5