[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/serials ac... [rel_3_0]

paul poulain paul at koha-fr.org
Mon Oct 30 11:06:18 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/10/30 10:06:17

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/serials: 
	                                         acqui-search-result.tmpl 
	                                         acqui-search.tmpl 
	                                         serials-home.tmpl 
	                                         serials-recieve.tmpl 
	                                         subscription-add.tmpl 
	                                         subscription-bib-search.tmpl 
	                                         subscription-detail.tmpl 
Removed files:
	koha-tmpl/intranet-tmpl/prog/en/serials: 
	                                         alt_subscription-add.tmpl 
	                                         alt_subscription-detail.tmpl 

Log message:
	- fixing many bugs in serials
	- removing alt_ serials features, as they are now "official" templates
	- reintroducing patron alert management

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/alt_subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/alt_subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=0

Patches:
Index: acqui-search-result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- acqui-search-result.tmpl	12 Jul 2006 12:23:13 -0000	1.2
+++ acqui-search-result.tmpl	30 Oct 2006 10:06:17 -0000	1.2.2.1
@@ -1,5 +1,4 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 <h1>Supplier Search Results</h1>
 <h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
 <table>
@@ -10,7 +9,7 @@
 	<!-- TMPL_LOOP name="loop_suppliers" -->
 		<tr>
 			<td><!-- TMPL_VAR name="name" --></td>
-			<td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR name="aqbooksellerid" -->,'<!-- TMPL_VAR name="name" -->')">Get It !</td>
+			<td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR name="aqbooksellerid" -->,'<!-- TMPL_VAR name="name" -->')">select</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>

Index: acqui-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- acqui-search.tmpl	2 Oct 2006 09:36:47 -0000	1.2.2.1
+++ acqui-search.tmpl	30 Oct 2006 10:06:17 -0000	1.2.2.2
@@ -1,6 +1,4 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Search supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <script language="Javascript">
 

Index: serials-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- serials-home.tmpl	11 Aug 2006 14:34:45 -0000	1.5
+++ serials-home.tmpl	30 Oct 2006 10:06:17 -0000	1.5.2.1
@@ -76,22 +76,6 @@
                         <a href="routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&op=new<!-- /TMPL_UNLESS -->">Routing List</a>
                     </td>
                 <!-- TMPL_ELSE -->
-                <!-- TMPL_IF NAME="alt_links" -->
-                        <!-- TMPL_IF name="toggle" -->
-                            <td class="hilighted">
-                        <!-- TMPL_ELSE -->
-                        <td>
-                        <!-- /TMPL_IF -->
-                            <a href="alt_subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="subscription detail">Detail</a>
-                        </td>
-                        <!-- TMPL_IF name="toggle" -->
-                            <td class="hilighted">
-                        <!-- TMPL_ELSE -->
-                            <td>
-                        <!-- /TMPL_IF -->
-                        <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
-                        </td>			      
-                <!-- TMPL_ELSE -->
                         <!-- TMPL_IF name="toggle" -->
                             <td class="hilighted">
                         <!-- TMPL_ELSE -->
@@ -107,19 +91,14 @@
                             <a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
                         </td>
                 <!-- /TMPL_IF -->
-                <!-- /TMPL_IF -->
             </tr>
         <!-- /TMPL_LOOP -->
     </table>
     
     <!-- TMPL_IF NAME="routing" -->
     <!-- TMPL_ELSE -->
-        <!-- TMPL_IF NAME="alt_links" -->
-            <a href="/cgi-bin/koha/serials/alt_subscription-add.pl" class="button serial">Add subscription</a>	      
-        <!-- TMPL_ELSE -->      
             <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button serial">Add subscription</a>
         <!-- /TMPL_IF -->
-    <!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 

Index: serials-recieve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/Attic/serials-recieve.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- serials-recieve.tmpl	2 Oct 2006 09:15:44 -0000	1.2.2.1
+++ serials-recieve.tmpl	30 Oct 2006 10:06:17 -0000	1.2.2.2
@@ -5,17 +5,16 @@
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <!--------------------------MAIN BODY OF PAGE-------------------------->
-<div id="mainbloc">
-<h1>Check In</h1>
-<h3>Subscription for: <!-- TMPL_VAR name="bibliotitle" --></h3>
-<a href="alt_subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button" title="detail of the subscription">Subscription Details</a>
-<!-- <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Search All Subscriptions</a> -->
-<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a>
-<!-- TMPL_IF NAME="routing" -->
-<a href="routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button" title="subscription routing list">Routing list</a>
-<!-- /TMPL_IF -->
+<h1>Check In subscription for: <!-- TMPL_VAR name="bibliotitle" --></h1>
+<div id="action">
+    <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription Details</a>
+    <!-- <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Search All Subscriptions</a> -->
+    <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a>
+    <!-- TMPL_IF NAME="routing" -->
+    <a href="routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="subscription routing list">Routing list</a>
+    <!-- /TMPL_IF -->
+</div>
 
-<div id="bloc25">
 <h2>waited or late numbers</h2>
 	<form method="post" name="f" action="serials-recieve.pl" onsubmit="return barcode_check()">
 		<input type="hidden" name="op" value="serialchangestatus">
@@ -24,25 +23,25 @@
 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
 	<table cellspacing="0" cellpadding="0" border="0" class="collapse">
 	<tr>
-		<td class="cell-header">
+		<th>
 			Numbered
-		</td>
-		<td class="cell-header">
+		</th>
+		<th>
 			Published on
-		</td>
-		<td class="cell-header">
+		</th>
+		<th>
 			planned for
-		</td>
-		<td class="cell-header">
+		</th>
+		<th>
 			Status
-		</td>
-		<td class="cell-header">
+		</th>
+		<th>
 			Notes
-		</td>
+		</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
-			<td class="cell">
+			<td>
 				Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -50,13 +49,13 @@
 				Barcode <input type="text" name="barcode" value="<!-- TMPL_VAR NAME="barcode"-->" id="barcode<!-- TMPL_VAR NAME="num" -->" size=20 maxlength=20>
 			<!--/TMPL_IF -->
 			</td>
-			<td class="cell">
+			<td>
 				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />&nbsp;
 			<!--/TMPL_IF  -->
 			</td>
-			<td class="cell">
+			<td>
 				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -68,7 +67,7 @@
 				</select>
 			<!--/TMPL_IF -->
 			</td>
-			<td class="cell">
+			<td>
 				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
 				<select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->">
 					<!--TMPL_IF name="status1" -->
@@ -94,12 +93,11 @@
 					<!-- TMPL_ELSE -->
 						<option value="5">Not Available</option>
 					<!-- /TMPL_IF -->
-<!--
 					<!--TMPL_IF name="status6" -->
 						<option value="6" selected>Delete</option>
 					<!-- TMPL_ELSE -->
 						<option value="6">Delete</option>
-					<!-- /TMPL_IF --> -->
+					<!-- /TMPL_IF -->
 				</select>
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -122,7 +120,7 @@
 			<!--/TMPL_IF -->
 
 			</td>
-			<td class="cell">
+			<td>
 				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -142,7 +140,7 @@
 	<!-- /TMPL_LOOP -->
 	<!-- TMPL_UNLESS name="hassubscriptionexpired" -->
 		<tr>
-			<td class="cell">
+			<td>
 				Manual issue <input type="text" name="serialseq" size=30 maxlength=100 value="<!-- TMPL_VAR NAME="missingseq" -->">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -150,13 +148,13 @@
 				Barcode <input type="text" name="barcode" value="" size=20 maxlength=20>
 			<!--/TMPL_IF-->
 			</td>
-			<td class="cell">
+			<td>
 				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />&nbsp;
 			<!--/TMPL_IF  -->
 			</td>
-			<td class="cell">
+			<td>
 				<input type="text" name="planneddate" size=10 maxlength=15 value="<!-- TMPL_VAR NAME="missingdate" -->">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -168,7 +166,7 @@
 				</select>
 			<!--/TMPL_IF-->
 			</td>
-			<td class="cell">
+			<td>
 				<!-- TMPL_IF NAME="frommissing" -->
 				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="missingid" -->">
 				<!-- TMPL_ELSE -->
@@ -211,7 +209,7 @@
 				<!--/TMPL_IF -->
 			<!--/TMPL_IF-->
 			</td>
-			<td class="cell">
+			<td>
 				&nbsp;
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
@@ -244,18 +242,16 @@
 		</script>
 	<!-- /TMPL_IF -->	
 	</form>
