From 896c7a4ee27ddf7169519dafe295970fc3440dc7 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Tue, 10 Jan 2006 21:30:36 +0000
Subject: [PATCH] Fresh synch with default template.  Update includes mostly
 just structural/cosmetic changes

---
 .../intranet-tmpl/npl/en/bull/bull-home.tmpl  |  49 +++--
 .../intranet-tmpl/npl/en/bull/lateissues.tmpl |  47 ++---
 .../intranet-tmpl/npl/en/bull/result.tmpl     |   6 +-
 .../intranet-tmpl/npl/en/bull/search.tmpl     |  65 +++---
 .../npl/en/bull/serial-issues.tmpl            |  41 ++--
 .../npl/en/bull/statecollection.tmpl          | 100 ++++++----
 .../npl/en/bull/subscription-add.tmpl         | 185 +++++++++---------
 .../npl/en/bull/subscription-detail.tmpl      | 110 ++++++-----
 8 files changed, 323 insertions(+), 280 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
index 9a99ed3e65..b60fe329e0 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
@@ -8,43 +8,60 @@
 	<table>
 		<caption>Serials Subscriptions</caption>
 		<tr>
-			<th>Title</th>
 			<th>ISSN</th>
+			<th>Title</th>
+			<th>
+				Note
+			</td>
 			<th colspan="2">&nbsp;</th>
 		</tr>
 		<tr>
 			<td>
-				<input type="text" size="40" maxlength="40" name="title" value="<!-- TMPL_VAR name="title" -->">
+				<input type="text" size="10" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->" title="type ISSN here to filter subscription" />
+			</td>
+			<td>
+				<input type="text" size="40" maxlength="40" name="title" value="<!-- TMPL_VAR name="title" -->" title="type a title -complete or partial- to filter subscription" />
 			</td>
 			<td>
-				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
+				&nbsp;
 			</td>
 			<td colspan="2">
-				<input type="submit" value="Search" class="submit">
+				<input type="submit" value="Filter" class="submit" title="set a filter on ISSN / title" />
 			</td>
 		</tr>
-		<!-- TMPL_IF NAME="subscriptions" -->
 		<!-- TMPL_LOOP name="subscriptions" -->
 			<!-- TMPL_IF name="toggle" -->
-					<tr class="highlight">
+				<tr class="highlight">
 				<!-- TMPL_ELSE -->
-					<tr>
+				<tr>
 				<!-- /TMPL_IF -->
-				<td><!-- TMPL_IF name="title" --><!-- TMPL_VAR name="title" --><!-- TMPL_ELSE --> |
-					<!-- /TMPL_IF --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
+					<td>
+					<!-- TMPL_IF name="ISSN" -->
+						<a href="bull/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="Issues history"><!-- TMPL_VAR name="ISSN" --></a>
+					<!-- /TMPL_IF -->
+					
 				</td>
 				<td>
-					<!-- TMPL_VAR name="ISSN" -->
+						<!-- TMPL_IF name="title" -->
+						<!-- TMPL_VAR name="title" -->
+					<!-- TMPL_ELSE -->
+						|
+					<!-- /TMPL_IF -->
+				</td>
+					<td>
+								<!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
+				</td>
+					<td>
+								<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="subscription detail">Detail</a>
 				</td>
 				<td>
-					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
+					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="receive issues for this subscription">Receive</a>
+				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
-		<!-- TMPL_ELSE -->
-		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
-		<!-- /TMPL_IF -->
-	</table></form>
-	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
+	</table>
+	</form>
+	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" value="Add Subscription" class="submit" /></form></p>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl
index b06492865a..a1bbb122eb 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl
@@ -5,38 +5,39 @@
 
 <div id="main">
 
-<h1>Late issues</h1>
-<form action="lateissues.pl" method="post">
+	<h1>Late issues</h1>
+	<div class="details">
+		<form action="lateissues.pl" method="post">
+			<label for="supplierid">Choose a Supplier: </label><!-- TMPL_VAR name="CGIsupplier" -->
+				<!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" -->; <!-- /TMPL_IF -->
+				<!-- TMPL_IF name="booksellerfax" -->Fax: <!-- TMPL_VAR name="booksellerfax" -->; <!-- /TMPL_IF -->
+				<!-- TMPL_IF name="bookselleremail" --><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
+			<input type="submit" value="Submit" class="submit" />
+		</form>
+	</div>
 	<table>
 		<tr>
