fix for disappearing dropbox mode checkbox on returns screen

This makes the 'dropbox mode' checkbox appear unconditionally.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index e0c48e8..548c965 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -444,6 +444,10 @@ div.patronviews {
        padding : .5em 0 .5em 0;
 }
 
+.column-tool {
+       font-size: 80%;
+}
+
 fieldset.brief {
        border : 1px solid #E8E8E8;
 }
@@ -1573,4 +1577,4 @@ span.permissiondesc {
        border : 1px solid #E8E8E8;
        margin-top : .5em;
        padding : .5em;
-}
\ No newline at end of file
+}

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 eb2fd26..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
@@ -264,7 +264,7 @@ 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>
@@ -284,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" -->