-</div>
 
-<div class="bloc25">
 	<h2>Subscription summary</h2>
-	<form method="post" name="f2" action="statecollection.pl">
+	<form method="post" name="f2" action="serials-recieve.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 class="label100">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><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
+		<p><label>Starting date:</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"> (the date of the 1st subscription)</p>
+		<p><label>Ending date:</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->">(if empty : subscription still active)</p>
 		<p>Recieved issues</p>
 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
 		<p>Missing issues</p>
@@ -264,7 +260,6 @@
 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
 		<input type="submit" value="Save changes" class="button">
 	</form>
-</div>
 
 </div>
 <script language="JavaScript" type="text/javascript">

Index: subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- subscription-add.tmpl	2 Oct 2006 09:15:44 -0000	1.3.2.2
+++ subscription-add.tmpl	30 Oct 2006 10:06:17 -0000	1.3.2.3
@@ -8,15 +8,6 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions -->
 
-<style type="text/css">
-<!--
-
-#bloc25 {
-	border: 1px solid #666666;
-	margin-bottom: 5px;
-}
--->
-</style>
 <!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
@@ -607,9 +598,9 @@
 }
 
 function isArray(obj) {
-   if (obj.constructor.toString().indexOf("Array") == -1)
+if (obj.constructor.toString().indexOf("Array") == -1)
       return false;
-   else
+else
       return true;
 }
 
@@ -641,10 +632,9 @@
 -->
 </script>
 
-<div id="mainbloc">
 <!-- TMPL_IF name="mod" -->
-	<h1>Modify subscription</h1>
-	<form method="post" name="f" action="alt_subscription-detail.pl">
+    <h1>Modify a 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" -->">
 <!-- TMPL_ELSE -->
@@ -652,39 +642,68 @@
 	<form method="post" name="f">
 		<input type="hidden" name="op" value="addsubscription">
 <!-- /TMPL_IF -->
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
-		<input type="hidden" name="irreg_check" value="0">
+<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
+<input type="hidden" name="irreg_check" value="0">
 
 
-<div id="bloc25">
+<div>
 	<h2>Subscription information</h2>
 	<table border="0" cellspacing="5" cellpadding="0">
-	<tr><td>Librarian:</td>
-	    <td><!-- TMPL_VAR name="loggedinusername" --></td></tr>
-	<tr><td><label>Supplier:</label></td>
+        <tr>
+            <td>Librarian:</td>
+            <td><!-- TMPL_VAR name="loggedinusername" --></td>
+        </tr>
+        <tr>
+            <td><label>Supplier:</label></td>
 	    <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
-	<tr><td><label>Biblio</label></td>
-	    <td><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <a href="#" onClick="Plugin(f)">Search for Biblio</a> | <a href="/cgi-bin/koha/acqui/acqui-home.pl">Create Biblio</a></td>
-	<tr><td><label>Call Number</label></td>
-	    <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td></tr>
-	<tr><td><label>Notes</label></td>
+        </tr>
+        <tr>
+            <td><label>Biblio</label></td>
+            <td>
+                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> 
+                (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>)
+                <a href="#" onClick="Plugin(f)">Search for Biblio</a> |
+                <a href="/cgi-bin/koha/acqui/acqui-home.pl">Create Biblio</a>
+            </td>
+        </tr>
+        <tr>
+            <td><label>Call Number</label></td>
+            <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td>
+        </tr>
+        <tr>
+            <td><label>Notes</label></td>
 	    <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td>
-	<tr><td><b>Warning:</b></td>
+        </tr>
+        <tr>
+            <td>Patron alert with </td>
+            <td>
+                <select name="letter">
+                    <option value="">un-activated</option>
+                <!-- TMPL_LOOP name="letterloop" -->
+                    <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="lettername" --></option>
+                <!-- /TMPL_LOOP -->
+                </select> (select a letter &amp; patrons will be able to "follow" this subscription and recieve a mail on every new issue)
+            </td>
+        </tr>
+        <tr>
+            <td><b>Warning:</b></td>
 	    <td>
 		<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></td></tr>
+                </ul>
+            </td>
+        </tr>
 	</table>
-</div>
-<div id="bloc25">
+<div>
 	<h2>Planning</h2>
 	<table border="0" cellspacing="5" cellpadding="0">
-	<tr><td><label class="label100">First Issue ETA:</label></td>
-	    <td> <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
-
-<input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" />
-<!-- both scripts for calendar must follow the input field --> 
+        <tr>
+            <td><label>First Issue ETA:</label></td>
+            <td>
+                <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
+                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" />
+                <!-- both scripts for calendar must follow the input field --> 
                                         <script type="text/javascript">
                                             Calendar.setup({
                                                 inputField:"acqui_date",
@@ -700,10 +719,16 @@
                                                 button         :   "acqui_date",
                                                 align          :   "Tl"
                                             });
-                                        </script></td>
-	    <td rowspan="5"><div id="displayexample"></div></td></tr>
-	<tr><td><label class="label100">Frequency: (*)</label></td>
-	    <td>	<select name="periodicity" size="1">
+                </script>
+            </td>
+            <td rowspan="5">
+                <div id="displayexample"></div>
+            </td>
+        </tr>
+        <tr>
+            <td><label">Frequency: (*)</label></td>
+            <td>
+                <select name="periodicity" size="1">
 				<option value="" selected>-- please choose --</option>
 				<option value="">Unknown</option>
 
@@ -765,9 +790,14 @@
 					<option value="11">1/2 years</option>
 				<!-- /TMPL_IF -->
 			</select>
-	</td></tr>
-	<tr><td><label class="label100">Numbering Pattern:</label></td>
-	    <td><select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label>Numbering Pattern:</label>
+            </td>
+            <td>
+                <select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
 		<option value="" selected>-- please choose --</option>
 		<!-- TMPL_IF name="numberpattern1" -->
 			<option value="1" selected>Number</option>
@@ -804,14 +834,17 @@
 		<!-- TMPL_ELSE -->
 	 		<option value="7">None of the above</option>
 		<!-- /TMPL_IF -->
-
 		</select>
-<div id="more_options"></div>
-<div id="irregularity"></div></td></tr>
-	<tr><td><label class="label100">Begins On: (*)</label></td>
-	    <td><img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
-<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
-<!-- both scripts for calendar must follow the input field --> 
+                <div id="more_options"></div>
+                <div id="irregularity"></div>
+            </td>
+        </tr>
+        <tr>
+            <td><label>Begins On: (*)</label></td>
+            <td>
+                <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
+                <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
+                <!-- both scripts for calendar must follow the input field --> 
                                         <script type="text/javascript">
                                             Calendar.setup({
                                                 inputField   : "beginning_date",
@@ -827,62 +860,32 @@
                                                 button       : "beginning_date",
                                                 align        : "Tl"
                                             });
-                                        </script></td></tr>
-</table> 
-</div>
-
-<!--	<tr><td><label class="label100">Arrives on</label></td>
-	    <td>	<select name="dow" size="1">
-				<option value="">None</option>
-				<!-- TMPL_IF name="dow1" -->
-					<option value="1" selected>Monday</option>
-				<!-- TMPL_ELSE -->
-					<option value="1">Monday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow2" -->
-					<option value="2" selected>Tuesday</option>
-				<!-- TMPL_ELSE -->
-					<option value="2">Tuesday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow3" -->
-					<option value="3" selected>Wednesday</option>
-				<!-- TMPL_ELSE -->
-					<option value="3">Wednesday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow4" -->
-					<option value="4" selected>Thursday</option>
-				<!-- TMPL_ELSE -->
-					<option value="4">Thursday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow5" -->
-					<option value="5" selected>Friday</option>
-				<!-- TMPL_ELSE -->
-					<option value="5">Friday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow6" -->
-					<option value="6" selected>Saturday</option>
-				<!-- TMPL_ELSE -->
-					<option value="6">Saturday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow7" -->
-					<option value="7" selected>Sunday</option>
-				<!-- TMPL_ELSE -->
-					<option value="7">Sunday</option>
-				<!-- /TMPL_IF -->
-			</select></td></tr> -->
-
-<div id="bloc25">
-	<h2>Subscription length</h2>
-		<p><select name="subtype">
-<!-- TMPL_LOOP NAME="subtype" -->
-<option value="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="selected" --> selected="SELECTED" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
-<!-- /TMPL_LOOP -->
-</select> <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)</p>
-
-</div>
-<div id="bloc25">
-	<h2>Numbering calculation</h2>
-	<p>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
+                </script>
+            </td>
+        </tr>
+        <tr>
+            <td>Subscription length</td>
+            <td>
+                <select name="subtype">
+                    <!-- TMPL_LOOP NAME="subtype" -->
+                        <!-- TMPL_IF NAME="selected" -->
+                        <option value="<!-- TMPL_VAR NAME="name" -->"  selected="SELECTED">
+                        <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR NAME="name" -->">
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_VAR NAME="name" -->
+                        </option>
+                    <!-- /TMPL_LOOP -->
+                </select>
+                <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)
+            </td>
+        </tr>
+    <tr>
+        <td>Numbering calculation</td>
+        <td>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></td>
+    </tr>
+    <tr>
+    <td colspan=3>
 	<div id="basetable" style="display: none;">
 		<table class="small">
 			<tr>
