koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/bull la... [rel_2_2]


From: Antoine Farnault
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/bull la... [rel_2_2]
Date: Mon, 07 May 2007 09:31:12 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Antoine Farnault <toins>        07/05/07 09:31:12

Modified files:
        koha-tmpl/intranet-tmpl/default/en/bull: lateissues.tmpl 
                                                 routing.tmpl 
                                                 statecollection.tmpl 
                                                 subscription-add.tmpl 
                                                 subscription-detail.tmpl 

Log message:
        default & npl synch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/routing.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.11&r2=1.4.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.8.2.2&r2=1.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.8&r2=1.6.2.9

Patches:
Index: lateissues.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/Attic/lateissues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- lateissues.tmpl     4 Apr 2006 14:03:11 -0000       1.1.2.3
+++ lateissues.tmpl     7 May 2007 09:31:12 -0000       1.1.2.4
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="bull-top.inc" -->
 <!--------------------------MAIN BODY OF PAGE-------------------------->
 <div id="mainbloc">
+<!-- TMPL_IF NAME="lateissues" -->
        <h1 class="bull">Late issues</h1>
        <p>
                <form action="lateissues.pl" method="post">
@@ -9,10 +10,12 @@
                                <!-- TMPL_IF name="booksellerfax" -->Fax: <!-- 
TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
                                <!-- TMPL_IF name="contemail" --></p><p><a 
href="mailto:<!-- TMPL_VAR name="contemail" -->" class="button bull"><!-- 
TMPL_VAR name="contemail" --></a><!-- /TMPL_IF -->
                        <input type="submit" value="filter" class="button bull">
+                       <a href="lateissues-excel.pl?supplierid=<!--TMPL_VAR 
NAME="supplierid"-->">Export Data</a>
                </form>
        </p>
        <table>
                <tr>
+                   <th class="bull">Supplier</th>
                        <th class="bull">Title</th>
                        <th class="bull">Issue number</th>
                        <th class="bull">Late since</th>
@@ -20,6 +23,7 @@
                </tr>
                <!-- TMPL_LOOP name="lateissues" -->
                        <tr>
+                           <td><!-- TMPL_VAR name="name" --></td>
                                <!-- TMPL_IF name="odd" -->
                                        <td class="hilighted"><!-- TMPL_IF 
name="Title" --><!-- TMPL_VAR name="Title" --><!-- TMPL_ELSE -->|<!-- /TMPL_IF 
--></td>
                                        <td class="hilighted"><!-- TMPL_VAR 
name="serialseq" --></td>
@@ -40,6 +44,42 @@
                        </tr>
                <!-- /TMPL_LOOP -->
        </table>
+       <!-- TMPL_ELSE -->
+       <p>There are currently no outstanding issues.</p>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="missingissues" -->
+       <h1>Missing Issues</h1>
+       <table>
+               <tr>
+                       <th>Supplier</th>
+                       <th>Title</th>
+                       <th>Issue number</th>
+                       <th>Missing since</th>
+                       <th>&nbsp;</th>
+               </tr>
+               <!-- TMPL_LOOP name="missingissues" -->
+                       <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="statecollection.pl?op=found&amp;planneddate=<!-- TMPL_VAR 
name="planneddate" -->&amp;missingissue=<!-- TMPL_VAR name="serialseq" 
-->&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
+                               </td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+       </table>
+<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->
 

Index: routing.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/Attic/routing.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- routing.tmpl        7 May 2007 08:52:09 -0000       1.1.2.1
+++ routing.tmpl        7 May 2007 09:31:12 -0000       1.1.2.2
@@ -25,7 +25,7 @@
 
 <select name="date_selected">
 <!-- TMPL_LOOP NAME="dates" -->
-<option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR 
NAME="planneddate" -->)" <!-- TMPL_IF NAME="selected" --> selected="SELECTED" 
<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR 
NAME="planneddate" -->)</option>
+<option value="<!-- TMPL_VAR NAME="serialseq" -->" <!-- TMPL_IF 
NAME="selected" --> selected="SELECTED" <!-- /TMPL_IF -->><!-- TMPL_VAR 
NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option>
 <!-- /TMPL_LOOP -->
 </select>
 

