From be99aba949416df0b9e21753418aa8a1ef4d3005 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 8 Apr 2008 08:13:34 -0500
Subject: [PATCH] Some formatting changes, bringing displays in circ and
 moremember more in line with each other

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              | 44 +++++++++++++------
 .../prog/en/modules/circ/circulation.tmpl     | 40 ++++++++++-------
 .../prog/en/modules/members/moremember.tmpl   | 41 ++++++++---------
 members/moremember.pl                         |  1 -
 4 files changed, 73 insertions(+), 53 deletions(-)

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 acc0cd8cf9..e6b9bb58a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -71,10 +71,20 @@ strong {
 	font-weight : bold;
 }
 
+strong em {
+	font-weight : bold;
+	font-style : italic;
+}
+
 em {
 	font-style : italic;
 }
 
+em strong {
+	font-weight : bold;
+	font-style : italic;
+}
+
 .subfield-label {
     font-style : italic;
 }
@@ -389,15 +399,6 @@ div.patronviews {
 	padding : .5em 0 .5em 0;
 }
 
-a.member-edit {
-	float : right;
-	background-color : #DBECC8;
-	margin-top : .5em;
-	padding : .3em;
-	text-align : right;
-	text-decoration : none;
-}
-
 fieldset.brief {
 	border : 1px solid #E8E8E8;
 }
@@ -886,6 +887,20 @@ tr.confirm td, tr.highlight.confirm td {
 	margin: .2em 0;
 }
 
+#circ_circulation_issue .date-select {
+	font-size : 85%;
+	padding-top : .3em;
+}
+
+#circ_circulation_issue .date-select label {
+	font-size : inherit;
+	font-weight: normal;
+}
+
+#circ_circulation_issue .date-select input {
+	padding : 1px;
+}
+
 tr.expired td {
 	color : #999999;
 }
@@ -1158,10 +1173,6 @@ overflow :  hidden;
 	font-size: 110%;
 }
 
-#circ_circulation_issue .date-select label {
-	font-weight: normal;
-}
-
 .clearfix:after {
     content: "."; 
     display: block; 
@@ -1497,4 +1508,11 @@ ul#i18nMenu li.more ul li a {
 }
 .headerSortDown {
 	background-image:url("../../img/desc.gif");
+}
+
+tr.reserved td {
+	background-color : #eeffd4;
+}
+tr.transfered td {
+	background-color : #e8f0f6;
 }
\ No newline at end of file
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 8daadcb866..dbd8985194 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -5,10 +5,21 @@
 (<!-- TMPL_VAR NAME="cardnumber" -->)
 <!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
+$.tablesorter.addParser({
+    id: 'articles', 
+    is: function(s) {return false;  }, 
+    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, 
+    type: 'text' 
+});
 	 $(document).ready(function() {
  		$('#patronlists > ul').tabs();
+		$("#issuest").tablesorter({
+		sortList: [[1,0]],
+		headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false},7:{sorter:false}}
+	}); 
 	 });
 //]]>
 </script>
@@ -240,7 +251,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                         );
                  </script>
 
-          <label for="stickyduedate">Remember for Session:</label>
+          <label for="stickyduedate"> Remember for Session:</label>
 <!-- TMPL_IF NAME="stickyduedate" -->
 <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="1" />
 <!-- TMPL_ELSE -->
@@ -367,28 +378,24 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <div id="checkouts">
 <!--TMPL_IF NAME="issuecount"-->
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
-<!--     <p>
-    <a href="#" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page'); return false;">Print Page</a>
-    / <a href="#" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip'); return false;">Print Slip</a>
-    </p> -->
-    
     <input type="hidden" value="circ" name="destination" />
     <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
     <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />	
-        <table>
-    <tr>
+        <table id="issuest">
+    <thead><tr>
         <th>Due date</th>
         <th>Title</th>
-        <th>Itemtype</th>
+        <th>Item Type</th>
         <th>Call no</th>
         <th>Barcode</th>
         <th>Renew?</th>
 		<th>Check In?</th>
-    </tr>
+    </tr></thead>
 <!-- TMPL_IF NAME="todayissues" -->
 
     <!-- TMPL_LOOP NAME="todayissues" -->
+	<tbody>
     <!-- TMPL_IF NAME="togglecolor" -->
     <tr>
     <!-- TMPL_ELSE -->
@@ -433,9 +440,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- /loop todayissues --><!-- /TMPL_LOOP --> 
     <!-- /if todayissues --><!-- /TMPL_IF --> 
 <!-- TMPL_IF NAME="previssues" -->