-			<th>Supplier</th>
 			<th>Title</th>
 			<th>Issue number</th>
 			<th>Late since</th>
 			<th colspan="2">&nbsp;</th>
 		</tr>
-		
-	<tr>
-		<td><!-- TMPL_VAR name="CGIsupplier" --></td>
-		<td><p><!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="booksellerfax" -->Fax: <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="bookselleremail" --></p><!-- TMPL_IF NAME="bookselleremail" --><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
-					</p><!-- /TMPL_IF --></td>
-		<td><input type="submit" value="Filter" class="submit" /></td>
-		<td colspan="3">&nbsp;</td>	
-	</tr>
-		
-<!-- TMPL_LOOP name="lateissues" -->
+		<!-- TMPL_LOOP name="lateissues" -->
+			<!-- TMPL_IF name="odd" -->
 			<tr>
-				<td><!-- TMPL_VAR name="name" --></td>
-				<td><!-- TMPL_VAR name="Title" --></td>
-				<td><!-- TMPL_VAR name="serialseq" --></td>
-				<td><!-- TMPL_VAR name="planneddate" --></td>
-				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
-			</tr>
-	<!-- /TMPL_LOOP -->
+			<!-- TMPL_ELSE -->
+			<tr class="highlight">
+			<!-- /TMPL_IF -->
+			<td><!-- TMPL_IF name="Title" --><a href="/cgi-bin/koha/bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->"><!-- TMPL_VAR name="Title" --></a><!-- /TMPL_IF --></td>
+					<td><!-- TMPL_VAR name="serialseq" --></td>
+					<td><!-- TMPL_VAR name="planneddate" --></td>
+					<td>
+						<a href="/cgi-bin/koha/bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td>
+						<a href="/cgi-bin/koha/bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a>
+					</td>
+						</tr>
+		<!-- /TMPL_LOOP -->
 	</table>
-</form>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
index d7e727f020..59fbc7a807 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
@@ -29,15 +29,12 @@
 			</tr>
 			<!-- TMPL_LOOP name="result" -->
 			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
-				<td>
-					<p><b><!-- TMPL_VAR NAME="title" --></b></p>
-						<p><!-- TMPL_VAR NAME="author" -->
+				<td><b><!-- TMPL_VAR NAME="title" --></b><br><!-- TMPL_VAR NAME="author" -->
 						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
-					</p>
 				</td>
 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
 			</tr>
@@ -57,6 +54,7 @@
 			<a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 </div>
+<form action="/cgi-bin/koha/bull/subscription-bib-search.pl" method="get"><p><input type="submit" class="submit" value="Search Again" /></p></form>
 </div>
 
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
index af462499a2..56a2e78fbd 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
@@ -1,50 +1,57 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="main-compact">
 
-<form name="f" method="post">
-	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="intranet">
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<div class="form">
-	<table>
-		<caption>Catalog search</caption>
-		<tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="marclist" value="">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<input type="hidden" name="operator" value="contains">
-			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
-		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
-				<option value="20">20</option>
-				<option value="50">50</option>
-				<option value="100">100</option>
-			</select></td></tr>
-			
-		<tr><th>
-			<label for="itemtype">Itemtype</label></th><td>
+<h1>Catalogue search</h1>
+
+<form name="f" action="/cgi-bin/koha/bull/subscription-bib-search.pl" method="post">
+	<input type="hidden" name="op" value="do_search" />
+	<input type="hidden" name="type" value="intranet" />
+	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+	<div class="data">
+		<table>
+		<caption>Search on</caption>
+		<tr><th scope="row"><label for="keyword">Keyword</label></th><td>
+			<input type="hidden" name="marclist" value="" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" /> 
+			<input type="text" id="keyword" name="value"> <a href="#" onclick="PopupSuggestion(); return false;">(Suggestions)</a>
+		</td></tr>
+		<tr><th scope="row"><label for="itemtype">Itemtype</label></th><td>
 			<!-- TMPL_VAR name="CGIitemtype" -->
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->" />
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
 			<input type="hidden" name="marclist" value="" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="=" />
 			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->" />
 		</td></tr>