Index: statecollection.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/Attic/statecollection.tmpl,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -u -b -r1.4.2.11 -r1.4.2.12
--- statecollection.tmpl        29 Nov 2006 01:20:32 -0000      1.4.2.11
+++ statecollection.tmpl        7 May 2007 09:31:12 -0000       1.4.2.12
@@ -7,6 +7,12 @@
 <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- 
TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
 <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" 
-->">Back to biblio</a>
 
+<!-- TMPL_IF NAME="routing" -->
+<form class="inline" method="get" action="/cgi-bin/koha/bull/routing.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->" />
+<input class="submit" type="submit" title="Routing list" value="Routing List" 
/></form>
+<!-- /TMPL_IF -->
+
 <div id="bloc25">
 <h2 class="bull">waited or late issues</h2>
        <form method="post" name="f" action="statecollection.pl">
@@ -127,20 +133,28 @@
        <!-- TMPL_UNLESS name="hassubscriptionexpired" -->
                <tr>
                        <td>
-                               Manual issue <input type="text" 
name="serialseq" size=30 maxlength=100>
+                               Manual issue <input type="text" 
name="serialseq" size=30 maxlength=100 value="<!-- TMPL_VAR NAME="missingseq" 
-->">
                        </td>
                        <td>
                                <input type="text" name="publisheddate" size=10 
maxlength=15>
                        </td>
                        <td>
-                               <input type="text" name="planneddate" size=10 
maxlength=15>
+                               <input type="text" name="planneddate" size=10 
maxlength=15 value="<!-- TMPL_VAR NAME="missingdate" -->">
                        </td>
                        <td>
-                               <input type="hidden" name="serialid" value="0">
+                       <!-- TMPL_IF NAME="frommissing" -->
+                               <input type="hidden" name="serialid" value="0" 
value="<!-- TMPL_VAR name="missingid" -->>
+                               <!-- TMPL_ELSE -->
+                               <input type="hidden" name="serialid" value="0" 
value="0">
+                                <!--/TMPL_IF-->
                                <select name="status" size="1">
+                                       <!-- TMPL_IF NAME="frommissing" -->
+                                       <option value="2" selected 
>Arrived</option>
+                                       <!-- TMPL_ELSE -->
                                                <option 
value="2">Arrived</option>
                                                <option value="3" 
selected>Late</option>
                                                <option 
value="4">Missing</option>
+                                               <!-- /TMPL_IF -->       
                                </select>
                        </td>
                </tr>
@@ -193,6 +207,14 @@
        <!-- TMPL_IF name="hassubscriptionexpired" -->
                <p>Subscription has expired. Waited last issue status can't be 
changed. <a href="#" onClick="popup()" class="button bull">Renew</a> your 
subscription</p>
        <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="abouttoexpire" -->
+                <h3>Note: Subscription is about to expire next issue.</h3>
+                <script type="text/javascript">
+                <!--
+                alert("Subscription is about to expire next issue");
+                //-->
+                </script>
+        <!-- /TMPL_IF -->
        </form>
 </div>
 

Index: subscription-add.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/Attic/subscription-add.tmpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- subscription-add.tmpl       12 May 2006 08:36:05 -0000      1.8.2.2
+++ subscription-add.tmpl       7 May 2007 09:31:12 -0000       1.8.2.3
@@ -1,5 +1,695 @@
 <!-- TMPL_INCLUDE NAME="bull-top.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME='themelang' 
-->/includes/calendar/calendar-system.css">
+<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>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" 
-->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+
 <!--------------------------MAIN BODY OF PAGE-------------------------->