@@ -941,8 +944,10 @@
 				<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>
-</div>
+            </table>
+        </div>
+        </td></tr>
+    </table>
 <!-- TMPL_IF name="mod" -->
 	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="button">
 <!-- TMPL_ELSE -->

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- subscription-bib-search.tmpl	2 Oct 2006 09:39:30 -0000	1.2.2.1
+++ subscription-bib-search.tmpl	30 Oct 2006 10:06:17 -0000	1.2.2.2
@@ -1,6 +1,4 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 <h1>Catalogue search</h1>
 
 <h2>Search on</h2>

Index: subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- subscription-detail.tmpl	2 Oct 2006 09:15:44 -0000	1.3.2.2
+++ subscription-detail.tmpl	30 Oct 2006 10:06:17 -0000	1.3.2.3
@@ -134,51 +134,38 @@
 
 -->
 </script>
-<div id="mainbloc">
-<h1>Subscription</h1>
-<a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">Edit</a>
-<a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">Receive</a>
-
-<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">Biblio</a>
-<!-- TMPL_IF NAME="routing" -->
-<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button">Edit Routing List</a>
-<!-- TMPL_ELSE -->
-<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new" class="button">Create Routing List</a>
-<!-- /TMPL_IF -->
-<a href="subscription-copy.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">Copy</a>
-
-
-<!-- TMPL_UNLESS name="totalissues" -->
-		<a href="javascript:confirm_deletion()" class="button">
+    <h1>Subscription</h1>
+    <div id="action">
+        <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
+        <a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a>
+        <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Biblio</a>
+        <!-- TMPL_IF NAME="routing" -->
+        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a>
+        <!-- TMPL_ELSE -->
+        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new">Create Routing List</a>
+        <!-- /TMPL_IF -->
+        <a href="subscription-copy.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Copy</a>
+        <!-- TMPL_UNLESS name="totalissues" -->
+            <a href="javascript:confirm_deletion()">
 			delete
 		</a>
-<!-- /TMPL_UNLESS -->
-
-<table>
-<tr valign="top"><td>
-
-<div class="bloc25">
-	<h2>Subscription information</h2>
-	<p><label class="label100">Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p><br />
-
-	<p><label class="label100">Supplier:</label> <!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</p>
-
-	<p><label class="label100">Cost:</label> <!-- TMPL_VAR name="cost" -->&nbsp;</p>
-
-	<p><label class="label100">Budget:</label> <!-- TMPL_VAR name="bookfundid" -->&nbsp;</p>
-
-	<p><label class="label100">Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p><br />
-	<p><label class="label100">Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p>
-
-	<p><label class="label100">Notes:</label> <!-- TMPL_VAR name="notes" --></p>
-</div>
-
-<div class="bloc25">
+        <!-- /TMPL_UNLESS -->
+    </div>
+    <fieldset>
+        <legend>Subscription information</legend>
+        <p><label>Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p>
+        <p><label>Supplier:</label> <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</a></p>
+        <p><label>Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="bibliotitle" --></a></p><br />
+        <p><label>Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p>
+        <p><label>Patron alert with:</label> <!-- TMPL_VAR name="letter" -->&nbsp;</p>
+        <p><label>Notes:</label> <!-- TMPL_VAR name="notes" --></p>
+    </fieldset>
 	<form name="f">
-	<h2>Planning</h2>
-	<p><label class="label100">Beginnning date:</label> <!-- TMPL_VAR name="startdate" -->
+    <fieldset>
+        <legend>Planning</legend>
+            <p><label>Beginnning date:</label> <!-- TMPL_VAR name="startdate" -->
 	</p>
-	<p><label class="label100">Frequency (*):</label>
+            <p><label>Frequency (*):</label>
 		<!--TMPL_IF name="periodicity1" -->
 				1/day
 		<!-- /TMPL_IF -->
@@ -213,7 +200,7 @@
 				1/2 years
 		<!-- /TMPL_IF -->
 	</p>
-	<p><label class="label100">Number Pattern:</label>
+            <p><label>Number Pattern:</label>
 		<!-- TMPL_IF name="numberpattern1" -->
 			Number
 		<!-- /TMPL_IF -->
@@ -246,7 +233,7 @@
 	    <td align="right"><input type="text" name="zfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
 	<!--/TMPL_IF-->
 	</tr>
-	<tr><td><p><label class="label100">Starting with:</label></p></td>
+            <tr><td><p><label>Starting with:</label></p></td>
 	    <td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
 	<!--TMPL_IF NAME="lastvalue2"-->
 	    <td align="center">&nbsp; 
@@ -259,7 +246,7 @@
 	    </td>
 	<!--/TMPL_IF-->
 	</tr>
-	<tr><td><p><label class="label100">Rollover:</label></p></td>
+            <tr><td><p><label>Rollover:</label></p></td>
 	    <td align="center">&nbsp;</td>
 	<!--TMPL_IF NAME="whenmorethan2"-->
 	    <td align="center">&nbsp; 
@@ -274,95 +261,87 @@
 	</tr>
 	</table>
 	<!-- TMPL_IF NAME="irregularity" -->
-	<p><label class="label100">Irregularity:</label>
+            <p><label>Irregularity:</label>
 		<div id="irreg"></div>
 	</p>
 	<!-- /TMPL_IF -->
-	<p><label class="label100">Begins on:</label>
+            <p><label>Begins on:</label>
 		<!--TMPL_VAR name="startdate" -->
 	</p>
 	</form>
-</div>
-<div class="bloc25">
-	<h2>Subscription length</h2>
 	<!-- TMPL_IF name="numberlength" --><p><label>Number of issues:</label> <!-- TMPL_VAR name="numberlength" --></p><!-- /TMPL_IF -->
 	<!-- TMPL_IF name="weeklength" --><p><label>Number of weeks:</label> <!-- TMPL_VAR name="weeklength" --></p><!-- /TMPL_IF -->
-	<!-- TMPL_IF name="monthlength" --><p><label class="label100">Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
-
-</div>
-<div class="bloc25">
+        <!-- TMPL_IF name="monthlength" --><p><label>Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
+    </fieldset>
 	<h2>Numbering calculation</h2>
-	<p><label class="label100">Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
-</div>
-<div class="bloc25" id="basetable">
-	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
+    <p><label>Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
+    <table>
 		<tr>
-			<th class="cell-header">&nbsp;</th>
-			<th class="cell-header">X</th>
-			<th class="cell-header">Y</th>
-			<th class="cell-header">Z</th>
+            <th>&nbsp;</th>
+            <th>X</th>
+            <th>Y</th>
+            <th>Z</th>
 			</tr>
 			<tr>
-				<td class="cell">Add</td>
-				<td class="cell">
+                <td>Add</td>
+                <td>
 					<!-- TMPL_VAR name="add1" -->
 				</td>
-				<td class="cell">
+                <td>
 					<!-- TMPL_VAR name="add2" -->
 				</td>
-				<td class="cell">
+                <td>
 					<!-- TMPL_VAR name="add3" -->
 				</td>
 			</tr>
 			<tr>
-				<td class="cell">once every</td>
-				<td class="cell"><!-- TMPL_VAR name="every1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="every2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="every3" --></td>
+                <td>once every</td>
+                <td><!-- TMPL_VAR name="every1" --></td>
+                <td><!-- TMPL_VAR name="every2" --></td>
+                <td><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
-				<td class="cell">When more than</td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
+                <td>When more than</td>
+                <td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
+                <td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
+                <td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
 			</tr>
 			<tr>