-    <tr>
+<!--     <tr>
         <th colspan="7"><a name="previous" id="previous">Previous checkouts</a></th>
-    </tr>
+    </tr> -->
     <!-- TMPL_LOOP NAME="previssues" -->
     <!-- TMPL_IF NAME="togglecolor" -->
         <tr>
@@ -483,6 +490,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     </tr>
     <!-- /loop previssues --><!-- /TMPL_LOOP --> 
 <!--/if previssues --><!-- /TMPL_IF --> 
+	</tbody>
     </table>
 	<!--TMPL_IF NAME="issuecount"-->
     <fieldset class="action">
@@ -516,14 +524,14 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
  </td>
 					<td><!-- TMPL_VAR NAME="itemtype" --></td>
                     <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
-					<td><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
-                        <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> waiting
+					<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
+                        <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting</strong>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="transfered" --> in transit from
+                        <!-- TMPL_IF name="transfered" --> <strong>in transit</strong> from
                         <!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" -->
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="nottransfered" --> hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></i>
-                        <!-- /TMPL_IF --></td>
+                        <!-- /TMPL_IF --></em></td>
                     <td>                    
                         <!-- TMPL_IF NAME="waitingposition" -->
                         Hold priority
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 60132780b6..9601ddf500 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -20,7 +20,7 @@ $(document).ready(function() {
 	}); 
 	$("#holdst").tablesorter({
 		sortList: [[0,0]],
-		headers: { 1: {sorter:false}, 2: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
+		headers: { 1: { sorter: 'articles' },6: { sorter: false }}
 	}); 
 	$('#manage-patron-image').find("input[@value*=Delete]").click(function(){
 		 return confirm('Are you sure you want to delete this patron image? This cannot be undone.');
@@ -413,10 +413,11 @@ if (nodename =="barcodes[]"){
 	<table id="holdst">
 		<thead><tr>
 			<th>Hold date</th>
-			<th>Barcode</th>
 			<th>Title</th>
-			<th>Author</th>
-			<th>Localisation</th>
+			<th>Item Type</th>
+			<th>Call Number</th>
+			<th>Barcode</th>
+			<th>Priority</th>
 			<th>Delete?</th>
 		</tr></thead>
 		<tbody><!-- TMPL_LOOP NAME="reservloop" -->
@@ -425,33 +426,27 @@ if (nodename =="barcodes[]"){
 						<!-- TMPL_VAR NAME="reservedate" -->
 					</td>
 					<td>
-						<!-- TMPL_IF name="barcodereserv" -->
-						<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="waitingposition" -->
-					 Queue for this item :
-						<b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
-						<!-- /TMPL_IF -->
+						<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+                        
 					</td>
-					<td>
-						<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
-                        <!-- TMPL_IF name="waiting" -->
-                        <br />
-                        <i>Item is waiting</i>
+					<td><!-- TMPL_VAR NAME="itemtype" --></td>
+					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+					<td><!-- TMPL_IF name="waiting" -->
+                        <em>Item is <strong>waiting</strong></em>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="transfered" -->
-                        <br />
-                        <i>Item in transit from
-                        <!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" --> </i>
+                        <em>Item <strong>in transit</strong> from
+                        <!-- TMPL_VAR NAME="frombranch" --> since <!-- TMPL_VAR NAME="datesent" --> </em>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="nottransfered" -->
-                        <br />
-                        <i>This item hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></i>
+                        <em>Item hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></em>
                         <!-- /TMPL_IF -->
+						<!-- TMPL_IF name="barcodereserv" -->
+						<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="barcodereserv" --></a>
+						<!-- /TMPL_IF -->
 					</td>
-					<td><!-- TMPL_VAR NAME="author" --></td>
-					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+					<td><!-- TMPL_IF NAME="waitingposition" --><strong><!-- TMPL_VAR NAME="waitingposition" --></strong><!-- /TMPL_IF --></td>
 					<td><select name="rank-request">
 			<option value="n">No</option>
 			<option value="del">Yes</option>
diff --git a/members/moremember.pl b/members/moremember.pl
index 0811927d20..de5a6a53b7 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -308,7 +308,6 @@ if ($borrowernumber) {
             $getreserv{nottransfered}   = 0;
             $getreserv{itemtype}        = $getbibtype->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
-            $getreserv{itemcallnumber}  = '----------';
             $getreserv{biblionumber}  = $num_res->{'biblionumber'};	
         }