+
+<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 months = new 
Array('January','February','March','April','May','June','July','August','September','October','November','December');
+var is_season = 0;
+var is_hemisphere = 1;
+var is_month = 0;
+
+// 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;
+       case "8":
+               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=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=sYear;
+               document.f.lastvalue2.value='1';
+               document.f.lastvalue3.value='';
+//             document.f.periodicity.value='8';
+               document.f.numberingmethod.value='{Y} {X}';
+               moreoptions_months(text[3],sYear);
+               display_table(0);
+               is_month = 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;
+}
+
+// to dispaly the more options section for months/years
+function moreoptions_months(x,y){
+document.getElementById("irregularity").innerHTML = '';
+document.getElementById("more_options").innerHTML = '';
+var textbox = '';
+       // alert("X: "+x+"Year: "+y);
+       if(x){
+               textbox +="<table>\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' onchange='moreoptionsupdate(\"lastvalue2\")'>";
+               for(var j = 1; j <= 12; j++){
+                       textbox +="<option 
value='"+j+"'>"+months[j-1]+"<\/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;
+        case "12":
+                if(rollover < 12) expected =12;
+                if(rollover > 12){
+                        expectedover=12;
+                       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 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 if(is_month){
+                               displaytext += 
numberpattern.replace(/{Y}/,months[count])+'\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 &&unicode!=9 && unicode !=13){ // if key 
isn't backspace or delete or tab or enter
+               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 class="bull">Modify subscription</h1>
@@ -7,29 +697,65 @@
                <input type="hidden" name="op" value="modsubscription">
                <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->">
 <!-- TMPL_ELSE -->
-       <h1 class="bull">Add a subscription</h1>
+       <h1 class="bull">Add a subscription (Serial Holdings Record)</h1>
        <form method="post" name="f">
+       <input type="hidden" name="op" value="addsubscription">
 <!-- /TMPL_IF -->
-<div id="bloc25">
+               <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="loggedinusername" -->">
+               <input type="hidden" name="irreg_check" value="0">
+
+
+<div class="bloc25">
        <h2 class="bull">Subscription information</h2>
-               <input type="hidden" name="op" value="addsubscription">
-               <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="user" -->">
-               <p>Librarian</td><td> <!-- TMPL_VAR name="user" --></p>
-               <p><label>Supplier</label><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)">...</a></p>
-               <p><label>Biblio</label><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)">...</a></p>
-               <p><label>Notes</label><textarea name="notes" cols="30" 
rows="2"><!-- TMPL_VAR name="notes" --></textarea></p>
-               <p class="problem">warning</p>
+       <table border="0" cellspacing="5" cellpadding="0">
+       <tr><td>Librarian:</td>
+           <td><!-- TMPL_VAR name="loggedinusername" --></td></tr>
+       <tr><td>Supplier:</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>Biblio</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>Call Number</td>
+           <td><input type="text" name="callnumber" value="<!-- TMPL_VAR 
name="callnumber" -->" size="20"></td></tr>
+       <tr><td>Notes</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>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>
+               </ul></td></tr>
+       </table>
 </div>
-<div id="bloc25">
+<div class="bloc25">
        <h2 class="bull">Planning</h2>
-       <p><label class="label100">Beginnning date:</label> <input type="text" 
name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 
maxlength=10></p>
-       <p><label class="label100">Frequency (*)</label>
-                       <select name="periodicity" size="1">
-                               <option value="" selected>Unknown</option>
+       <table border="0" cellspacing="5" cellpadding="0">
+       <tr><td>First Issue ETA:</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       :   "<!-- 
TMPL_VAR NAME="dateformat" -->",
+                                                button         :   "button2",
+                                                align          :   "Tl"
+                                            });
+                                        </script>
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField     :   
"acqui_date",
+                                                ifFormat       :   "<!-- 
TMPL_VAR NAME="dateformat" -->",
+                                                button         :   
"acqui_date",
+                                                align          :   "Tl"
+                                            });
+                                        </script></td>
+           <td rowspan="5"><div id="displayexample"></div></td></tr>
+       <tr><td>Frequency: (*)</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 -->
@@ -65,11 +791,17 @@
                                <!-- TMPL_ELSE -->
                                        <option value="7">1/3 months 