-				<td class="cell">Set back to</td>
-				<td class="cell"><!-- TMPL_VAR name="setto1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="setto2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="setto3" --></td>
+                <td>Set back to</td>
+                <td><!-- TMPL_VAR name="setto1" --></td>
+                <td><!-- TMPL_VAR name="setto2" --></td>
+                <td><!-- TMPL_VAR name="setto3" --></td>
 			</tr>
 			<tr>
-				<td class="cell">
+                <td>
 						Last value
 				</td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue3" --></td>
+                <td><!-- TMPL_VAR name="lastvalue1" --></td>
+                <td><!-- TMPL_VAR name="lastvalue2" --></td>
+                <td><!-- TMPL_VAR name="lastvalue3" --></td>
 			</tr>
 		</table>
-</div>
-</td><td>
-<div class="bloc25">
-	<h2>Issues</h2>
+</fieldset>
+<fieldset>
+    <legend>Issues</legend>
 	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
 	<tr>
-		<th class="cell-header">Issue number</th>
-		<th class="cell-header">Planned date</th>
-		<th class="cell-header">Status</th>
+        <th>Issue number</th>
+        <th>Planned date</th>
+        <th>Status</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
-			<td class="cell">
+            <td>
 				<!-- TMPL_VAR name="serialseq" -->
 			</td>
-			<td class="cell">
+            <td>
 				<!-- TMPL_VAR name="planneddate" -->
 			</td>
-			<td class="cell">
+            <td>
 					<!--TMPL_IF name="status1" -->
 						Waited
 					<!-- /TMPL_IF -->
@@ -379,7 +358,7 @@
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
-</div>
+</fieldset>
 </td></tr>
 </table>
 
@@ -389,7 +368,7 @@
 function confirm_deletion() {
 	var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
 	if (is_confirmed) {
-		window.location="alt_subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
+        window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
 	}
 }
 window.onload = num_pattern();

