From 62b550a0be1ee79a321a6af6528d30d738ffa190 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 10 Sep 2008 14:02:20 -0500
Subject: [PATCH] Some formatting fixes for bookcount.tmpl and
 issuehistory.tmpl. Linking to moredetail.pl from issuehistory.pl (just as
 barcode on detail.pl links to moredetail.pl).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 .../prog/en/css/staff-global.css              |  4 ++
 .../en/modules/catalogue/issuehistory.tmpl    | 18 ++-----
 .../prog/en/modules/catalogue/moredetail.tmpl |  4 +-
 .../prog/en/modules/circ/bookcount.tmpl       | 47 +++++--------------
 4 files changed, 20 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 af7f857b17..5532ca2c0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -243,6 +243,10 @@ th {
 	text-align : center;
 }
 
+table+table {
+	margin-top : 1em;
+}
+
 #editions table, #editions td {
 	border : 0;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
index d3ed2816f0..71716444a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
@@ -22,8 +22,7 @@
         <p><b>Has been checked out <!-- TMPL_VAR NAME="total" --> times</b></p>
         <table>
             <tr><th>Date</th>
-            <th>Surname</th>
-            <th>Firstname</th>
+            <th>Name</th>
             <th>Barcode</th>
             <th>Library</th>
             <th>Issuing Library</th>
@@ -37,20 +36,9 @@
                     <!-- TMPL_ELSE -->
                         &nbsp;
                     <!-- /TMPL_IF --></td>
-                <td><!-- TMPL_IF NAME="surname" -->
-                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
-                            <!-- TMPL_VAR NAME="surname" -->
-                        </a>
-                    <!-- TMPL_ELSE -->
-                        &nbsp;
-                    <!-- /TMPL_IF --></td>
-                <td><!-- TMPL_IF NAME="firstname" -->
-                        <!-- TMPL_VAR NAME="firstname" -->
-                    <!-- TMPL_ELSE -->
-                        &nbsp;
-                    <!-- /TMPL_IF --></td>
+                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --><!-- TMPL_IF NAME="firstname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></a></td>
                 <td><!-- TMPL_IF NAME="barcode" -->
-                        <!-- TMPL_VAR NAME="barcode" -->
+                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a>
                     <!-- TMPL_ELSE -->
                         &nbsp;
                     <!-- /TMPL_IF --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index b52144caf9..afb3dd3f54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -62,7 +62,7 @@
             
             <ol class="bibliodetails">
             <li><span class="label">Current Location:</span> <!-- TMPL_VAR NAME="holdingbranchname" -->&nbsp;</li>
-            <li><span class="label">Circulation Status:</span> <!-- TMPL_IF NAME="issue" -->Checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>, Due back on <!-- TMPL_VAR NAME="onloan" --><!-- TMPL_ELSE -->Not Checked out <!-- /TMPL_IF --></li>
+            <li><span class="label">Checkout Status:</span> <!-- TMPL_IF NAME="issue" -->Checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>, Due back on <!-- TMPL_VAR NAME="onloan" --><!-- TMPL_ELSE -->Not Checked out <!-- /TMPL_IF --></li>
             <li><span class="label">Lost Status:</span>
                 <!-- TMPL_IF NAME="CAN_user_circulate" -->
                     <form action="updateitem.pl" method="post">
@@ -143,7 +143,7 @@
 
                 <li><span class="label">Total Renewals:</span> <!-- TMPL_VAR NAME="renewals" -->&nbsp;</li>
 
-                <li><span class="label">Total Checkouts:</span><!-- TMPL_IF NAME="issues" --><!-- TMPL_VAR NAME="issues" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">View Circulation History</a>)</li>
+                <li><span class="label">Total Checkouts:</span><!-- TMPL_IF NAME="issues" --><!-- TMPL_VAR NAME="issues" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">View item's checkout history</a>)</li>
 
 
                 <li><span class="label">Last seen:</span> <!-- TMPL_VAR NAME="datelastseen" -->&nbsp;</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
index 7116629272..c47f74da12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
@@ -14,58 +14,33 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-
-<h1>
-<!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></a></h1>
-<h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
-<div class="tabitem">
-  <form action="/cgi-bin/koha/catalogue/detail.pl" method="get">
-    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-    <input type="hidden" name="type" value="intra" />
-    <input type="submit" class="submit" value="Brief Display" />
-  </form>
-  <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get">
-    <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" />
-    <input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
-    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /> <input type="submit" class="submit" value="Item Details" />
-  </form>
-  <!-- TMPL_IF NAME="norequests" -->
-  <!-- TMPL_ELSE -->
-  <form action="/cgi-bin/koha/reserve/request.pl" method="get">
-    <input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber">
-    <input type="submit" value="Place Reserve" class="submit" />
-  </form>
-  <!-- /TMPL_IF -->
-</div>
+<h2>
+<!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR Name="author" --><!-- /TMPL_IF --></h2>
+<h3>Barcode <!-- TMPL_VAR Name="barcode" --></h3>
 <table>
-		<tr><th>Home Library: </th><td> <!-- TMPL_VAR Name="homebranch" --> </td></tr>
-		<tr><th>Current Library: </th><td> <!-- TMPL_VAR Name="holdingbranch" --></td></tr>
-		<tr><th>Date arrived at current library: </th><td> <!-- TMPL_VAR Name="lastdate" --> </td></tr>
-		<tr><th>Number of issues since since the above date :</th><td> <!-- TMPL_VAR Name="count" --> </td></tr>
+		<tr><th>Home Library</th><th>Current Library</th><th>Date arrived at current library </th><th>Number of issues since since last transfer</th></tr>
+		
+		<tr><td> <!-- TMPL_VAR Name="homebranch" --> </td><td> <!-- TMPL_VAR Name="holdingbranch" --></td><td> <!-- TMPL_VAR Name="lastdate" --> </td><td> <!-- TMPL_VAR Name="count" --> </td></tr>
 </table>
 <table>
 			<tr>
 				<th>Library</th>
 				<th>No. of times checked out</th>
-				<th>Library last seen at</th>
+				<th>Last Seen</th>
 			</tr>
 			<!-- TMPL_LOOP Name="branchloop" -->
 				<tr>
-					<td class="data"><!-- TMPL_VAR Name="branchname" --> </td>
-					<td class="data"><!-- TMPL_VAR Name="issues" --> </td>
-					<td class="data"><!-- TMPL_VAR Name="seen" --> </td>
+					<td><!-- TMPL_VAR Name="branchname" --> </td>
+					<td><!-- TMPL_VAR Name="issues" --> </td>
+					<td><!-- TMPL_VAR Name="seen" --> </td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		</td>
-	</tr>
-</table>
 
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.39.5