From 1670b55569979c925970e88bbbecb831f803ed62 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 2 Dec 2004 16:42:15 +0000
Subject: [PATCH] minor improvements

---
 .../intranet-tmpl/default/en/bull/result.tmpl |  4 --
 .../default/en/bull/statecollection.tmpl      | 43 +++++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl
index f39f4e96ce..8653e6a4f2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl
@@ -47,11 +47,7 @@
 					</p>
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-					<!-- TMPL_UNLESS NAME="norequests" -->
 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Get it!</a>
-					<!-- TMPL_ELSE -->
-						Not Reservable
-					<!-- /TMPL_UNLESS -->
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
index b53a41ef51..355ae6a6ce 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
@@ -5,28 +5,6 @@
 <h1 class="bull">Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
 <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Subscription</a>
 
-<div id="bloc25">
-	<h2 class="bull">Subscription summary</h2>
-	<form method="post" name="f" action="statecollection.pl">
-		<input type="hidden" name="op" value="modsubscriptionhistory">
-		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
-		<p><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
-		<p><label>Beginnning date (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
-		<p><label>End date</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
-		<p>Arrived Numbers</p>
-		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
-		<p>Gapped Numbers</p>
-		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
-		<p>Opac's note</p>
-		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
-		<p>Intra's note</p>
-		<p>&nbsp;<textarea name="librariannote" COLS=60 ROWS=5><!-- TMPL_VAR name="librariannote" --></textarea></p>
-		<input type="submit" value="Save changes" class="button bull">
-	</form>
-</div>
-
 <div id="bloc25">
 <h2 class="bull">waited or late numbers</h2>
 	<form method="post" name="f" action="statecollection.pl">
@@ -87,7 +65,26 @@
 	</form>
 </div>
 
-</form>
+<div id="bloc25">
+	<h2 class="bull">Subscription summary</h2>
+	<form method="post" name="f" action="statecollection.pl">
+		<input type="hidden" name="op" value="modsubscriptionhistory">
+		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
+		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
+		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
+		<p><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
+		<p><label class="label100">Beginnning date (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
+		<p><label class="label100">End date</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
+		<p>Recieved issues</p>
+		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
+		<p>Missing issues</p>
+		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
+		<p>Opac's note</p>
+		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
+		<input type="submit" value="Save changes" class="button bull">
+	</form>
+</div>
+
 </table>
 <script language="JavaScript" type="text/javascript">
 
-- 
2.39.5