Index: alt_subscription-add.tmpl
===================================================================
RCS file: alt_subscription-add.tmpl
diff -N alt_subscription-add.tmpl
--- alt_subscription-add.tmpl	20 Jul 2006 04:12:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,996 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
-TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-
-<style type="text/css">
-<!--
-
-#bloc25 {
-	border: 1px solid #666666;
-	margin-bottom: 5px;
-}
--->
-</style>
-
-<script type="text/javascript" language="javascript">
-<!--
-// the english words used in display purposes
-var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
-'Autumn','Winter','Spring','Summer','Fall','Season','Year');
-var is_season = 0;
-var is_hemisphere = 1;
-
-// common pre defined number patterns
-function num_pattern() {
-var patternchoice = document.getElementById("numberpattern").value;
-	switch(patternchoice){
-	case "2":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value=1;
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value=1;
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value=4;
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value=1;
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value=1;
-		document.f.numberingmethod.value='Vol {X}, No {Y}, Issue {Z}';
-		moreoptions(text[1],text[0],text[2]);
-		display_table(0); // toggle info box on (1) or off (0)
-		break;
-	case "3":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value='';
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='Vol {X}, No {Y}';
-		moreoptions(text[1],text[0]);
-		display_table(0);
-		break;
-	case "4":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value='';
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='Vol {X}, Issue {Y}';
-		moreoptions(text[1],text[2]);
-		display_table(0);
-		break;
-	case "5":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value='';
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='No {X}, Issue {Y}';
-		moreoptions(text[0],text[2]);
-		display_table(0);
-		break;
-	case "6":
-		var d = new Date();
-		var sYear = d.getFullYear();
-	 	document.f.add1.value=1;
-	 	document.f.add2.value='1';
-	 	document.f.add3.value='';
-		document.f.every1.value=4;
-		document.f.every2.value='1';
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value='4';
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value='1';
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=sYear;
-		document.f.lastvalue2.value='1';
-		document.f.lastvalue3.value='';
-		document.f.periodicity.value='8';
-		document.f.numberingmethod.value='{Y} {X}';
-		moreoptions_seasons(text[15],sYear);
-		display_table(0);
-		is_season = 1;
-		break;
-	case "7":
-		display_table(1);
-		document.f.irreg_check.value=1; 
-		break;
-	default:
-	 	document.f.add1.value=1;
-	 	document.f.add2.value='';
-	 	document.f.add3.value='';
-		document.f.every1.value=1;
-		document.f.every2.value='';
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value='';
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value='';
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value='';
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='{X}';
-		moreoptions_daily_check(text[0]);
-		document.f.irreg_check.value=1;
-		display_table(0);
-		break;
-	}
-}
-
-function display_table(n) {
-	if(n==1){
-		document.getElementById("basetable").style.display = 'block';
-	} else {
-		document.getElementById("basetable").style.display = 'none';
-	}
-}
-
-function modify_num_pattern() {
-	document.getElementById("numberpattern").value = '<!-- TMPL_VAR NAME="numberpattern" -->';
-	num_pattern();
-	
-	document.f.add1.value='<!-- TMPL_VAR NAME="add1" -->';
-	document.f.add2.value='<!-- TMPL_VAR NAME="add2" -->';
-	document.f.add3.value='<!-- TMPL_VAR NAME="add3" -->';
-	document.f.every1.value='<!-- TMPL_VAR NAME="every1" -->';
-	document.f.every2.value='<!-- TMPL_VAR NAME="every2" -->';
-	document.f.every3.value='<!-- TMPL_VAR NAME="every3" -->';
-	document.f.whenmorethan1.value='<!-- TMPL_VAR NAME="whenmorethan1" -->';
-	document.f.whenmorethan2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
-	document.f.whenmorethan3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
-	document.f.setto1.value='<!-- TMPL_VAR NAME="setto1" -->';
-	document.f.setto2.value='<!-- TMPL_VAR NAME="setto2" -->';
-	document.f.setto3.value='<!-- TMPL_VAR NAME="setto3" -->';
-	document.f.lastvalue1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
-	document.f.lastvalue2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
-	document.f.lastvalue3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
-	document.f.numberingmethod.value='<!-- TMPL_VAR NAME="numberingmethod" -->';
-
-	var more_strY;
-	var more_strZ;
-	<!-- TMPL_IF NAME="add2" -->
-	if(<!-- TMPL_VAR NAME="add2" --> > 0){
-		more_strY="Y";
-	}
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="add3" -->
-	if(<!-- TMPL_VAR NAME="add3" --> > 0){
-		more_strZ="Z";
-	}
-	<!-- /TMPL_IF -->
-
-	document.f.lastvaluetemp1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
-	if(more_strY){
-		document.f.lastvaluetemp2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
-	document.f.whenmorethantemp2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
-	}
-	if(more_strZ){
-		document.f.lastvaluetemp3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
-	document.f.whenmorethantemp3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
-	}
-}
-
-// a pre check with more options to see if 'number' and '1/day' are chosen
-function moreoptions_daily_check(x) {
-	var periodicity = document.f.periodicity.value;
-	var errortext='';
-	if(periodicity == 1){
-		document.getElementById("irregularity").innerHTML = '';
-		document.getElementById("more_options").innerHTML = '';
-		var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
-		errortext ="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
-		for(var j=0;j<daynames.length;j++){
-			errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
-		}
-	var error = errortext;
-	document.getElementById("irregularity").innerHTML = error;
-	} else {
-		document.getElementById("irregularity").innerHTML = '';
-		document.getElementById("more_options").innerHTML = '';
-		moreoptions(x);
-	}
-}
-
-// to dispaly the more options section
-function moreoptions(x,y,z){
-document.getElementById("irregularity").innerHTML = '';
-document.getElementById("more_options").innerHTML = '';
-var textbox = '';
-	// alert("X: "+x+"Y: "+y+"Z: "+z);
-	if(x){
-		textbox +="<table>\n<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
-		if(y){
-			textbox +="<td>"+y+"<\/td>";
-			if(z){
-				textbox +="<td>"+z+"<\/td>";
-			}
-		}
-		textbox +="<\/tr>\n";
-		textbox +="<tr><td>"+text[5]+"<\/td><td><input type='text' name='lastvaluetemp1' size='4' onkeyup='moreoptionsupdate(\"lastvalue1\")'><\/td>\n";
-		if(y){
-			textbox +="<td><input type='text' name='lastvaluetemp2' size='4' onkeyup='moreoptionsupdate(\"lastvalue2\")'><\/td>\n";
-			if(z){
-				textbox +="<td><input type='text' name='lastvaluetemp3' size='4' onkeyup='moreoptionsupdate(\"lastvalue3\")'><\/td>\n";
-			}
-		}
-		textbox +="<\/tr>\n";
-		if(y){
-			textbox +="<tr><td>"+text[6]+"<\/td>";
-			textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
-			textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
-			if(z){
-				textbox +="<td><input type='text' name='whenmorethantemp3' size='4' onkeyup='moreoptionsupdate(\"whenmorethan3\",1)'><\/td>\n";
-			}
-			textbox +="<\/tr>";
-		}
-		textbox +="<\/table>\n";
-	}
-	document.getElementById("more_options").innerHTML = textbox;
-}
-
-function hemispheres(chosen){
-var selbox = document.getElementById("season1");
-    if(selbox){
-	var selboxselected = selbox.options[selbox.selectedIndex].value;
-	selbox.options.length = 0;
-
-	if (chosen == "1") {
-		selbox.options[selbox.options.length] = new Option(text[11],'1');
-		selbox.options[selbox.options.length] = new Option(text[12],'2');
-		selbox.options[selbox.options.length] = new Option(text[13],'3');
-		selbox.options[selbox.options.length] = new Option(text[14],'4');
-		is_hemisphere = 1;
-		selbox.options[selboxselected-1].selected = true;
-	}
-
-	if (chosen == "2") {
-		selbox.options[selbox.options.length] = new Option(text[13],'1');
-		selbox.options[selbox.options.length] = new Option(text[10],'2');
-		selbox.options[selbox.options.length] = new Option(text[11],'3');
-		selbox.options[selbox.options.length] = new Option(text[12],'4');
-		is_hemisphere = 2;
-		selbox.options[selboxselected-1].selected = true;
-	}
-    }
-}
-
-// to dispaly the more options section for seasons
-function moreoptions_seasons(x,y){
-document.getElementById("irregularity").innerHTML = '';
-document.getElementById("more_options").innerHTML = '';
-var textbox = '';
-	// alert("X: "+x+"Year: "+y);
-	if(x){
-		var hemi_select = parseInt('<!-- TMPL_VAR NAME="hemisphere" -->');
-		textbox +="<table>\n<tr><td>"+ text[7]  +"<\/td><td colspan='2'><select name='hemisphere' onchange='hemispheres(this.options[this.selectedIndex].value)'>";
-		for(var i = 1; i <= 2; i++){
-			textbox +="<option value='"+i+"'";
-			if(i == hemi_select){
-				textbox += " selected "
-			}
-			textbox +=">"+text[i+7]+"<\/option>";
-		}
-		textbox +="<\/select><\/td><\/tr>\n";
-		textbox +="<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
-		textbox +="<td>"+text[16]+"<\/td>";
-		textbox +="<\/tr>\n";
-		textbox +="<tr><td>"+text[5]+"<\/td><td><select name='lastvaluetemp2' id='season1' onchange='moreoptionsupdate(\"lastvalue2\")'>";
-		for(var j = 1; j <= 4; j++){
-			textbox +="<option value='"+j+"'>"+text[j+10]+"<\/option>";
-		}
-		textbox +="<\/select><\/td><td><select name='lastvaluetemp1' onchange='moreoptionsupdate(\"lastvalue1\")'>";
-		for(var k = parseInt(y); k <= parseInt(y)+15; k++){
-			textbox +="<option value='"+k+"'>"+k+"<\/option>";
-		}
-		textbox +="<\/select><\/td><\/tr>\n";
-		textbox +="<tr><td>"+text[6]+"<\/td>";
-		textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
-		textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
-    	        textbox +="<\/tr><\/table>\n";
-	}
-	document.getElementById("more_options").innerHTML = textbox;
-}
-
-function irregularity_check(){
-	document.f.irreg_check.value = 1; // Irregularity button now pushed
-	var periodicity = document.f.periodicity.value;
-	var rollover = document.f.whenmorethantemp2.value;
-	if(document.f.whenmorethantemp3){
-		rollover = document.f.whenmorethantemp3.value;
-	}
-	var error='';
-	var toobig;
-	var expected; 
-	var errortext = "<b>Warning irregularity detected<\/b><br \/>";
-	switch(periodicity){
-	case "1":
-		if(rollover < 365) expected =365;
-		if(rollover > 365) {
-			expectedover=365;
-			toobig=1;
-		}
-		break;
-	case "2":
-		if(rollover < 52) expected =52;
-		if(rollover > 52){
-			expectedover=52;
-			toobig=1;
-		}
-		break;
-	case "3":
-		if(rollover < 26) expected =26;
-		if(rollover > 26){
-			expectedover=26;
-			toobig=1;
-		}
-		break;
-	case "4":
-		if(rollover < 17) expected =17;
-		if(rollover > 17){
-			expectedover=17;
-			toobig=1;
-		}
-		break;
-	case "5":
-		if(rollover < 12) expected =12;
-		if(rollover > 12){
-			expectedover=12;
-			toobig=1;
-		}
-		break;
-	case "6":
-		if(rollover < 6) expected =6;
-		if(rollover > 6){
-			expectedover=6;
-			toobig=1;
-		}
-		break;
-	case "7":
-		if(rollover < 4) expected =4;
-		if(rollover > 4){
-			expectedover=4;
-			toobig=1;
-		}
-		break;
-	case "8":
-		if(rollover < 4) expected =4;
-		if(rollover > 4){
-			expectedover=4;
-			toobig=1;
-		}
-		break;
-	case "9":
-		if(rollover < 2) expected =2;
-		if(rollover > 2){
-			expectedover=2;
-			toobig=1;
-		}
-		break;
-	case "10":
-		if(rollover < 1) expected =1;
-		if(rollover > 1){
-			expectedover=1;
-			toobig=1;
-		}
-		break;
-	default:
-		break;
-	}
-	if(expected){
-		if(expected == 365){
-			var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
-			errortext +="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
-			for(var j=0;j<daynames.length;j++){
-				errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
-			}
-			error=errortext;
-		} else {
-			errortext +=expected+" issues expected "+rollover+" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>";
-			var count=0;
-			for(var i=rollover;i<expected;i++){
-				errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
-				errortext +=irregular_options(periodicity);
-				errortext +="<\/select>\n";
-				count++;
-			}
-			error=errortext;
-		}
-	}
-	if(toobig){
-		errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
-		error=errortext;
-	}
-	if(error.length ==0){
-		error='No irregularities noticed';
-	}
-	display_example(expected);
-	document.getElementById("irregularity").innerHTML = error;
-}
-
-function irregular_options(periodicity){
-	var titles;
-	var count;
-<!-- TMPL_IF NAME="weekarrayjs" -->
-	var weeks = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-<!-- /TMPL_IF -->
-	var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-	var seasons = new Array('Autumn','Winter','Spring','Summer','Fall');
-	var errortext='';
-	if(periodicity == 1) {
-		expected = 366;
-		titles = "Day";
-		count = 1;
-	}
-	if(periodicity == 2 || periodicity == 3 || periodicity == 4) { 
-		expected = 52;
-	<!-- TMPL_IF NAME="weekarrayjs" -->
-		titles = weeks;
-		count = <!-- TMPL_VAR NAME="weekno" -->;
-	<!-- TMPL_ELSE -->
-		titles = "Week";
-		count = 1;
-	<!-- /TMPL_IF -->
-	}
-	if(periodicity == 5 || periodicity == 6 || periodicity == 7 || periodicity == 8 || periodicity == 9) {
-		if(periodicity == 8) {
-			is_season = 1; // setting up from edit page
-		} 
-		if(is_season){
-			titles = seasons;
-			expected = 4;
-			if(is_hemisphere == 2){
-				count = 2;
-			} else {
-				count = 1;
-			}
-		} else {
-			titles = months;
-			expected = 12;
-			count = 1;
-		}
-	}
-	for(var j=1;j<=expected;j++){
-		if(isArray(titles)){
-			if(count>expected){
-				count = count-expected;
-			}
-			if(is_season && is_hemisphere == 1){
-				errortext +="<option value='"+((count*3)-2)+"'>"+titles[j]+"<\/option>\n";
-// alert("value: "+((count*3)-2)+" title: "+titles[j]);
-			} else if(is_season && is_hemisphere == 2){
-				errortext +="<option value='"+((count*3)-2)+"'>"+titles[j-1]+"<\/option>\n";
-// alert("value: "+((count*3)-2)+" title: "+titles[j-1]);
-			} else {
-				errortext +="<option value='"+count+"'>"+titles[j-1]+"<\/option>\n";
-			}
-			count++;
-		} else {
-			errortext +="<option value='"+j+"'>"+titles+" "+j+"<\/option>\n";
-		}
-	}
-	return errortext;
-}
-
-function irregular_order(){
-	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
-	var periodicity = document.f.periodicity.value;
-	var irregarray = irregular.split('|');
-	if(periodicity ==1){
-		for(j=0;j<irregarray.length;j++){
-		document.getElementById("irregular"+irregarray[j]).checked = true; 
-		}
-	} else {
-		for(i=0;i<irregarray.length;i++){    
-			document.getElementById("irregular"+i).value = irregarray[i];
-		}
-	}
-}
-
-function display_example(expected){
-	var startfrom1 = parseInt(document.f.lastvalue1.value);
-	var startfrom2 = parseInt(document.f.lastvalue2.value);
-	var startfrom3 = parseInt(document.f.lastvalue3.value);
-	var every1 = parseInt(document.f.every1.value);
-	var every2 = parseInt(document.f.every2.value);
-	var every3 = parseInt(document.f.every3.value);
-	var numberpattern = document.f.numberingmethod.value;
-	var whenmorethan2 = parseInt(document.f.whenmorethan2.value);
-	var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
-	var setto2 = parseInt(document.f.setto2.value);
-	var setto3 = parseInt(document.f.setto3.value);
-	var displaytext = 'Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n';
-	if(startfrom3>0){
-		var count=startfrom3-1;
-		var count2=startfrom2;
-		for(var i=0;i<12;i++){
-			if(count>=whenmorethan3){
-				count=setto3;
-				if(count2>=whenmorethan2){
-					startfrom1++;
-					count2=setto2;
-				} else {
-					count2++;
-				}
-			} else {
-				count++;
-			}
-			displaytext += numberpattern.replace(/{Z}/,count)+'\n';
-			displaytext = displaytext.replace(/{Y}/,count2)+'<br \/>\n';
-			displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
-
-		}
-	}
-	if(startfrom2>0 && !startfrom3){
-		var count=startfrom2-1;
-		for(var i=0;i<12;i++){
-			if(count>=whenmorethan2){
-				startfrom1++;
-				count=setto2;
-			} else {
-				count++;
-			}
-
-			if(is_season){
-				if(is_hemisphere == 2){
-					if(count == 1) {
-						displaytext += numberpattern.replace(/{Y}/,text[count+12])+'\n';
-					} else {
-						displaytext += numberpattern.replace(/{Y}/,text[count+8])+'\n';
-					}
-				} else {
-				displaytext += numberpattern.replace(/{Y}/,text[count+10])+'\n';
-				}
-			} else {
-				displaytext += numberpattern.replace(/{Y}/,count)+'\n';
-			}
-			displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
-		}
-	}
-	if(startfrom1>0 && !startfrom2 && !startfrom3){
-		for(var i=startfrom1;i<(startfrom1+12);i=i+(1*every1)){
-			startfrom1 = i;
-			displaytext += numberpattern.replace(/{X}/,startfrom1)+'<br \/>\n';
-		}
-	}
-	displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
-	document.getElementById("displayexample").innerHTML = displaytext;
-}
-
-function isArray(obj) {
-   if (obj.constructor.toString().indexOf("Array") == -1)
-      return false;
-   else
-      return true;
-}
-
-function moreoptionsupdate(fieldnames,rollover){
-	fieldname = fieldnames;
-	fld = fieldname.length;
-	fld = fld-1;
-	fieldnametempnumber = fieldname.substr(fld);
-	//alert(fieldnametempnumber);
-	fieldnametemp = fieldname.slice(0,-1)+"temp"+fieldnametempnumber;
-	// alert(fieldnametemp);
-	eval("document.f."+fieldname+".value = document.f."+fieldnametemp+".value");
-	if(rollover){
-		eval("document.f.every"+(fieldnametempnumber-1)+".value = document.f."+fieldnametemp+".value");
-	}
-}
-
-
-function check_input(e){
-	var unicode=e.charCode? e.charCode : e.keyCode
-	if (unicode!=8 && unicode !=46){ // if key isn't backspace or delete
-		if (unicode<48||unicode>57) { // if not a number
-			alert("Needs to be entered in digit form -eg 10");
-			return false // disable key press
-		}
-	}
-}
-
--->
-</script>
-
-<div id="mainbloc">
-<!-- TMPL_IF name="mod" -->
-	<h1>Modify subscription</h1>
-	<form method="post" name="f" action="alt_subscription-detail.pl">
-		<input type="hidden" name="op" value="modsubscription">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-<!-- TMPL_ELSE -->
-	<h1>Add a subscription (Serial Holdings Record)</h1>
-	<form method="post" name="f">
-		<input type="hidden" name="op" value="addsubscription">
-<!-- /TMPL_IF -->
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
-		<input type="hidden" name="irreg_check" value="0">
-
-
-<div id="bloc25">
-	<h2>Subscription information</h2>
-	<table border="0" cellspacing="5" cellpadding="0">
-	<tr><td>Librarian:</td>
-	    <td><!-- TMPL_VAR name="loggedinusername" --></td></tr>
-	<tr><td><label>Supplier:</label></td>
-	    <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
-	<tr><td><label>Biblio</label></td>
-	    <td><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <a href="#" onClick="Plugin(f)">Search for Biblio</a> | <a href="/cgi-bin/koha/acqui/acqui-home.pl">Create Biblio</a></td>
-	<tr><td><label>Call Number</label></td>
-	    <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td></tr>
-	<tr><td><label>Notes</label></td>
-	    <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td>
-	<tr><td><b>Warning:</b></td>
-	    <td>
-		<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></td></tr>
-	</table>
-</div>
-<div id="bloc25">
-	<h2>Planning</h2>
-	<table border="0" cellspacing="5" cellpadding="0">
-	<tr><td><label class="label100">First Issue ETA:</label></td>
-	    <td> <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
-
-<input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;">
-<!-- both scripts for calendar must follow the input field --> 
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField:"acqui_date",
-                                                ifFormat       :   "%d/%m/%Y",
-                                                button         :   "button2",
-                                                align          :   "Tl"
-                                            });
-                                        </script>
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField     :   "acqui_date",
-                                                ifFormat       :   "%d/%m/%Y",
-                                                button         :   "acqui_date",
-                                                align          :   "Tl"
-                                            });
-                                        </script></td>
-	    <td rowspan="5"><div id="displayexample"></div></td></tr>
-	<tr><td><label class="label100">Frequency: (*)</label></td>
-	    <td>	<select name="periodicity" size="1">
-				<option value="" selected>-- please choose --</option>
-				<option value="">Unknown</option>
-
-				<!-- TMPL_IF name="periodicity1" -->
-					<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>1/week</option>
-				<!-- TMPL_ELSE -->
-					<option value="2">1/week</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity3" -->
-					<option value="3" selected>1/2 weeks (2/month)</option>
-				<!-- TMPL_ELSE -->
-					<option value="3">1/2 weeks (2/months)</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity4" -->
-					<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>1/month</option>
-				<!-- TMPL_ELSE -->
-					<option value="5">1/month</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity6" -->
-					<option value="6" selected>1/2 months (6/year)</option>
-				<!-- TMPL_ELSE -->
-					<option value="6">1/2 months (6/year)</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity7" -->
-					<option value="7" selected>1/3 months (1/quarter)</option>
-				<!-- TMPL_ELSE -->
-					<option value="7">1/3 months (1/quarter)</option>
-				<!-- /TMPL_IF -->
-				<!-- periodicity8 is 1/quarter, exactly like periodicity7 but will use it for seasonal option -->
-				<!-- TMPL_IF name="periodicity8" -->
-					<option value="8" selected>1/quarter (seasonal)</option>
-				<!-- TMPL_ELSE -->
-					<option value="8">1/quarter (seasonal)</option>
-				<!-- /TMPL_IF -->
-
-				<!-- TMPL_IF name="periodicity9" -->
-					<option value="9" selected>2/years</option>
-				<!-- TMPL_ELSE -->
-					<option value="9">2/year</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity10" -->
-					<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>1/2 years</option>
-				<!-- TMPL_ELSE -->
-					<option value="11">1/2 years</option>
-				<!-- /TMPL_IF -->
-			</select>
-	</td></tr>
-	<tr><td><label class="label100">Numbering Pattern:</label></td>
-	    <td><select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
-		<option value="" selected>-- please choose --</option>
-		<!-- TMPL_IF name="numberpattern1" -->
-			<option value="1" selected>Number</option>
-		<!-- TMPL_ELSE -->
-			<option value="1">Number</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern2" -->
-			<option value="2" selected>Volume, Number, Issue</option>
-		<!-- TMPL_ELSE -->
-			<option value="2">Volume, Number, Issue</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern3" -->
-			<option value="3" selected>Volume, Number</option>
-		<!-- TMPL_ELSE -->
-			<option value="3">Volume, Number</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern4" -->
-			<option value="4" selected>Volume, Issue</option>
-		<!-- TMPL_ELSE -->
-			<option value="4">Volume, Issue</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern5" -->
-			<option value="5" selected>Number, Issue</option>
-		<!-- TMPL_ELSE -->
-			<option value="5">Number, Issue</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern6" -->
-			<option value="6" selected>Seasonal only</option>
-		<!-- TMPL_ELSE -->
-	 		<option value="6">Seasonal only</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern7" -->
-			<option value="7" selected>None of the above</option>
-		<!-- TMPL_ELSE -->
-	 		<option value="7">None of the above</option>
-		<!-- /TMPL_IF -->
-
-		</select>
-<div id="more_options"></div>
-<div id="irregularity"></div></td></tr>
-	<tr><td><label class="label100">Begins On: (*)</label></td>
-	    <td><img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
-<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
-<!-- both scripts for calendar must follow the input field --> 
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField   : "beginning_date",
-                                                ifFormat     : "%d/%m/%Y",
-                                                button       : "button1",
-                                                align        : "Tl"
-                                            });
-                                        </script>
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField   : "beginning_date",
-                                                ifFormat     : "%d/%m/%Y",
-                                                button       : "beginning_date",
-                                                align        : "Tl"
-                                            });
-                                        </script></td></tr>
-</table> 
-</div>
-
-<!--	<tr><td><label class="label100">Arrives on</label></td>
-	    <td>	<select name="dow" size="1">
-				<option value="">None</option>
-				<!-- TMPL_IF name="dow1" -->
-					<option value="1" selected>Monday</option>
-				<!-- TMPL_ELSE -->
-					<option value="1">Monday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow2" -->
-					<option value="2" selected>Tuesday</option>
-				<!-- TMPL_ELSE -->
-					<option value="2">Tuesday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow3" -->
-					<option value="3" selected>Wednesday</option>
-				<!-- TMPL_ELSE -->
-					<option value="3">Wednesday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow4" -->
-					<option value="4" selected>Thursday</option>
-				<!-- TMPL_ELSE -->
-					<option value="4">Thursday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow5" -->
-					<option value="5" selected>Friday</option>
-				<!-- TMPL_ELSE -->
-					<option value="5">Friday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow6" -->
-					<option value="6" selected>Saturday</option>
-				<!-- TMPL_ELSE -->
-					<option value="6">Saturday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow7" -->
-					<option value="7" selected>Sunday</option>
-				<!-- TMPL_ELSE -->
-					<option value="7">Sunday</option>
-				<!-- /TMPL_IF -->
-			</select></td></tr> -->
-
-<div id="bloc25">
-	<h2>Subscription length</h2>
-		<p><select name="subtype">
-<!-- TMPL_LOOP NAME="subtype" -->
-<option value="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="selected" --> selected="SELECTED" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
-<!-- /TMPL_LOOP -->
-</select> <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)</p>
-
-</div>
-<div id="bloc25">
-	<h2>Numbering calculation</h2>
-	<p>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
-	<div id="basetable" style="display: none;">
-		<table class="small">
-			<tr>
-				<th>&nbsp;</th>
-				<th>X</th>
-				<th>Y</th>
-				<th>Z</th>
-			</tr>
-			<tr>
-				<td>Add</td>
-				<td>
-					<input type="text" 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>
-				<td>once every</td>
-				<td><input type="text" 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>
-				<td>When more than</td>
-				<td><input type="text" 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>
-				<td>The loop is for instance</td>
-				<td><input type="text" 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>
-				<td>Set back to</td>
-				<td><input type="text" 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>
-				<td>
-					<!-- TMPL_IF name="mod" -->
-						Last value
-					<!-- TMPL_ELSE -->
-						Begins with
-					<!-- /TMPL_IF -->
-				</td>
-				<td><input type="text" 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>
-</div>
-<!-- TMPL_IF name="mod" -->
-	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="button">
-<!-- TMPL_ELSE -->
-	<input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="button">
-<!-- /TMPL_IF -->
-</form>
-</div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-<script language="JavaScript" type="text/javascript">
-
-function Plugin(f)
-{
-	 window.open('subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-
-function FindAcqui(f)
-{
-	 window.open('acqui-search.pl','FindASupplier','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-
-function Find_ISSN(f)
-{
-	 window.open('issn-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-
-
-function Check(f) {
-	if (f.startdate.value.length != 0 && f.sublength.value > 0) {
-		if (f.irreg_check.value == 1) {
-			document.f.submit();
-		} else {
-			if(f.numbering_pattern.value == ''){
-				alert("need to choose a numbering pattern");
-			} else {
-				alert("need to check for irregularity by clicking 'Irregularity?'");
-			}
-		}
-	} else {
-	 	alert('field marked with * are mandatory');
-	}
-	return false;
-}
-</script>
-<!-- TMPL_IF name="mod" -->
-<script type="text/javascript">
-window.onload = modify_num_pattern();
-	<!-- TMPL_IF name="hemisphere" -->
-	window.onload = hemispheres(<!-- TMPL_VAR NAME="hemisphere" -->);
-	<!-- /TMPL_IF -->
-</script>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="irregularity" -->
-<script type="text/javascript">
-window.onload = irregularity_check();
-window.onload = irregular_order();
-</script>
-<!-- /TMPL_IF -->

Index: alt_subscription-detail.tmpl
===================================================================
RCS file: alt_subscription-detail.tmpl
diff -N alt_subscription-detail.tmpl
--- alt_subscription-detail.tmpl	19 Sep 2006 22:30:37 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,397 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
-TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-
-<script type="text/javascript" language="javascript">
-<!--
-// the english words used in display purposes
-var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
-'Autumn','Winter','Spring','Summer','Fall','Season','Year');
-
-// common pre defined number patterns
-function num_pattern() {
-var patternchoice = '<!--TMPL_VAR NAME='numberpattern'-->';
-	switch(patternchoice){
-	case "2":
-		options(text[1],text[0],text[2]);
-		irregularity();
-		display_table(0);
-		break;
-	case "3":
-		options(text[1],text[0]);
-		irregularity();
-		display_table(0);
-		break;
-	case "4":
-		options(text[1],text[2]);
-		irregularity();
-		display_table(0);
-		break;
-	case "5":
-		options(text[0],text[2]);
-		irregularity();
-		display_table(0);
-		break;
-	case "6":
-		var d = new Date();
-		var sYear = d.getFullYear();
-		// options_seasons(text[15],sYear);
-		irregularity();
-		is_season = 1;
-		display_table(0);
-		break;
-	case "7":
-		display_table(1);
-		irregularity();
-		break;
-	default:
-		options(text[0]);
-		irregularity();
-		display_table(0);
-		break;
-	}
-}
-
-function display_table(n) {
-	if(n==1){
-		document.getElementById("basetable").style.display = 'block';
-	} else {
-		document.getElementById("basetable").style.display = 'none';
-	}
-}
-
-// to dispaly the options section
-function options(x,y,z){
-var textbox = '';
-	// alert("X: "+x+"Y: "+y+"Z: "+z);
-	if(x){
-		document.f.xfield.value = x;
-		if(y){
-			document.f.yfield.value = y;
-			if(z){
-				document.f.zfield.value = z;
-			}
-		}
-	}
-}
-
-function irregularity(){
-	var periodicity = '<!-- TMPL_VAR NAME="periodicity"-->';
-	switch(periodicity){
-	case "1":
-		var names = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
-		break;
-	case "2":
-		<!-- TMPL_IF NAME="weekarrayjs" -->
-		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-		<!-- /TMPL_IF -->
-		break;
-	case "3":
-		<!-- TMPL_IF NAME="weekarrayjs" -->
-		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-		<!-- /TMPL_IF -->
-		break;
-	case "4":
-		<!-- TMPL_IF NAME="weekarrayjs" -->
-		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-		<!-- /TMPL_IF -->
-		break;
-	case "5":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "6":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "7":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "8":
-		var names = new Array('Autumn','Winter','Spring','Summer','Fall');
-		break;
-	case "9":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "10":
-		expected =1;
-		break;
-	default:
-		break;
-	}
-
-	<!-- TMPL_IF NAME="irregularity" -->
-	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
-	var irregarray = irregular.split('|');
-	var irregtext = '<p>';
-	for(var i=0;i<irregarray.length;i++){
-		irregtext += names[i]+' &nbsp;';
-	}
-	irregtext += '</p>';
-	document.getElementById("irreg").innerHTML = irregtext;
-	<!-- /TMPL_IF -->
-}
-
--->
-</script>
-<div id="mainbloc">
-<h1>Subscription</h1>
-<a href="alt_subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">Edit</a>
-<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">Receive</a>
-<!--<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">Biblio</a>-->
-<a href="/cgi-bin/koha/catalogue/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">Biblio</a>
-<!-- TMPL_IF NAME="routing" -->
-<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button">Edit Routing List</a>
-<!-- TMPL_ELSE -->
-<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new" class="button">Create Routing List</a>
-<!-- /TMPL_IF -->
-<a href="subscription-copy.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">Copy</a>
-
-
-<!-- TMPL_UNLESS name="totalissues" -->
-		<a href="javascript:confirm_deletion()" class="button">
-			delete
-		</a>
-<!-- /TMPL_UNLESS -->
-
-<table>
-<tr valign="top"><td>
-
-<div class="bloc25">
-	<h2>Subscription information</h2>
-	<p><label class="label100">Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p><br />
-
-	<p><label class="label100">Supplier:</label> <!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</p>
-
-	<p><label class="label100">Cost:</label> <!-- TMPL_VAR name="cost" -->&nbsp;</p>
-
-	<p><label class="label100">Budget:</label> <!-- TMPL_VAR name="bookfundid" -->&nbsp;</p>
-
-	<p><label class="label100">Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p><br />
-	<p><label class="label100">Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p>
-
-	<p><label class="label100">Notes:</label> <!-- TMPL_VAR name="notes" --></p>
-</div>
-
-<div class="bloc25">
-	<form name="f">
-	<h2>Planning</h2>
-	<p><label class="label100">Beginnning date:</label> <!-- TMPL_VAR name="startdate" -->
-	</p>
-	<p><label class="label100">Frequency (*):</label>
-		<!--TMPL_IF name="periodicity1" -->
-				1/day
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity2" -->
-				1/week
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity3" -->
-				1/2 weeks
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity4" -->
-				1/3 weeks
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity5" -->
-				1/Month
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity6" -->
-				1/2 Months (6/year)
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity7" -->
-				1/quarter
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity8" -->
-				1/quarter
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity9" -->
-				2/year
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity10" -->
-				1/year
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity11" -->
-				1/2 years
-		<!-- /TMPL_IF -->
-	</p>
-	<p><label class="label100">Number Pattern:</label>
-		<!-- TMPL_IF name="numberpattern1" -->
-			Number
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern2" -->
-			Volume, Number, Issue
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern3" -->
-			Volume, Number
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern4" -->
-			Volume, Issue
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern5" -->
-			Number, Issue
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern6" -->
-			Seasonal only
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern7" -->
-			None of the above
-		<!-- /TMPL_IF -->
-	</p>
-	<table cellpadding="0" cellspacing="0">
-	<tr><td>&nbsp;</td>
-	    <td align="right"><input type="text" name="xfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
-	<!--TMPL_IF NAME="lastvalue2"-->
-	    <td align="right"><input type="text" name="yfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
-	<!--/TMPL_IF-->
-	<!--TMPL_IF NAME="lastvalue3"-->
-	    <td align="right"><input type="text" name="zfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
-	<!--/TMPL_IF-->
-	</tr>
-	<tr><td><p><label class="label100">Starting with:</label></p></td>
-	    <td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
-	<!--TMPL_IF NAME="lastvalue2"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="lastvalue2"-->
-	    </td>
-	<!--/TMPL_IF-->
-	<!--TMPL_IF NAME="lastvalue3"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="lastvalue3"-->
-	    </td>
-	<!--/TMPL_IF-->
-	</tr>
-	<tr><td><p><label class="label100">Rollover:</label></p></td>
-	    <td align="center">&nbsp;</td>
-	<!--TMPL_IF NAME="whenmorethan2"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="whenmorethan2"-->
-	    </td>
-	<!--/TMPL_IF-->
-	<!--TMPL_IF NAME="whenmorethan3"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="whenmorethan3"-->
-	    </td>
-	<!--/TMPL_IF-->
-	</tr>
-	</table>
-	<!-- TMPL_IF NAME="irregularity" -->
-	<p><label class="label100">Irregularity:</label>
-		<div id="irreg"></div>
-	</p>
-	<!-- /TMPL_IF -->
-	<p><label class="label100">Begins on:</label>
-		<!--TMPL_VAR name="startdate" -->
-	</p>
-	</form>
-</div>
-<div class="bloc25">
-	<h2>Subscription length</h2>
-	<!-- TMPL_IF name="numberlength" --><p><label>Number of issues:</label> <!-- TMPL_VAR name="numberlength" --></p><!-- /TMPL_IF -->
-	<!-- TMPL_IF name="weeklength" --><p><label>Number of weeks:</label> <!-- TMPL_VAR name="weeklength" --></p><!-- /TMPL_IF -->
-	<!-- TMPL_IF name="monthlength" --><p><label class="label100">Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
-
-</div>
-<div class="bloc25">
-	<h2>Numbering calculation</h2>
-	<p><label class="label100">Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
-</div>
-<div class="bloc25" id="basetable">
-	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
-		<tr>
-			<th class="cell-header">&nbsp;</th>
-			<th class="cell-header">X</th>
-			<th class="cell-header">Y</th>
-			<th class="cell-header">Z</th>
-			</tr>
-			<tr>
-				<td class="cell">Add</td>
-				<td class="cell">
-					<!-- TMPL_VAR name="add1" -->
-				</td>
-				<td class="cell">
-					<!-- TMPL_VAR name="add2" -->
-				</td>
-				<td class="cell">
-					<!-- TMPL_VAR name="add3" -->
-				</td>
-			</tr>
-			<tr>
-				<td class="cell">once every</td>
-				<td class="cell"><!-- TMPL_VAR name="every1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="every2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="every3" --></td>
-			</tr>
-			<tr>
-				<td class="cell">When more than</td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
-			</tr>
-			<tr>
-				<td class="cell">Set back to</td>
-				<td class="cell"><!-- TMPL_VAR name="setto1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="setto2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="setto3" --></td>
-			</tr>
-			<tr>
-				<td class="cell">
-						Last value
-				</td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue3" --></td>
-			</tr>
-		</table>
-</div>
-</td><td>
-<div class="bloc25">
-	<h2>Issues</h2>
-	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
-	<tr>
-		<th class="cell-header">Issue number</th>
-		<th class="cell-header">Planned date</th>
-		<th class="cell-header">Status</th>
-	</tr>
-	<!-- TMPL_LOOP name="serialslist" -->
-		<tr>
-			<td class="cell">
-				<!-- TMPL_VAR name="serialseq" -->
-			</td>
-			<td class="cell">
-				<!-- TMPL_VAR name="planneddate" -->
-			</td>
-			<td class="cell">
-					<!--TMPL_IF name="status1" -->
-						Waited
-					<!-- /TMPL_IF -->
-					<!--TMPL_IF name="status2" -->
-						Arrived
-					<!-- /TMPL_IF -->
-					<!--TMPL_IF name="status3" -->
-						Late
-					<!-- /TMPL_IF -->
-					<!--TMPL_IF name="status4" -->
-						Missing
-					<!-- /TMPL_IF -->
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-</div>
-</td></tr>
-</table>
-
-</div>
-<script type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-function confirm_deletion() {
-	var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
-	if (is_confirmed) {
-		window.location="alt_subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
-	}
-}
-window.onload = num_pattern();
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





More information about the Koha-cvs mailing list