(bug #2812) fix holds cancel in OPAC

[srvgit] / koha-tmpl / opac-tmpl / prog / en / modules / opac-user.tmpl

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index e5a36ca..cc86652 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -75,17 +75,28 @@ $.tablesorter.addParser({
     <div id="yui-main">
     <div class="yui-b"><div class="yui-g">
        <div id="userdetails" class="container">
+
+       <!-- TMPL_IF NAME="bor_messages" -->
+              <div class="dialog message">
+                      <h3>Messages For You</h3>
+                      <ul>
+                              <!--TMPL_LOOP NAME="bor_messages_loop" -->
+                                       <li>
+                                               <strong><!--TMPL_VAR NAME="message"--></strong><br>
+                                               &nbsp;&nbsp;&nbsp;<i>Written on <!--TMPL_VAR NAME="message_date_formatted"--> by <!--TMPL_VAR NAME="branchname"--></i>
+                                       </li>
+                               <!-- /TMPL_LOOP -->
+
+                               <!-- TMPL_IF NAME="opacnote" --><li><!-- TMPL_VAR name="opacnote" --></li><!-- /TMPL_IF -->
+                      </ul>
+              </div>
+       <!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
         <h2>Hello, <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> <span class="hint">(<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span></h2>
         
                <!-- TMPL_IF NAME="patronupdate" --><div class="dialog message"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div><!-- /TMPL_IF -->
                
-        <!-- TMPL_IF NAME="opacnote"-->
-               <div class="dialog message">
-            <h3>Message from the library</h3>
-            <p><!-- TMPL_VAR name="opacnote" --></p>
-               </div>
-        <!-- /TMPL_IF -->
+
         <!-- TMPL_IF NAME="flagged" -->
                <div class="dialog alert">
         <ul>
@@ -98,6 +109,9 @@ $.tablesorter.addParser({
             <!-- TMPL_IF NAME="lost" -->
                 <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li>
             <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="renewal_blocked_fines" -->
+                <li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than <!-- TMPL_VAR NAME="renewal_blocked_fines" --></a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li>
+            <!-- /TMPL_IF -->
         </ul></div>
         <!-- /TMPL_IF -->
         
@@ -224,7 +238,7 @@ $.tablesorter.addParser({
                     <!-- TMPL_UNLESS name="patron_flagged" -->
                     <td><!-- TMPL_IF NAME="status" --><a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span>
                         <!-- TMPL_ELSE -->
-                            Not renewable
+                        Not renewable<!-- TMPL_IF NAME="too_many" --> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span><!-- TMPL_ELSE --><!-- TMPL_IF NAME="on_reserve" --> <span class="renewals">(On hold)</span><!-- /TMPL_IF --><!-- /TMPL_IF --> 
                         <!-- /TMPL_IF --></td>
                     <!-- /TMPL_UNLESS -->
                 <!-- /TMPL_IF -->
@@ -239,7 +253,7 @@ $.tablesorter.addParser({
                        <!-- TMPL_LOOP NAME="ISSUES" -->
                        <input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                        <!-- /TMPL_LOOP -->
-                       <input type="submit" value="Renew All" />
+                       <!-- TMPL_UNLESS name="patron_flagged" --><input type="submit" value="Renew All" /><!-- /TMPL_UNLESS -->
                </form>
                <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
@@ -355,14 +369,18 @@ $.tablesorter.addParser({
                                 Item in transit from <b> <!-- TMPL_VAR NAME="frombranch" --></b> since 
                                 <!-- TMPL_VAR NAME="datesent" -->
                             <!-- TMPL_ELSE -->
-                                Item waiting to be pulled
+                                Pending
                             <!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
                 </td>
                <td>
-               <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
-               <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-               <input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete('Are you sure you want to cancel this hold?');" /></form>
+               <!-- TMPL_IF NAME="cancelable" -->
+                       <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
+                       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+                       <input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete('Are you sure you want to cancel this hold?');" /></form>
+               <!-- TMPL_ELSE -->
+                       &nbsp;
+               <!-- /TMPL_IF -->
                </td>
 
             </tr>