fix for disappearing dropbox mode checkbox on returns screen

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / returns.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 1594964..fda9b95 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -248,7 +248,7 @@ function Dopop(link) {
                         <p class="problem">Item was lost, now found.</p>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="withdrawn" -->
-                        <p class="problem">Item Cancelled</p>
+                        <p class="problem">Item is withdrawn.</p>
                     <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_IF -->
@@ -264,11 +264,17 @@ function Dopop(link) {
 </div>
        <div class="yui-g">
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" >
-     <!-- TMPL_IF NAME="overduecharges" --><div class="yui-u first"><!-- /TMPL_IF -->
+    <div class="yui-u first">
             <fieldset>
        <legend>Check In</legend>
             <label for="barcode">Enter item barcode: </label>
-                       <input name="barcode" id="barcode" size="14" />
+                       <!-- TMPL_IF NAME="exemptfine" -->
+                       <input name="barcode" id="barcode" size="14" class="focus alert"/>
+                       <!-- TMPL_ELSIF NAME="dropboxmode"-->
+                       <input name="barcode" id="barcode" size="14" class="focus alert"/>
+                       <!-- TMPL_ELSE -->
+                       <input name="barcode" id="barcode" size="14" class="focus"/>
+                       <!-- /TMPL_IF -->
             <input type="submit" class="submit" value="Submit" />
             <!-- TMPL_LOOP Name="inputloop" -->
                 <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -278,31 +284,35 @@ function Dopop(link) {
                        
    
             </fieldset>
-         <!-- TMPL_IF NAME="overduecharges" -->
-</div>
-<div class="yui-u">
-<fieldset id="checkin_options">
-                       <legend>Options</legend>
-
-<ul>           <li>
-<!-- TMPL_IF NAME="exemptfine" -->
-<input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" checked="checked" />
-<!-- TMPL_ELSE -->
-<input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" />
-<!-- /TMPL_IF --><label for="exemptcheck">Forgive overdue charges</label></li>
+            </div>
+            <div class="yui-u">
+            <fieldset id="checkin_options">
+                <legend>Options</legend>
 
-<li><!-- (fixme) -->
-       
-<!-- TMPL_IF NAME="dropboxmode" -->
-<input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" checked="checked" />
-<!-- TMPL_ELSE -->
-<input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" />
-<!-- /TMPL_IF -->              <label for="dropboxcheck">Dropbox mode </label></li>            </ul>                           
-                                                               
-               </fieldset>
-</div>
-               <!-- /TMPL_IF --> <!-- overduecharges -->
-        </form>
+                <ul>
+                    <!-- TMPL_IF NAME="overduecharges" -->
+                    <li>
+                        <!-- TMPL_IF NAME="exemptfine" -->
+                        <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" checked="checked" />
+                        <!-- TMPL_ELSE -->
+                        <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" />
+                        <!-- /TMPL_IF -->
+                        <label for="exemptcheck">Forgive overdue charges</label>
+                    </li>
+                    <!-- /TMPL_IF --> <!-- overduecharges -->
+                    <li>
+                        <!-- (fixme) -->
+                        <!-- TMPL_IF NAME="dropboxmode" -->
+                        <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" checked="checked" />
+                        <!-- TMPL_ELSE -->
+                        <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" />
+                        <!-- /TMPL_IF -->
+                        <label for="dropboxcheck">Dropbox mode</label>
+                    </li>
+                </ul>
+            </fieldset>
+        </div>
+    </form>
 </div>
 
 <!-- TMPL_IF Name="returned" -->
@@ -324,7 +334,7 @@ function Dopop(link) {
 <!-- TMPL_IF Name="riloop" -->
     <h2>Checked-In items</h2>
     <table>
-       <tr><th>Due Date</th>   <th>Title</th>  <th>Author</th> <th>Barcode</th>        <th>Type</th>   <th>Patron</th></tr>
+       <tr><th>Due Date</th>   <th>Title</th>  <th>Author</th> <th>Barcode</th>        <th>Type</th>   <th>Patron</th><th>Note</th></tr>
         
         <!-- TMPL_LOOP Name="riloop" -->
             <tr>
@@ -339,6 +349,9 @@ function Dopop(link) {
                     <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" -->
                 </a>
             <!-- TMPL_ELSE -->Not checked out<!-- /TMPL_IF --></td>
+            <td><!-- TMPL_IF name="bornote" --><span class="circ-hlt"><!-- TMPL_VAR name="bornote" --><br /></span><!-- /TMPL_IF -->
+            <!-- TMPL_IF name="itemnote" --><span class="circ-hlt"><!-- TMPL_VAR name="itemnote" --></span><!-- /TMPL_IF -->
+            </td>
            </tr>
         <!-- /TMPL_LOOP -->
     </table></div>