-			
-		<tr><th><label for="orderby">Order by:</label></th><td><select name="orderby" id="orderby" size="1">
+	</div>
+	<div class="data">
+		<tr><th scope="row"><label for="resultsperpage">Results per page :</label></th><td>
+			<select align="right" id="resultsperpage" name="resultsperpage" size="1">
+				<option value="20">20</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+			</select>
+		<label for="orderby">Ordered by</label>
+			<select id="orderby" name="orderby" size="1">
 				<option value="biblio.title">Title</option>
 				<option value="biblio.author">Author</option>
 				<option value="biblioitems.dewey">Dewey</option>
 				<option value="biblioitems.publicationyear">Publication Year</option>
 				<option value="biblioitems.publishercode">Publisher</option>
-			</select></td></tr>
-		</table>		
-		<p><input type="submit" value="Start search" class="submit"></p>
+			</select>
+		</td></tr>
+		</table>
+		<p>
+			<input type="submit" value="Start search" class="submit" />
+			
+		</p>
 	</div>
-	<div>
-
 </form>
 
-<script language="JavaScript" type="text/javascript">
+<script language="Javascript" type="text/javascript">
 function AddStatement() {
 
 	document.forms['f'].op.value="AddStatement";
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl
index 59a0a7d1ae..e254fc0a1e 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl
@@ -4,24 +4,22 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-	<h1>Issues for a subscription</h1>
-	<form class="inline" action="/cgi-bin/koha/bull-home.pl" method="get">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" class="submit" value="Subscription Info" />
-	</form>
-	<form class="inline" action="/cgi-bin/koha/detail.pl" method="get">
-		<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" class="submit" value="Bibliographic Record" />
-	</form>
-	<form class="inline" action="serial-issues.pl" method="get">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="hidden" name="selectview" value="full" />
-		<input type="submit" class="submit" value="Detailed Issues View" />
-	</form>
+<h1>Issues History</h1>	
+	<form class="inline" method="get" action="/cgi-bin/koha/bull-home.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit" value="Back to Subscriptions" /></form>
+	<form class="inline" method="get" action="/cgi-bin/koha/MARCdetail.pl">
+<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit" value="View Biblio Record" /></form>
+	<form class="inline" method="get" action="serial-issues.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="hidden" name="selectview" value="full" />
+<input type="submit" class="submit" value="Complete view" /></form>
 
 	<!-- TMPL_LOOP name="subscription_LOOP" -->
-	<div class="notes">
-		<h3>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h3>
+	
+	<div class="details">
+		<h2>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
 		<p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
 		<b>
 		<!--TMPL_IF name="periodicity1" -->
@@ -87,12 +85,8 @@
 		</p>
 		<p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
 		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
-</div>
-
-<div class="notes">
-
-	<!--TMPL_UNLESS Name="fullinfo" -->
-		<!-- TMPL_IF NAME="notes" --><p><!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
+	<!--TMPL_UNLESS Name=fullinfo -->
+		<p><!-- TMPL_VAR name="notes" --></p>
 		<!-- TMPL_IF name="opacnote" -->
 			<h3>Issues summary</h2>
 			<p>
@@ -100,7 +94,7 @@
 			</p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="recievedlist" -->
-			<h3>Received issues</h2>
+			<h3>Recieved issues</h2>
 			<p>
 				<!-- TMPL_VAR name="recievedlist" -->
 			</p>
@@ -116,4 +110,5 @@
 <!-- /TMPL_LOOP -->
 </div>
 
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
index 8eccbd8274..c1c4811b7c 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
@@ -4,36 +4,53 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
-<form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" value="Edit Subscription" class="submit" /></form>
+<h1>Receive Issues for <!-- TMPL_VAR name="bibliotitle" --></h1>
 
-<form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="post"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="View in Catalog" class="submit" /></form>
+<form class="inline" method="get" action="subscription-detail.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input class="submit" type="submit" title="detail of the subscription" value="Subscription Details" /></form>
+
+<form class="inline" method="get" action="/cgi-bin/koha/bull-home.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input class="submit" type="submit" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->" value="All Subscriptions" /></form>
+
+<form class="inline" method="get" action="/cgi-bin/koha/MARCdetail.pl">
+<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input class="submit" type="submit" title="go to <!-- TMPL_VAR name="bibliotitle" -->" value="View Biblio Record" /></form>
 
 <div class="data">
-	<form method="post" action="statecollection.pl">
-		<input type="hidden" name="op" value="serialchangestatus" />
-		<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" -->" />
-	<table>
-	<caption>Awaited or Late Numbers</caption>
+<form method="post" name="f" action="statecollection.pl">
+		<input type="hidden" name="op" value="serialchangestatus">
+		<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" -->">
+<table><caption>Awaited or Late Subscription Issues</caption>
+	
 	<tr>
-		<th scope="col">Numbered</th>
-		<th scope="col">Expected</th>
-		<th scope="col">Status</th>
-		<th scope="col">Notes</th>
+		<th scope="col">
+			Numbered
+		</th>
+		<th scope="col">
+			Expected On
+		</th>
+		<th scope="col">
+			Status
+		</th>
+		<th scope="col">
+			Notes
+		</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
 			<td>
-				<input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="50" maxlength="100" />
+				<input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="30" maxlength="100">
 			</td>
 			<td>
-				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
+				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
 			</td>
 			<td>
-				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->" />
-				<select name="status">
+				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
+				<select name="status" size="1">
 					<!--TMPL_IF name="status1" -->
 						<option value="1" selected>Waited</option>
 					<!-- /TMPL_IF -->
@@ -65,20 +82,20 @@
 				</select>
 			</td>
 			<td>
-				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size="20" maxlength="255" />
+				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size="20" maxlength="255">
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	<!-- TMPL_UNLESS name="hassubscriptionexpired" -->
 		<tr>
 			<td>
-				Manual issue <input type="text" name="serialseq" size="30" maxlength="100" />
+				<label for="serialseq">Enter Manual issue </label><input type="text" name="serialseq" id="serialseq" size="30" maxlength="100">
 			</td>
 			<td>
-				<input type="text" name="planneddate" size="10" maxlength="15" />
+				<input type="text" id="planneddate" name="planneddate" size="10" maxlength="15">
 			</td>
 			<td>
-				<input type="hidden" name="serialid" value="0" />
+				<input type="hidden" name="serialid" value="0">
 				<select name="status" size="1">
 						<option value="2">Arrived</option>
 						<option value="3" selected>Late</option>
@@ -89,33 +106,34 @@
 		</tr>
 	<!-- /TMPL_UNLESS -->
 	</table>
-	<p><input type="submit" value="Save changes" accesskey="w" class="submit" /></p>
+	<p><input type="submit" class="submit" value="Save changes" accesskey="w" /></p>
 	<!-- TMPL_IF name="hassubscriptionexpired" -->
-		<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="submit">Renew</a> your subscription</p>
+		<div class="error">Subscription has expired. Awaited last issue status can't be changed. <a href="#" onclick="popup(); return false;">Renew</a> your subscription</div>
 	<!-- /TMPL_IF -->
-	</form>	</div>
+	</form>
+</div>
 
 <div class="data">
-	<form method="post" 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" -->" />
-		<table>
-		<caption>Subscription Summary</caption>
-		<tr><th><label>Librarian:</label></th><td><!-- TMPL_VAR name="user" --></td></tr>
-		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
-		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
-		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
-		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
-		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
-<!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
+	<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" -->">
+	<table><caption>Subscription summary</caption>	
+		<tr><th scope="row"><label for="">Librarian:</label></th><td><!-- TMPL_VAR name="user" --></td></tr>
+		<tr><th scope="row"><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" id="histstartdate" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></td></tr>
+		<tr><th scope="row"><label for="enddate">End :</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></td></tr>
+		<tr><th scope="row"><label for="recievedlist">Recieved issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
+		<tr><th scope="row"><label for="missinglist">Missing issues:</label></th><td>
+<textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
+		<tr><th scope="row"><label for="opacnote">OPAC Note:</label></th><td>
+<textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
 </table>
-		<p><input type="submit" value="Save changes" class="submit" /></p>
+		<p><input type="submit" value="Save changes" class="submit"></p>
 	</form>
 </div>
-</div>
 
+</table>
 <script language="JavaScript" type="text/javascript">
 
 function popup()
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
index 976f91f447..46c733df85 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
@@ -5,213 +5,208 @@
 
 <div id="main">
 <!-- TMPL_IF name="mod" -->
-	<h1>Modify subscription</h1>
+	<h1>Modify Subscription</h1>
 	<form method="post" name="f" action="subscription-detail.pl">
-		<input type="hidden" name="op" value="modsubscription" />
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+		<input type="hidden" name="op" value="modsubscription">
+		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
 <!-- TMPL_ELSE -->
-	<h1>Add a subscription</h1>
-	<form method="post" name="f" action="subscription-detail.pl">
+	<h1>Add a Subscription</h1>
+	<form method="post" name="f" action="/cgi-bin/koha/bull/subscription-add.pl">
 <!-- /TMPL_IF -->
+<input type="hidden" name="op" value="addsubscription" />
+		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
 <div class="data">
 	<table>
-	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
-		<tr><th><input type="hidden" name="op" value="addsubscription" />
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
-		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
-		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
-		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
-		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
-</table>
-		Warning!
+		<caption>Subscription Information For:</caption>
+		<tr><th scope="row">Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
+		<tr><th scope="row"><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size=4> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
+		<tr><th scope="row"><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size=4> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
+		<tr><th scope="row"><label for="notes-field">Notes: </label></th><td><textarea name="notes" id="notes-field" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
+	</table>
+		<div class="help"><h4>Warning</h4>
 		<ul>
 			<li>remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
 			<li>You also must have selected a supplier if you want to ask for late issues</li>
 		</ul>
+		</div>
 </div>
+
 <div class="data">
 	<table>
 	<caption>Planning</caption>
-	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
-	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
-			<select name="periodicity" size="1" id="periodicity">
-				<option value="" selected="selected">Unknown</option>
+	<tr><th scope="row"><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10></td></tr>
+	<tr><th scope="row"><label for="periodicity">Frequency (*)</label></th><td><select id="periodicity" name="periodicity" size="1">
+				<option value="" selected>Unknown</option>
 				<!-- TMPL_IF name="periodicity1" -->
-					<option value="1" selected="selected">1/day</option>
+					<option value="1" selected>1/day</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1/day</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity2" -->
-					<option value="2" selected="selected">1/week</option>
+					<option value="2" selected>1/week</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">1/week</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity3" -->
-					<option value="3" selected="selected">1/2 weeks</option>
+					<option value="3" selected>1/2 weeks (2/month)</option>
 				<!-- TMPL_ELSE -->
-					<option value="3">1/2 weeks</option>
+					<option value="3">1/2 weeks (2/months)</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity4" -->
-					<option value="4" selected="selected">1/3 weeks</option>
+					<option value="4" selected>1/3 weeks</option>
 				<!-- TMPL_ELSE -->
 					<option value="4">1/3 weeks</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity5" -->
-					<option value="5" selected="selected">1/month</option>
+					<option value="5" selected>1/month</option>
 				<!-- TMPL_ELSE -->
 					<option value="5">1/month</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity6" -->
-					<option value="6" selected="selected">1/2 months</option>
+					<option value="6" selected>1/2 months (6/year)</option>
 				<!-- TMPL_ELSE -->
-					<option value="6">1/2 months</option>
+					<option value="6">1/2 months (6/year)</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity7" -->
-					<option value="7" selected="selected">1/3 months</option>
+					<option value="7" selected>1/3 months (1/quarter)</option>
 				<!-- TMPL_ELSE -->
-					<option value="7">1/3 months</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity8" -->
-					<option value="8" selected="selected">1/quarter</option>
-				<!-- TMPL_ELSE -->
-					<option value="8">1/quarter</option>
+					<option value="7">1/3 months (1/quarter)</option>
 				<!-- /TMPL_IF -->
+				<!-- periodicity8 is 1/quarter, exactly like periodicity7 -->
 				<!-- TMPL_IF name="periodicity9" -->
-					<option value="9" selected="selected">1/2 quarters</option>
+					<option value="9" selected>2/years</option>
 				<!-- TMPL_ELSE -->
-					<option value="9">1/2 quarters</option>
+					<option value="9">2/years</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity10" -->
-					<option value="10" selected="selected">1/year</option>
+					<option value="10" selected>1/year</option>
 				<!-- TMPL_ELSE -->
 					<option value="10">1/year</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity11" -->
-					<option value="11" selected="selected">1/2 years</option>
+					<option value="11" selected>1/2 years</option>
 				<!-- TMPL_ELSE -->
 					<option value="11">1/2 years</option>
 				<!-- /TMPL_IF -->
-			</select>
-	</td></tr>
-	<tr><th><label for="dow">Arrives on</label></th><td>
-			<select name="dow" id="dow">
+			</select></td></tr>
+	<tr><th scope="row"><label for="dow">Arrives on</label></th><td><select name="dow" id="dow" size="1">
 				<option value="">None</option>
 				<!-- TMPL_IF name="dow1" -->
-					<option value="1" selected="selected">Monday</option>
+					<option value="1" selected>Monday</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">Monday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow2" -->
-					<option value="2" selected="selected">Tuesday</option>
+					<option value="2" selected>Tuesday</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">Tuesday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow3" -->
-					<option value="3" selected="selected">Wednesday</option>
+					<option value="3" selected>Wednesday</option>
 				<!-- TMPL_ELSE -->
 					<option value="3">Wednesday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow4" -->
-					<option value="4" selected="selected">Thursday</option>
+					<option value="4" selected>Thursday</option>
 				<!-- TMPL_ELSE -->
 					<option value="4">Thursday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow5" -->
-					<option value="5" selected="selected">Friday</option>
+					<option value="5" selected>Friday</option>
 				<!-- TMPL_ELSE -->
 					<option value="5">Friday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow6" -->
-					<option value="6" selected="selected">Saturday</option>
+					<option value="6" selected>Saturday</option>
 				<!-- TMPL_ELSE -->
 					<option value="6">Saturday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow7" -->
-					<option value="7" selected="selected">Sunday</option>
+					<option value="7" selected>Sunday</option>
 				<!-- TMPL_ELSE -->
 					<option value="7">Sunday</option>
 				<!-- /TMPL_IF -->
 			</select></td></tr>
-			</table>
+	</table>
 </div>
+
 <div class="data">
 	<table>
-	<caption>Subscription Length (choose one)</caption>
-	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
-	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
-	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
-</table>
+	<caption>Subscription length (choose one)</caption>
+	<tr><th scope="row"><label for="numberlength">Number of issues</label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
+	<tr><th scope="row"><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
+	<tr><th scope="row"><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
+	</table>
 </div>
-<div class="data">
-	<h2>Numbering calculation</h2>
-		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
+
+	<div class="data">
+<h2>Numbering calculation</h2>
+	<p><label for="numberingmethod">Numbering formula:</label> <input id="numberingmethod" type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
 		<table>
-			<colgroup span="4">
-				<col span="1"></col>
-				<col span="1"></col>
-				<col span="1"></col>
-				<col span="1"></col>
-			</colgroup>
 			<tr>
-				<th>&nbsp;</th>
+				<th scope="row">&nbsp;</th>
 				<th scope="col">X</th>
 				<th scope="col">Y</th>
 				<th scope="col">Z</th>
 			</tr>
 			<tr>
-				<th scope="row"><label for="add1">Add:</label></th>
-				<td><input type="text" id="add1" name="add1" value="<!-- TMPL_VAR name="add1" -->" /></td>
-				<td><input type="text" id="add2" name="add2" value="<!-- TMPL_VAR name="add2" -->" /></td>
-				<td><input type="text" id="add3" name="add3" value="<!-- TMPL_VAR name="add3" -->" /></td></tr>
+				<th scope="row"><label for="add1">Add:</label></td>
+				<td>
+					<input type="text" id="add1" name="add1" value="<!-- TMPL_VAR name="add1" -->">
+				</td>
+				<td>
+					<input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
+				</td>
+				<td>
+					<input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
+				</td>
+			</tr>
 			<tr>
 				<th scope="row"><label for="every1">...Once every:</label></th>
-				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
-				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
-				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
+				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
+				<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
+				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
 			</tr>
 			<tr>
 				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
-				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
-				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
-				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
+				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
 			</tr>
 			<!-- TMPL_IF name="mod" -->
 			<tr>
-				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
-				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
-				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
-				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
+				<th scope="row"><label for="innerloop">The loop is for instance:</label></th>
+				<td><input type="text" id="innerloop" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
+				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
+				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
 			</tr>
 			<!-- /TMPL_IF -->
 			<tr>
 				<th scope="row"><label for="setto1">...Set back to:</label></th>
-				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
-				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
-				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
+				<td><input type="text" id="setto1" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
+				<td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
+				<td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="lastvalue1">
+				<th scope="row">
 					<!-- TMPL_IF name="mod" -->
-						Last value:
+						<label for="lastvalue1">Last value:</label>
 					<!-- TMPL_ELSE -->
-						Begins with:
+						<label for="lastvalue1">Begins with:</label>
 					<!-- /TMPL_IF -->
-				</label></th>
-				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
-				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
-				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
+				</th>
+				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
+				<td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
+				<td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
 			</tr>
 		</table>
 </div>
+
 <!-- TMPL_IF name="mod" -->
-	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
+	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="submit">
 <!-- TMPL_ELSE -->
-	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
-<!-- /TMPL_IF -->
-
-
-</form>
-</div>
+	<input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="submit">
+<!-- /TMPL_IF --></div>
 
 <script language="JavaScript" type="text/javascript">
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
index 52a8a1a1f6..d0242e85ce 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
@@ -4,33 +4,44 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
-<form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> 
+<h1>Subscription Details:  <!-- TMPL_VAR name="bibliotitle" --></h1>
+<form class="inline" method="get" action="subscription-add.pl">
+<input type="hidden" name="op" value="mod" />
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input type="submit" class="submit" title="Modify subscription" value="Edit" /></form>
 
-<form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form>
+<form class="inline" method="get" action="statecollection.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input type="submit" class="submit" value="Receive Issues" /></form>
 
-<form class="inline" action="/cgi-bin/koha/bull/statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="1" /><input type="submit" class="submit" value="Receive Issues" /></form>
+<form class="inline" method="get" action="serial-issues.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit"  title="All issues on this title" value="Issue History" /></form>
 
-<form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
+<form class="inline" method="get" action="/cgi-bin/koha/bull-home.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit"  title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->" value="Subscriptions" /></form>
 
-<form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" onclick="confirm_deletion(); return false;" value="Delete subscription" /></form>
+<form class="inline" method="get" action="/cgi-bin/koha/MARCdetail.pl">
+<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit"  title="go to <!-- TMPL_VAR name="bibliotitle" -->" value="View Biblio Record" /></form>
+
+<form class="inline"><input type="submit" class="cancel" value="Delete Subscription" onclick="confirm_deletion(); return false;" /></form>
 
 <div class="data">
-<table>
-	<caption>Subscription Information</caption>
-		<tr><th>Librarian identity:</th><td> <!-- TMPL_VAR name="librarian" --></td></tr>
-		<tr><th>Supplier: </th><td><!-- TMPL_VAR name="aqbooksellername" --></td></tr>
-		<tr><th>Cost:</th><td><!-- TMPL_VAR name="cost" --></td></tr>
-		<tr><th>Budget:</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
-		<tr><th>Title:</th><td><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="bibliotitle" --></a></td></tr>
-		<tr><th>Notes:</th><td><!-- TMPL_VAR name="notes" --></td></tr>
-</table>
+<table>	<caption>Subscription information</caption>
+		<tr><th scope="row">Librarian identity:</td><td> <!-- TMPL_VAR name="librarian" --></td></tr>
+		<tr><th scope="row">Supplier: </th><td><!-- TMPL_VAR name="aqbooksellername" --></td></tr>
+		<tr><th scope="row">Cost:</th><td><!-- TMPL_VAR name="cost" --></td></tr>
+		<tr><th scope="row">Budget:</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
+		<tr><th scope="row">Title:</th><td><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="bibliotitle" --></a></td></tr>
+		<tr><th scope="row">Notes:</th><td><!-- TMPL_VAR name="notes" --></td></tr></table>
 </div>
+
 <div class="data">
-<table>
-	<caption>Planning</caption>
-	<tr><th>Beginnning date:</th><td><!-- TMPL_VAR name="startdate" --></td></tr>
-	<tr><th>Frequency (*):</th><td>
+<table>	<caption>Planning</caption>
+	<tr><th scope="row">Beginnning date:</th><td> <!-- TMPL_VAR name="startdate" --></td></tr>
+	<tr><th scope="row">Frequency (*):</th><td>
 		<!--TMPL_IF name="periodicity1" -->
 				1/day
 		<!-- /TMPL_IF -->
@@ -47,25 +58,25 @@
 				1/Month
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="periodicity6" -->
-				1/2 Monthes
+				1/2 Months (6/year)
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="periodicity7" -->
-				1/3 Monthes
+				1/Quarter
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="periodicity8" -->
-				1/quarter
+				1/Quarter
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="periodicity9" -->
-				1/2 quarters
+				2/Year
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="periodicity10" -->
-				1/year
+				1/Year
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="periodicity11" -->
-				1/2 years
+				1/2 Years
 		<!-- /TMPL_IF -->
 	</td></tr>
-	<tr><th>Arrives on:</th><td>
+	<tr><th scope="row">Arrives on:</th><td>
 		<!--TMPL_IF name="arrival1" -->
 			Monday
 		<!-- /TMPL_IF -->
@@ -86,28 +97,27 @@
 		<!-- /TMPL_IF -->
 		<!--TMPL_IF name="arrival7" -->
 				Sunday
-		<!-- /TMPL_IF -->
-		</td></tr></table>
+		<!-- /TMPL_IF --></table>
 </div>
 <div class="data">
-	<table>
-	<caption>Subscription length</caption>
-	<tr><th>Number of issues:</th><td><!-- TMPL_VAR name="numberlength" --></td></tr>
-	<tr><th>Number of weeks:</th><td><!-- TMPL_VAR name="weeklength" --></td></tr>
-	<tr><th>Number of months:</th><td><!-- TMPL_VAR name="monthlength" --></td></tr>
-</table>
+<table>	<caption>Subscription length</caption>
+	<tr><th scope="row">Number of issues:</th><td><!-- TMPL_VAR name="numberlength" --></td></tr>
+	<tr><th scope="row">Number of weeks:</th><td><!-- TMPL_VAR name="weeklength" --></td></tr>
+	<tr><th scope="row">Number of months:</th><td><!-- TMPL_VAR name="monthlength" --></td></tr></table>
+
 </div>
-<div class="data"><h2>Numbering calculation</h2>
-	<table>
-	<caption>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></caption>
+<div class="data">
+	<h2>Numbering calculation</h2>
+		
+		<table><caption>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></caption>
 			<tr>
-				<th>&nbsp;</th>
+				<th scope="row">&nbsp;</th>
 				<th scope="col">X</th>
 				<th scope="col">Y</th>
 				<th scope="col">Z</th>
 			</tr>
 			<tr>
-				<th scope="row">Add</th>
+				<th scope="row">Add:</th>
 				<td>
 					<!-- TMPL_VAR name="add1" -->
 				</td>
@@ -119,13 +129,13 @@
 				</td>
 			</tr>
 			<tr>
-				<th scope="row">once every</th>
+				<th scope="row">once every:</th>
 				<td><!-- TMPL_VAR name="every1" --></td>
 				<td><!-- TMPL_VAR name="every2" --></td>
 				<td><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
-				<th scope="row">When more than</th>
+				<th scope="row">When more than:</th>
 				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
 				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
@@ -134,13 +144,15 @@
 					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
 			</tr>
 			<tr>
-				<th scope="row">Set back to</th>
+				<th scope="row">Set back to:</th>
 				<td><!-- TMPL_VAR name="setto1" --></td>
 				<td><!-- TMPL_VAR name="setto2" --></td>
 				<td><!-- TMPL_VAR name="setto3" --></td>
 			</tr>
 			<tr>
-				<th scope="row">Last value</th>
+				<th scope="row">
+						Last value:
+				</th>
 				<td><!-- TMPL_VAR name="lastvalue1" --></td>
 				<td><!-- TMPL_VAR name="lastvalue2" --></td>
 				<td><!-- TMPL_VAR name="lastvalue3" --></td>
@@ -148,13 +160,13 @@
 		</table>
 </div>
 <div class="data">
+	<h2>Issues</h2>
 	<table>
-	<caption>Issues</caption>
 	<tr>
-		<th>Issue number</th>
-		<th>Planned date</th>
-		<th>Status</th>
-		<th>Note</th>
+		<th scope="col">Issue number:</th>
+		<th scope="col">Planned date:</th>
+		<th scope="col">Status:</th>
+		<th scope="col">Note:</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
@@ -186,7 +198,7 @@
 	</table>
 </div>
 </div>
-<script>
+<script language="JavaScript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
 function confirm_deletion() {
 	<!-- TMPL_IF name="totalissues" -->
-- 
2.39.5