Fix for bug 1427

[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / circulation.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 647046c..d4ac1d5 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -43,10 +43,11 @@
 <!-- /TMPL_IF -->
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-
+<!-- TMPL_IF NAME="dateexpiry" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-<div class="yui-g" style="text-align: center"><div id="circ_needsconfirmation" class="dialog">
-<div><div class="confirm">
+<div class="yui-g">
+
+<div id="circ_needsconfirmation" class="dialog alert">
 <h3>Please Confirm Checkout</h3>
 
 <ul>
@@ -94,6 +95,7 @@
     <input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
     <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
     <input type="hidden" name="issueconfirmed" value="1" />
+       <input type="hidden" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" />
     <input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
     <input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
     <input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
@@ -106,7 +108,7 @@
     <input type="submit" class="deny" value="No, Don't Check Out (N)" accesskey="n" />
 </form>
 
-</div></div></div></div>
+</div></div>
 
 <!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
 
@@ -265,9 +267,19 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                <h3><!-- TMPL_IF NAME="noissues" -->Cannot Check Out!<!-- TMPL_ELSE -->Attention:<!-- /TMPL_IF --></h3>
                <ul>
                
-                       <!--TMPL_IF Name="warndeparture"-->
-                       <li><span class="circ-hlt">Expiration:</span> Patron card has expired or will expire soon.</li>
-                       <!--/TMPL_IF-->
+                       <!-- TMPL_IF NAME = "warndeparture" -->
+                       <li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
+                       Patron's card expires on <!-- TMPL_VAR NAME="expiry" --> <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?modify=edit&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Edit Details</a>
+                       
+                       </li>
+                       <!-- /TMPL_IF -->
+
+                       <!-- TMPL_IF NAME = "expired" -->
+                       <li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
+                       Patron's card expired on <!-- TMPL_VAR NAME="expiry" --> <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?modify=edit&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Edit Details</a>
+                       
+                       </li>
+                       <!-- /TMPL_IF -->
 
             <!-- TMPL_IF NAME="gna" -->
                        <li class="blocker"><span class="circ-hlt">Address:</span> Patron's address in doubt</li>
@@ -278,7 +290,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                        <!-- /TMPL_IF -->
                        
             <!-- TMPL_IF NAME="dbarred" --><li class="blocker">
-               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a></li><!-- /TMPL_IF -->
+               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a>
+</li><!-- /TMPL_IF -->
 
                <!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" --><span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>
             <!-- /TMPL_IF -->