(1/quarter)</option>
                                <!-- /TMPL_IF -->
-                               <!-- periodicity8 is 1/quarter, exactly like 
periodicity7 -->
+                               <!-- 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>
+                                       <option value="9" 
selected>2/year</option>
                                <!-- TMPL_ELSE -->
-                                       <option value="9">2/years</option>
+                                       <option value="9">2/year</option>
                                <!-- /TMPL_IF -->
                                <!-- TMPL_IF name="periodicity10" -->
                                        <option value="10" 
selected>1/year</option>
@@ -82,9 +814,79 @@
                                        <option value="11">1/2 years</option>
                                <!-- /TMPL_IF -->
                        </select>
-       </p>
-       <p><label class="label100">Arrives on</label>
-                       <select name="dow" size="1">
+       </td></tr>
+       <tr><td>Numbering Pattern:</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="numberpattern8" -->
+                       <option value="8" selected>Month/Year</option>
+               <!-- TMPL_ELSE -->
+                       <option value="8">Month/Year</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>Begins On: (*)</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     : "<!-- TMPL_VAR 
NAME="dateformat" -->",
+                                                button       : "button1",
+                                                align        : "Tl"
+                                            });
+                                        </script>
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField   : 
"beginning_date",
+                                                ifFormat     : "<!-- TMPL_VAR 
NAME="dateformat" -->",
+                                                button       : 
"beginning_date",
+                                                align        : "Tl"
+                                            });
+                                        </script></td></tr>
+</table> 
+</div>
+
+       <tr><td>Arrives on</td>
+           <td>        <select name="dow" size="1">
                                <option value="">None</option>
                                <!-- TMPL_IF name="dow1" -->
                                        <option value="1" 
selected>Monday</option>
@@ -121,21 +923,21 @@
                                <!-- TMPL_ELSE -->
                                        <option value="7">Sunday</option>
                                <!-- /TMPL_IF -->
-                       </select>
-</div>
+                       </select></td></tr> 
+
 <div id="bloc25">
-       <h2 class="bull">Subscription length</h2>
-       <p>* fill 1 from :</p>
-       <ul>
-               <p><label class="label100">Number of issues</label><input 
type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" 
-->"></p>
-               <p><label class="label100">Number of weeks</label><input 
type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
-               <p><label class="label100">Number of months</label><input 
type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
-       </ul>
+       <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 class="bull">Numbering calculation</h2>
-       <p>
+<div class="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 class="bull">&nbsp;</th>
@@ -162,23 +964,21 @@
                                <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" -->
-                                       <td class="bull">The loop is for 
instance</td>
-                               <!-- TMPL_ELSE -->
-                                       <td class="bull">Starting period</td>
-                               <!-- /TMPL_IF -->
+                       <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 class="bull">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>
-                       <tr>
-                               <td class="bull">Set back to</td>
+                               <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>
@@ -195,43 +995,65 @@
                                <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>
-       </p>
+               </table> </div>
 </div>
 <!-- TMPL_IF name="mod" -->
        <input type="button" value="Save subscription" 
onclick="Check(this.form)" accesskey="w" class="button bull">
 <!-- TMPL_ELSE -->
        <input type="button" value="Add subscription" 
onclick="Check(this.form)" accesskey="w" class="button bull">
 <!-- /TMPL_IF -->
+</form>
 </div>
 
