[Koha-patches] [PATCH] Correcting table-sorter js for different table structures (Amazon content on or off, item-level-itemtypes on or off)

[Owen Leonard]

---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    4 +++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |   26 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c1960db..4a0c71a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -144,6 +144,10 @@ fieldset.action {
 	width : auto;
 }
 
+fieldset.action p {
+	margin-bottom : 1em;
+}
+
 form {
 	display : inline;
 	margin : 0;
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 0fee962..9a5adeb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -16,14 +16,32 @@ $.tablesorter.addParser({
             $(function() {
             $('#opac-user-views > ul').tabs();
 			$("#holdst").tablesorter({
+				widgets : ['zebra'],
 				sortList: [[0,0]],
-		        headers: { 0: { sorter: 'articles' },3: { sorter: false },4: { sorter: false }
+		        headers: { 0: { sorter: 'articles' },4: { sorter: false }
 				}
 			}); 
 			$("#checkoutst").tablesorter({
-				sortList: [[4,0]],
-		        headers: { 0: { sorter: false }, 1: { sorter: 'articles' },2: { sorter: false },3: { sorter: false },5: { sorter: false },6: { sorter: false } 
-				}
+				widgets : ['zebra'],
+				<!-- TMPL_IF NAME="AmazonContent" -->
+				sortList: [[3,0]],
+				<!-- TMPL_IF NAME="item-level_itypes" -->
+				sortList: [[3,0]],
+				headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
+				<!-- TMPL_ELSE -->
+				sortList: [[3,0]],
+				headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
+				<!-- /TMPL_IF -->
+				<!-- TMPL_ELSE -->
+				sortList: [[2,0]],
+				<!-- TMPL_IF NAME="item-level_itypes" -->
+				sortList: [[2,0]],
+				headers: { 0: { sorter: 'articles' },3: { sorter: false },4: { sorter: false }}
+				<!-- TMPL_ELSE -->
+				sortList: [[3,0]],
+				headers: { 0: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
+				<!-- /TMPL_IF -->
+				<!-- /TMPL_IF -->
 			}); 
             });
 //]]>
-- 
1.5.2.1