From a4a79ba6b4032c47b32d32afc3988ec41b28db34 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 17 Jun 2004 08:20:56 +0000
Subject: [PATCH] bugfixes in bookshelves

---
 .../en/bookshelves/addbookbybiblionumber.tmpl      |  11 ++
 .../default/en/bookshelves/shelves.tmpl            | 190 +++++++++------------
 2 files changed, 92 insertions(+), 109 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl

diff --git a/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
new file mode 100644
index 0000000000..0ca806f163
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
@@ -0,0 +1,11 @@
+<!-- TMPL_INCLUDE Name="popup-top.inc" -->
+<div id="mainbloc">
+<h2 class="catalogue">Select bookshelf</h2>
+<form>
+	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->">
+	<p><label>Title</label><!-- TMPL_VAR name="title" --></p>
+	<p><label>Author</label><!-- TMPL_VAR name="author" --></p>
+	<p><label>Add to virtual shelf</label><!-- TMPL_VAR name="CGIbookshelves" --></p>
+	<input type="submit" value="Add to virtual shelf" class="button catalogue">
+</form>
+<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
index 5285ab34f4..a2e8964d6f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
@@ -1,52 +1,53 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
+<div id="mainbloc">
 <!-- TMPL_IF Name="viewshelf" -->
-<center>
-<form>
-    <table border=0 cellpadding=2 cellspacing=0>
-    		<tr>
-			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --></font>
-			</th>
-		</tr>
-		<!-- TMPL_LOOP Name="itemsloop" -->
+	<form>
+		<table>
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+				<th class="catalogue">
+					Contents of <!-- TMPL_VAR Name="shelfname" -->
+				</th>
 			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	<br>
-	<a href="shelves.pl" class="button">Shelf list</a>
-	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-	<input type=hidden name=modifyshelfcontents value=1>
-	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+			<!-- TMPL_LOOP Name="itemsloop" -->
+				<tr>
+					<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
+					<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
+					<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
+					<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<br>
+		<a href="shelves.pl" class="button">Shelf list</a>
+		<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+		<input type=hidden name=modifyshelfcontents value=1>
+		<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+		<!-- TMPL_IF name="manageshelf" -->
+			<input type=submit value="Remove Selected Items" class="button">
+		<!-- /TMPL_IF -->
+	</form>
+
 	<!-- TMPL_IF name="manageshelf" -->
-		<input type=submit value="Remove Selected Items" class="button">
+	<form>
+		<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+		<input type=hidden name=modifyshelfcontents value=1>
+		<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+		<table>
+			<tr>
+				<td>
+					Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
+				</td>
+				<td>
+					<input name="addbarcode">
+					<input type=hidden name=modifyshelfcontents value=1>
+					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+					<input type="submit" value="Save" class="button">
+				</td>
+			</tr>
+		</table>
+	</form>
 	<!-- /TMPL_IF -->
-</form>
-<!-- TMPL_IF name="manageshelf" -->
-<form>
-	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-	<input type=hidden name=modifyshelfcontents value=1>
-	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
-	<table>
-		<tr>
-			<td>
-				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
-			</td>
-			<td>
-				<input name="addbarcode">
-				<input type=hidden name=modifyshelfcontents value=1>
-				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
-				<input type="submit" value="Save" class="button">
-			</td>
-		</tr>
-	</table>
-</form>
-<!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
@@ -57,86 +58,56 @@
 				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<center>
-		<h1>Bookshelves</h1>
-		<table border=0 cellpadding=7>
-			<tr>
-				<td align=center valign="bottom">
-					<form>
-						<p>
-							<a href="shelves.pl" class="button">Shelf list</a>
-						</p>
-					</form>
-				</td>
-				<td align=center valign="bottom">
+		<h1 class="catalogue">Bookshelves</h1>
+		<div id="bloc25">
+					<h2 class="catalogue">Select Shelves to Delete</h2>
 					<form method=post>
 					<input type="hidden" name="shelves" value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
-						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Select Shelves to Delete</font>
-							</th>
-						</tr>
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<!-- TMPL_IF name="canmanage" -->
-						<tr>
-							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
+						<p>
+							<label>
 								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
+							</label>
 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
-							</td>
-						</tr>
+						</p>
 						<!-- /TMPL_IF -->
 						<!-- /TMPL_LOOP -->
-					</table>
 					<p>
-						<input type=submit value="Delete Shelves" class="button"></form>
+						<input type=submit value="Delete Shelves" class="button catalogue">
 					</p>
-				</td>
-				<td align=center valign=bottom>
-					<form method=post>
-					<input type=hidden name=shelves value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
-						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Add Shelf</font>
-							</th>
-						</tr>
-						<tr>
-							<td>
-								<p>Name : <input type="text" name="addshelf" size="25"></p>
-								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
-								<p>Category : <select name="category">
-									<option value="1">Private</option>
-									<option value="2">Public</option>
-									<option value="3">Free</option>
-									</select>
-								</p>
-								<p> <li>a private bookshelf is managed by you & can be seen only by you.</li>
-									<li> A public can be seen by everybody, but managed only by you.</li>
-									<li> A free can be managed by any user.</li>
-								</p>
-							</td>
-						</tr>
-					</table>
-								<p><input type=submit value="Add New Shelf" class="button"></p>
 					</form>
-				</td>
-			</tr>
-		</table>
+		</div>
+		<div id="bloc25">
+			<form method=post>
+				<input type=hidden name=shelves value=1>
+				<h2 class="catalogue">Add Shelf</h2>
+				<p><label>Name</label><input type="text" name="addshelf" size="25"></p>
+				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
+				<p><label>Category</label>
+					<select name="category">
+						<option value="1">Private</option>
+						<option value="2">Public</option>
+						<option value="3">Free</option>
+					</select>
+				</p>
+				<p> <li>a private bookshelf is managed by you & can be seen only by you.</li>
+					<li> A public can be seen by everybody, but managed only by you.</li>
+					<li> A free can be managed by any user.</li>
+				</p>
+				<p>
+					<input type=submit value="Add New Shelf" class="button catalogue">
+					<a href="shelves.pl" class="button catalogue">back to shelf list</a>
+				</p>
 
+			</form>
+		</div>
 	<!-- TMPL_ELSE -->
-		<center>
-		<table border=0 cellpadding=4 cellspacing=0>
+		<table>
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<table border=0 cellpadding=5 cellspacing=0 width=100%>
-						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Shelf List</font>
-							</th>
-						</tr>
-					</table>
-				</td>
+				<th class="catalogue">
+					Shelf List
+				</th>
 			</tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
 			<tr>
@@ -149,8 +120,9 @@
 			<!-- /TMPL_LOOP -->
 		</table>
 		<P>
-			<a href="shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
+			<a href="shelves.pl?shelves=1" class="button catalogue">Add or Remove Book Shelves</a>
 		</p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
-- 
2.11.0