-</form>
 <!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->
 
 <script language="JavaScript" type="text/javascript">
 
 function Plugin(f)
 {
-        window.open("subscription-bib-search.pl","Find a bib 
index",'width=500,height=400,toolbar=false,scrollbars=yes');
+        
window.open('subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
 }
 
 function FindAcqui(f)
 {
-        window.open("acqui-search.pl","Find a 
supplier",'width=500,height=400,toolbar=false,scrollbars=yes');
+        
window.open('acqui-search.pl','FindASupplier','width=500,height=400,toolbar=no,scrollbars=yes');
 }
 
 
-function Check(f)
+function Find_ISSN(f)
 {
-       if (f.startdate.value.length != 0 && 
-                       
f.numberlength.value+f.weeklength.value+f.monthlength.value > 0)
-               {
+        
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
-{
+               }
+       } else {
        alert('field marked with * are mandatory');
-}
+       }
        return false;
 }
 </script>
\ No newline at end of file
+<!-- 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: subscription-detail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/Attic/subscription-detail.tmpl,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -b -r1.6.2.8 -r1.6.2.9
--- subscription-detail.tmpl    22 Sep 2006 15:53:39 -0000      1.6.2.8
+++ subscription-detail.tmpl    7 May 2007 09:31:12 -0000       1.6.2.9
@@ -1,12 +1,176 @@
 <!-- TMPL_INCLUDE NAME="bull-top.inc" -->
 <!--------------------------MAIN BODY OF PAGE-------------------------->
+
+<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;
+       case "8":
+               options(text[16],text[3]);
+               irregularity();
+               is_month = 1;
+               display_table(0);
+               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 class="bull">Subscription</h1>
-<a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="Modify 
subscription">Edit</a>
-<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" 
-->" class="button bull" title="Recieve issues">Receive</a>
-<a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" 
class="button bull" title="All issues on this title">Issue history</a>
-<a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- 
TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
-<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" 
-->">Back to biblio</a>
+<h1>Subscription Details:  <!-- TMPL_VAR name="bibliotitle" --></h1>
+<form style="display: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="button bull" title="Modify subscription" 
value="Edit" /></form>
+
+<form style="display:inline" method="get" action="statecollection.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->" />
+<input type="submit" class="button bull" value="Receive Issues" /></form>
+
+<form style="display:inline" method="get" action="serial-issues.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR 
name="biblionumber" -->" />
+<input type="submit" class="button bull"  title="All issues on this title" 
value="Issue History" /></form>
+
+<form style="display:inline" method="get" action="/cgi-bin/koha/bull-home.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR 
name="biblionumber" -->" />
+<input type="submit" class="button bull"  title="all subscriptions on <!-- 
TMPL_VAR name="bibliotitle" -->" value="Subscriptions" /></form>
+
+<form style="display:inline" method="get" action="/cgi-bin/koha/MARCdetail.pl">
+<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" 
/>
+<input type="submit" class="button bull"  title="go to <!-- TMPL_VAR 
name="bibliotitle" -->" value="View Biblio Record" /></form>
+
+<form style="display:inline" method="get" 
action="/cgi-bin/koha/bull/routing.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->" />
+<!-- TMPL_IF NAME="routing" -->
+<a href="/cgi-bin/koha/bull/routing.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid"
+>Edit Routing List</a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/bull/routing.pl?op=new>Create Routing List</a>
+<!-- /TMPL_IF -->
+
 <a href="javascript:confirm_deletion()" class="button bull">
        delete
 </a>
@@ -20,7 +184,9 @@
                <p><label>Biblio</label><i>(<!-- TMPL_VAR name="biblionumber" 
-->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
                <p><label>Notes:</label><!-- TMPL_VAR name="notes" --></p>
 </div>
+
 <div id="bloc25">
+
        <h2 class="bull">Planning</h2>
        <p><label class="label100">Beginnning date:</label> <!-- TMPL_VAR 
name="startdate" --></p>
        <p><label class="label100">Frequency (*):</label>
@@ -43,21 +209,44 @@
                                1/2 Months (6/year)
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity7" -->
-                               1/quarter
+                               1/Quarter
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity8" -->
-                               1/quarter
+                               1/Quarter
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity9" -->
-                               2/year
+                               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 -->
        </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><label class="label100">Arrives on:</label>
                <!--TMPL_IF name="arrival1" -->
                        Monday




reply via email to

[Prev in Thread] Current Thread [Next in Thread]