Some changes related to recent commits to patron images: Markup and javascript change...

[koha.git] / 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 c965348..c29a4f7 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -10,9 +10,6 @@
         $(document).ready(function() {
                $('#patronlists').tabs();
         });
-<!-- TMPL_IF NAME="patronimages" -->$(window).load(function() {
-               verify_patron_images();
-        });<!-- /TMPL_IF -->
 //]]>
 </script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
@@ -273,6 +270,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                        
                        </li>
                        <!-- /TMPL_IF -->
+                       
+                       <!-- TMPL_IF NAME="returnbeforeexpiry" -->
+                        <li><span class="circ-hlt">Set due date to expiry:</span> You have the ReturnBeforeExpiry system preference enabled this means if the
+                        expiry date is before the date due, the date due will be set to the expiry date
+                        </li>
+                       <!-- /TMPL_IF -->
 
                        <!-- TMPL_IF NAME = "expired" -->
                        <li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
@@ -301,6 +304,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li>
                        <!-- /TMPL_IF -->
 
+               <!-- TMPL_IF NAME="credits" -->
+                       <li><span class="circ-hlt">Credits:</span> Patron has a credit</li>
+                       <!-- /TMPL_IF -->
+
+                       
+
                        </ul>
         </div>
 
@@ -385,18 +394,27 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         </td>
         <td>
             <!-- TMPL_VAR NAME="itemtype" -->
-            <!-- TMPL_IF NAME="itemtype_image" -->
+           <!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" -->
             <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
-            <!-- /TMPL_IF -->
+            <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
         </td>
-        <td><!-- TMPL_VAR NAME="classification" --></td>
+        <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
         <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
+               <!-- TMPL_IF NAME="can_renew" -->
         <!-- TMPL_IF NAME="od" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
+               <!-- TMPL_ELSE -->
+                   <!-- TMPL_IF EXPR="can_renew_error eq 'on_reserve'" -->
+                           On Hold
+                       <!-- /TMPL_IF -->
+                       <!-- TMPL_IF EXPR="can_renew_error eq 'too_many'" -->
+                           Too Many Renewals
+                       <!-- /TMPL_IF -->
+               <!-- /TMPL_IF -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
                <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
@@ -432,11 +450,21 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <td><!-- TMPL_VAR NAME="classification" --></td>
         <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
+               <!-- TMPL_IF NAME="can_renew" -->
         <!-- TMPL_IF NAME="od" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
+               <!-- TMPL_ELSE -->
+                   <!-- TMPL_IF EXPR="can_renew_error eq 'on_reserve'" -->
+                           On Hold
+                       <!-- /TMPL_IF -->
+                       <!-- TMPL_IF EXPR="can_renew_error eq 'too_many'" -->
+                           Too Many Renewals
+                       <!-- /TMPL_IF -->
+                       
+               <!-- /TMPL_IF -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
                <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
@@ -466,7 +494,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <table>
         <tr>
             <th>Hold date</th>
-            <th>Status</th>
+            <th>Priority</th>
             <th>Title</th>
             <th>Author</th>
             <th>Call Number</th>
@@ -477,7 +505,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                         <!-- TMPL_VAR NAME="reservedate" -->
                     </td>
                     <td>
-                        <!-- TMPL_IF name="barcodereserv" --><!-- TMPL_VAR NAME="barcodereserv" -->
+                        <!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" --> targeted
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="waitingposition" -->
                         Hold priority
@@ -489,17 +517,17 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
                         <!-- TMPL_IF name="waiting" -->
                         <br />
-                        <i>This hold is available</i>
+                        <i>Item is waiting</i>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="transfered" -->
                         <br />
-                        <i>This hold has been transfered from library
-                        <!-- TMPL_VAR NAME="frombranch" --> on  <!-- TMPL_VAR NAME="datesent" --> </i>
+                        <i>Item in transit from
+                        <!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" --> </i>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="nottransfered" -->
                         <br />
-                        <i>This hold hasn't been transfered yet from library  <!-- TMPL_VAR NAME="nottransferedby" --></i>
+                        <i>This item hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></i>
                         <!-- /TMPL_IF -->
                     </td>
                     <td><!-- TMPL_VAR NAME="author" --></td>
@@ -524,4 +552,12 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div><!-- /TMPL_UNLESS -->
 </div>
+<!-- TMPL_IF NAME="patronimages" --><script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+       verify_patron_images();
+       <!-- TMPL_IF NAME="CAN_user_tools" -->$("#patronimage").after("<a style=\"display: block; font-size:80%; margin:0  0 1em 1em;\" href=\"/cgi-bin/koha/tools/picture-upload.pl?cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&filetype=image\">+ Click to Add Image</a>").css({cursor: "pointer"}).click(function(){
+               location.href="/cgi-bin/koha/tools/picture-upload.pl?cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&filetype=image";
+       });<!-- /TMPL_IF -->
+//]]>
+</script><!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->