Fixes for tablesorter problems when there are no checkouts from today; Other markup...

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 2152601..a9a204c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -228,8 +228,16 @@ th {
        border : 0;
 }
 
-tr.highlight td, td.highlight {
+
+tr.highlight td, tr.highlight th, tr.odd td {
        background-color : #F3F3F3;
+       border : 1px solid #DDDDDD;
+       border-right : 1px solid #DDDDDD;
+}
+
+tr.even td, tr.even.highlight td {
+       background-color: #FFF;
+       border-right : 1px solid #DDDDDD;
 }
 
 td.od {

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 f3b23c7..3312c66 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -16,12 +16,13 @@ $.tablesorter.addParser({
 });
         $(document).ready(function() {
                $('#patronlists > ul').tabs();
+               $.tablesorter.defaults.widgets = ['zebra']; 
                $("#issuest").tablesorter({
-//             sortList: [[0,0]], don't sort by default to preserve 'previous checkouts header
+//             sortList: [[0,0]], don't sort by default to preserve 'previous checkouts' header
                headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false}}
                });
-               $("#issuest").bind("sortEnd",function() { 
-               $("#previous").parents("tr").remove();
+               $("#issuest").bind("sortEnd",function() {
+               $("#previous").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
            }); 
                $("#holdst").tablesorter({
                        sortList: [[0,0]],
@@ -231,8 +232,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         
     <div class="date-select">
         <div class="hint">Specify Due Date:</div><input type="text" size="10" id="duedatespec" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" />                                                        
-               <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarDueDate" style="cursor: pointer;" valign="top" />
+               <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarDueDate" style="cursor: pointer;" />
              <script language="JavaScript" type="text/javascript">
+                        //<![CDATA[ 
                    function validate1(date) {
                          var today = new Date();
                          if ( date < today ) {
@@ -256,6 +258,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                              onClose : refocus
                            }
                         );
+                               //]]>
                  </script>
 
           <label for="stickyduedate"> Remember for Session:</label>
@@ -398,10 +401,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <th>Barcode</th>
         <th>Renew?</th>
                <th>Check In?</th>
-    </tr></thead>
-<!-- TMPL_IF NAME="todayissues" -->
-
+    </tr>
+<!-- TMPL_IF NAME="todayissues" --></thead>
        <tbody>
+
     <!-- TMPL_LOOP NAME="todayissues" -->
     <!-- TMPL_IF NAME="togglecolor" -->
     <tr>
@@ -443,7 +446,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- /loop todayissues --><!-- /TMPL_LOOP --> 
     <!-- /if todayissues --><!-- /TMPL_IF --> 
 <!-- TMPL_IF NAME="previssues" -->
-<tr><th colspan="7"><a name="previous" id="previous"></a>Previous checkouts</th></tr>
+<!-- TMPL_IF NAME="todayissues" --><tr><th colspan="7"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->
+<tr><th colspan="7"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
+       <tbody>
+<!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="previssues" -->
     <!-- TMPL_IF NAME="togglecolor" -->
         <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 9601ddf..e284f65 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -363,9 +363,9 @@ if (nodename =="barcodes[]"){
             <!-- TMPL_ELSE -->
             <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
             <!-- TMPL_IF NAME="red" -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" onclick="javascript:uncheck_sibling(this);" />
+            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" onclick="uncheck_sibling(this);" />
             <!-- TMPL_ELSE -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" onClick="javascript:uncheck_sibling(this);" />
+            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" onclick="uncheck_sibling(this);" />
             <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
             </td>
@@ -373,7 +373,7 @@ if (nodename =="barcodes[]"){
       <!-- TMPL_IF NAME="return_failed" -->
             <td class="problem">Return Failed</td>
        <!--TMPL_ELSE-->   
-            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onClick="javascript:uncheck_sibling(this);" />
+            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
             <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
             </td>
       <!-- /TMPL_IF -->