Cleanup on Serials. Markup corrections and cleanup, moving script blocks into header...
authorOwen Leonard <oleonard@myacpl.org>
Tue, 4 Sep 2007 15:23:07 +0000 (10:23 -0500)
committerChris Cormack <crc@liblime.com>
Tue, 4 Sep 2007 21:35:45 +0000 (16:35 -0500)
Signed-off-by: Chris Cormack <crc@liblime.com>
21 files changed:
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl

index f331354..0ec4559 100644 (file)
@@ -100,7 +100,7 @@ li {
     content: " ";
 }
 
-#title {
+#sitetitle {
        background-image : url("../../img/koha-logo-black.png");
        background-position : 5px 2px;
        background-repeat : no-repeat;
@@ -109,12 +109,12 @@ li {
        padding-left : 50px;
 }
 
-#title h1 {
+#sitetitle h1 {
        display : inline;
        line-height : 54px;
 }
 
-#title h1 a {
+#sitetitle h1 a {
        text-decoration : none;
 }
 
index ea4f1c0..aff9540 100644 (file)
@@ -1,4 +1,4 @@
-<div id="header"><div id="title">
+<div id="header"><div id="sitetitle">
     <h1><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h1>
 </div>
        
index d4567e3..c5af098 100644 (file)
@@ -1,9 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Select Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" language="Javascript">
+
+function GetIt(aqbooksellerid,name)
+{
+  opener.document.f.aqbooksellerid.value = aqbooksellerid;
+  opener.document.f.aqbooksellername.value = name;
+  window.close();
+}
+</script>
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <div id="doc" class="yui-t7">
    <div id="bd">
 
     <p><a href="javascript:back();">Perform a new search</a></p>
 
-<script type="text/javascript" language="Javascript">
-
-function GetIt(aqbooksellerid,name)
-{
-  opener.document.f.aqbooksellerid.value = aqbooksellerid;
-  opener.document.f.aqbooksellername.value = name;
-  window.close();
-}
-</script>
 
 </div>
 </div>
index 0222474..853f5f4 100644 (file)
@@ -1,14 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Search for Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<div id="doc" class="yui-t7">
-   <div id="bd">
-       <div class="yui-g">
-
 <script language="Javascript">
 
 function GetIt(aqbooksellerid,name)
@@ -18,6 +10,13 @@ function GetIt(aqbooksellerid,name)
   window.close();
 }
 </script>
+</head>
+<body>
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+       <div class="yui-g">
+
 
 <h1>Search supplier for serial subscription</h1>
     <form action="/cgi-bin/koha/serials/acqui-search-result.pl" method="post">
index ca25fb7..7118112 100644 (file)
@@ -1,6 +1,32 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials Expiration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
+<script type="text/javascript" language="JavaScript">
+// <![CDATA[
+    document.f.date.focus();
+    
+    /**
+     *  Function CheckForm
+     *  This function checks the form before submit
+     */
+     function CheckForm(form){
+        if(form.date.value){
+            return true;
+        }
+        else {
+            alert("You must enter a date !");
+            document.f.date.focus();
+            return false;
+        }
+     }
+     // ]]>
+</script>
+<!-- End of additions -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
-<!-- End of additions -->
 
 <h1>Check expiration</h1>
 
     
     <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
          
-        <label for="title">Filter on title</label>
-        <input id="title" type="texte" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" />
-        <br />
-        <label for="issn">Filter on ISSN</label>
-        <input id="issn" type="texte" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" />
-        <br />
-        <label for="date">with expiration date before</label>
-        <input id="date" type="texte" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" />
+        <p><label for="title">Filter on title</label>
+        <input id="title" type="text" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" /></p>
+
+        <p><label for="issn">Filter on ISSN</label>
+        <input id="issn" type="text" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" /></p>
+
+        <p><label for="date">with expiration date before</label>
+        <input id="date" type="text" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" />
             <script type="text/javascript">
                 Calendar.setup(
                  {
@@ -41,7 +61,7 @@
                      ifFormat : "%Y-%m-%d",
                  }
                 );
-            </script>
+            </script></p>
         <input type="submit" value="Search" />
     </form>
 </fieldset>
         <!-- TMPL_IF NAME="issn"-->and <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="issn"-->
-        issn like <b><!-- TMPL_VAR NAME="issn" --></b>
+        ISSN like <b><!-- TMPL_VAR NAME="issn" --></b>
     <!-- /TMPL_IF -->
-        will expirate bebore <b><!-- TMPL_VAR NAME="date" --></b>
+        will expire before <b><!-- TMPL_VAR NAME="date" --></b>
 </p>
 <table>
         <tr>
-            <th>
-                issn
-            </th>
-            <th>
-                title
-            </th>
-            <th>
-                Note
-            </th>
-            <th>
-                Expiration date
-            </th>
+            <th>ISSN</th>
+            <th>Title</th>
+            <th>Note</th>
+            <th>Expiration date</th>
         </tr>
     <!-- TMPL_LOOP NAME="subscriptions_loop"-->
         <!-- TMPL_IF NAME="toogle"-->
     </table>
 <!-- /TMPL_IF -->
 
-<script type="text/javascript" language="JavaScript">
-// <![CDATA[
-    document.f.datenumber.focus();
-    
-    /**
-     *  Function CheckForm
-     *  This function checks the form before submit
-     */
-     function CheckForm(form){
-        if(form.datenumber.value){
-            return true;
-        }
-        else {
-            alert("you must write a date !");
-            document.f.datenumber.focus();
-            return false;
-        }
-     }
-     // ]]>
-</script>
-
-
 </div>
 </div>
 </div>
index 5e8cb28..81746f2 100644 (file)
@@ -1,13 +1,9 @@
-<!-- TMPL_UNLESS NAME="preview" -->
+
     <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
     <title>Koha &rsaquo; Subscription edit</title>
     <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-    <!-- TMPL_INCLUDE NAME="header.inc" -->
-    <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-    
     <script type="text/javascript">
+<!-- TMPL_UNLESS NAME="preview" -->
     function Setorder(myorder){
         if (document.claims.elements['order'].value == myorder){
         document.claims.elements['order'].value=myorder+' desc';
         document.claims.elements['op'].value="";
         document.claims.submit();
     }
+<!-- /TMPL_UNLESS -->
+               function popup(supplierid,serialid){
+                       window.open('claims.pl?supplierid='+ supplierid +'&amp;serialid='+ serialid +'&amp;op=preview' ,'popup', 'width=600,height=400,toolbar=no,scrollbars=yes');
+               }
+               //-->
     </script>
-<!-- TMPL_ELSE -->
-    <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-    <div class="popup-block">
+</head>
+<body>
+    <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_UNLESS NAME="preview" -->
+    <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 <!-- /TMPL_UNLESS -->
 
+
+
 <!-- TMPL_UNLESS NAME="preview" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
     <h1>Claims</h1>
-    <p>
     <form name="claims" action="claims.pl" method="post">
+    <p>
         <!-- TMPL_VAR name="CGIsupplier" -->
         <input type="submit" value="OK" />
         <!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
             <table>
                 <tr>
                     <!--TMPL_IF NAME="letter"-->
-                    <th class="cell-header">Claim</th>
+                    <th>Claim</th>
                     <!--/TMPL_IF-->
-                    <th class="cell-header">Supplier</th>
-                    <th class="cell-header">Title</th>
-                    <th class="cell-header">Issue number</th>
-                    <th class="cell-header">Status <a href="javascript:Setorder('status');">sort</a></th>
-                    <th class="cell-header">Since <a href="javascript:Setorder('planneddate');">sort</a></th>
-                <th class="cell-header">Began Claim</th>
+                    <th>Supplier</th>
+                    <th>Title</th>
+                    <th>Issue number</th>
+                    <th>Status <a href="javascript:Setorder('status');">sort</a></th>
+                    <th>Since <a href="javascript:Setorder('planneddate');">sort</a></th>
+                <th>Began Claim</th>
                 </tr>
                 <!-- TMPL_LOOP name="missingissues" -->
                     <tr>
                         <!--TMPL_IF NAME="letter" -->
-                            <td class="cell">
+                            <td>
                     <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';" />
                             </td>
                         <!--/TMPL_IF-->
-                        <td class="cell">
+                        <td>
                         <!-- TMPL_VAR name="name" -->
                         </td>
-                        <td class="cell">
+                        <td>
                         <!-- TMPL_VAR name="title" -->
                         </td>
-                        <td class="cell">
+                        <td>
                         <!-- TMPL_VAR name="serialseq" -->
                         </td>
-                        <td class="cell">
+                        <td>
                             <!-- 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 -->
                             <!-- TMPL_IF Name="status7" -->Claimed<!-- /TMPL_IF -->
                         </td>
-                        <td class="cell">
+                        <td>
                         <!-- TMPL_VAR name="planneddate" -->
                         </td>
-                        <td class="cell">
+                        <td>
                         <!-- TMPL_VAR name="claimdate" -->
                         </td>
                     </tr>
@@ -110,6 +122,10 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
             <!--/TMPL_IF-->
         </form>
 <!-- TMPL_ELSE -->
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+       <div class="yui-g">
 <!-- TMPL_IF Name="supplierloop"-->
         <!-- TMPL_LOOP Name="supplierloop"-->
         <!-- TMPL_IF NAME="name" -->
@@ -142,23 +158,23 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
         <h3>Missing Issues</h3>
         <table>
             <tr>
-                <td class="cell"><b>Supplier<b></td>
-                <td class="cell"><b>Title</b></td>
-                <td class="cell"><b>Issue number</b></td>
-                <td class="cell"><b>Missing since</b></td>
+                <td><b>Supplier<b></td>
+                <td><b>Title</b></td>
+                <td><b>Issue number</b></td>
+                <td><b>Missing since</b></td>
             </tr>
             <!-- TMPL_LOOP name="missingissues" -->
                 <tr>
-                    <td class="cell">
+                    <td>
                     <!-- TMPL_VAR name="name" -->
                     </td>
-                    <td class="cell">
+                    <td>
                     <!-- TMPL_VAR name="Title" -->
                     </td>
-                    <td class="cell">
+                    <td>
                     <!-- TMPL_VAR name="serialseq" -->
                     </td>
-                    <td class="cell">
+                    <td>
                     <!-- TMPL_VAR name="planneddate" -->
                     </td>
                 </tr>
@@ -169,24 +185,14 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
 <p class="noprint"><a href="javascript:window.print()" class="button">Print</a> &nbsp; <a href="javascript:window.close()" class="button">Close</a></p>
 <!-- /TMPL_UNLESS -->
 
-<script type="text/javascript">
-<!--
 
-function popup(supplierid,serialid){
-       window.open('claims.pl?supplierid='+ supplierid +'&amp;serialid='+ serialid +'&amp;op=preview' ,'popup', 'width=600,height=400,toolbar=no,scrollbars=yes');
-}
-//-->
-</script>
-<!-- TMPL_UNLESS NAME="preview" -->
 </div>
 </div>
 </div>
 
+<!-- TMPL_UNLESS NAME="preview" -->
 <!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-<!-- TMPL_ELSE -->
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
 <!-- /TMPL_UNLESS -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 
index bfe8edf..aa46654 100644 (file)
@@ -1,6 +1,47 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Select Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="javascript" type="text/javascript">
+               // GPL code coming from PhpMyAdmin
+               function insertValueQuery() {
+                       var myQuery = document.Aform.distributedto;
+                       var myListBox = document.Aform.borlist;
+               
+                       if(myListBox.options.length > 0) {
+                               var chaineAj = "";
+                               var NbSelect = 0;
+                               for(var i=0; i<myListBox.options.length; i++) {
+                                       if (myListBox.options[i].selected){
+                                               NbSelect++;
+                                               if (NbSelect > 1)
+                                                       chaineAj += ", ";
+                                               chaineAj += myListBox.options[i].value;
+                                       }
+                               }
+               
+                               //IE support
+                               if (document.selection) {
+                                       myQuery.focus();
+                                       sel = document.selection.createRange();
+                                       sel.text = chaineAj;
+                                       document.Aform.insert.focus();
+                               }
+                               //MOZILLA/NETSCAPE support
+                               else if (document.Aform.distributedto.selectionStart || document.Aform.distributedto.selectionStart == "0") {
+                                       var startPos = document.Aform.distributedto.selectionStart;
+                                       var endPos = document.Aform.distributedto.selectionEnd;
+                                       var chaineSql = document.Aform.distributedto.value;
+                                       myQuery.value = chaineSql.substring(0, startPos) +''+ chaineAj+"\n" + chaineSql.substring(endPos, chaineSql.length);
+                               } else {
+                                       myQuery.value += chaineAj;
+                               }
+                       }
+               }
+               function FSaveList() {
+                       document.Aform.SaveList.value="1";
+                       document.Aform.submit();
+               }
+       </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -18,8 +59,8 @@
                        <table>
                        <tr>
                        <td>
-                               <input type="text" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
-                               <input type="submit" class="button" value="Filter">
+                               <input type="text" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" />
+                               <input type="submit" class="button" value="Filter" />
                        </td>
                        <td rowspan="2">
                                <h2>Distributed to</h2>
                                        <!-- TMPL_IF name="save" -->
                                                saved</p>
                                        <!-- /TMPL_IF -->
-                                       <input type="hidden" name="SaveList" value="0">
-                                       <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-                                       <input type="button" name="save" value="Save" class="button" onclick="FSaveList()">
-                                       <input type="button" name="clode" value="Close" class="button" onclick="window.close()">
+                                       <input type="hidden" name="SaveList" value="0" />
+                                       <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+                                       <input type="button" name="save" value="Save" class="button" onclick="FSaveList()" />
+                                       <input type="button" name="clode" value="Close" class="button" onclick="window.close()" />
                        </td>
                        </tr>
                        <tr>
                        </table>
                </form>
        </p>
-       <script language="javascript" type="text/javascript">
-               // GPL code coming from PhpMyAdmin
-               function insertValueQuery() {
-                       var myQuery = document.Aform.distributedto;
-                       var myListBox = document.Aform.borlist;
-               
-                       if(myListBox.options.length > 0) {
-                               var chaineAj = "";
-                               var NbSelect = 0;
-                               for(var i=0; i<myListBox.options.length; i++) {
-                                       if (myListBox.options[i].selected){
-                                               NbSelect++;
-                                               if (NbSelect > 1)
-                                                       chaineAj += ", ";
-                                               chaineAj += myListBox.options[i].value;
-                                       }
-                               }
-               
-                               //IE support
-                               if (document.selection) {
-                                       myQuery.focus();
-                                       sel = document.selection.createRange();
-                                       sel.text = chaineAj;
-                                       document.Aform.insert.focus();
-                               }
-                               //MOZILLA/NETSCAPE support
-                               else if (document.Aform.distributedto.selectionStart || document.Aform.distributedto.selectionStart == "0") {
-                                       var startPos = document.Aform.distributedto.selectionStart;
-                                       var endPos = document.Aform.distributedto.selectionEnd;
-                                       var chaineSql = document.Aform.distributedto.value;
-                                       myQuery.value = chaineSql.substring(0, startPos) +''+ chaineAj+"\n" + chaineSql.substring(endPos, chaineSql.length);
-                               } else {
-                                       myQuery.value += chaineAj;
-                               }
-                       }
-               }
-               function FSaveList() {
-                       document.Aform.SaveList.value="1";
-                       document.Aform.submit();
-               }
-       </script>
+       
 </div>
 </div>
 </div>
index bd552c5..3e632b6 100644 (file)
@@ -1,9 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Member Search &rsaquo; <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-
 <script type="text/javascript">
 <!--
 
@@ -14,8 +11,16 @@ function add_member(subscriptionid,borrowernumber){
 
 //-->
 </script>
+<style type="text/css">
+   #custom-doc { width:38.46em;*width:37.53em;min-width:500px; margin:auto; text-align:left; }
+   </style>
+</head>
+<body>
+
+<div id="custom-doc" class="yui-t7">
+   <div id="bd">
+       <div class="yui-g">
 
-<div class="popup-block">
 <h1>Member Search</h1>
 
 <p>
@@ -28,13 +33,13 @@ function add_member(subscriptionid,borrowernumber){
 <!-- TMPL_IF NAME="memberloop" -->
 <div class="searchresults">
 <table cellspacing="0" cellpadding="0" border="0" width="480" class="collapse">
-<tr><th class="cell-header">Name</th>
-    <th class="cell-header">Location</th>
-    <th class="cell-header">Add</th></tr>
+<tr><th>Name</th>
+    <th>Location</th>
+    <th>Add</th></tr>
 <!-- TMPL_LOOP NAME="memberloop" -->
-<tr><td class="cell"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
-    <td class="cell"><!-- TMPL_VAR NAME="streetaddress" --></td>
-    <td class="cell"><a onclick="add_member(<!-- TMPL_VAR
+<tr><td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
+    <td><!-- TMPL_VAR NAME="streetaddress" --></td>
+    <td><a href="#" onclick="add_member(<!-- TMPL_VAR
 NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;op=add">Add</a></td></tr>
 <!-- /TMPL_LOOP -->
         </table></td></tr>
@@ -45,8 +50,10 @@ NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false
         <p>No results found</p>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<br />
+
 <p><a href="javascript:window.close()" class="button">Close</a></p>
+
+</div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
index ce4ff7b..a1f611b 100644 (file)
@@ -1,23 +1,23 @@
 <!-- TMPL_INCLUDE NAME="serials-top.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 <div id="mainbloc">
-       <h1 class="authority">Serial search results</h1>
+       <h1>Serial search results</h1>
        <div id="resultnumber">
                <p>
                        <!-- TMPL_IF NAME="displayprev" -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>
-                                       <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0" />
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+                                       <img src="/intranet-tmpl/default/images/numbers/prev.gif" alt="Previous" border="0" />
                                </a>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF NAME="highlight" -->
-                                       <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif" />
+                                       <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif" alt="<!-- TMPL_VAR NAME="number" -->" />
                                <!-- TMPL_ELSE -->
-                                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" /></a>
+                                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" alt="<!-- TMPL_VAR NAME="number" -->" /></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF NAME="displaynext" -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0" /></a>
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0" alt="Next" /></a>
                                <!-- /TMPL_IF -->
                </p>
 
        <div id="resultlist">
                <table>
                        <tr>
-                               <th class="authority">Serial</th>
-                               <th class="authority">View</th>
-                               <th class="authority">State of collection</th>
-                               <th class="authority">Delete</th>
+                               <th>Serial</th>
+                               <th>View</th>
+                               <th>State of collection</th>
+                               <th>Delete</th>
                        </tr>
                        <!-- TMPL_LOOP name="result" -->
                                <tr>
        <div id="resultnumber">
                <p>
                        <!-- TMPL_IF NAME="displayprev" -->
-                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0" /></a>
+                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0" alt="Previous" /></a>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF NAME="highlight" -->
                                <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif" />
                                <!-- TMPL_ELSE -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" /></a>
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" alt="<!-- TMPL_VAR NAME="number" -->" /></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF NAME="displaynext" -->
-                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0" /></a>
+                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0" alt="Next" /></a>
                                <!-- /TMPL_IF -->
                </p>
        </div>  
index a7af1cb..f72aaa7 100644 (file)
@@ -1,9 +1,20 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="Javascript">
+
+function GetIt(bibno,title)
+{
+    title = title.replace(/\?/,"\?");
+    title = title.replace(/"/,"\"");
+    title = title.replace(/'/,"\'");
+    opener.document.f.biblionumber.value = bibno;
+    opener.document.f.title.value = title;
+    window.close();
+}
+</script>
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <div id="doc" class="yui-t7">
    <div id="bd">
@@ -44,20 +55,6 @@ No result found for <b><!-- TMPL_VAR NAME="query" --></b>
 <!-- /TMPL_IF-->
 </div>
 
-
-<script language="Javascript">
-
-function GetIt(bibno,title)
-{
-    title = title.replace(/\?/,"\?");
-    title = title.replace(/"/,"\"");
-    title = title.replace(/'/,"\'");
-    opener.document.f.biblionumber.value = bibno;
-    opener.document.f.title.value = title;
-    window.close();
-}
-</script>
-
 </div>
 </div>
 </div>
index f4335ac..19aa69c 100644 (file)
@@ -1,6 +1,17 @@
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Serials  &rsaquo; Routing Slip Preview</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<style type="text/css">
+   #custom-doc { width:38.46em;*width:37.53em;min-width:500px; margin:auto; text-align:left; }
+   </style>
+</head>
+<body>
+
+<div id="custom-doc" class="yui-t7">
+   <div id="bd">
+       <div class="yui-g">
 
-<div id="slip-block">
 <table cellspacing="0" cellpadding="0" border="0" class="collapse routingslip">
 <tr><td class="cell" colspan="3"><h3><!-- TMPL_VAR NAME="libraryname" --></h3></td></tr>
 <tr><td class="cell" colspan="3"><b>Title:</b> <!-- TMPL_VAR NAME="title" --><br />
@@ -18,6 +29,8 @@ promptly as others are waiting.
    <div id="slip-block-links">
    <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
    </div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
+   </div>
+   </div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
index 80a9a15..df40093 100644 (file)
@@ -1,6 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">
+<!--
+
+function print_slip(subscriptionid,issue){
+    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
+window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
+    window.location.href='serials-home.pl';
+}
+//-->
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <p><b>Issue:</b> <!-- TMPL_VAR NAME="issue" --></p>
 
 <table border="0" cellspacing="0" cellpadding="0">
-<tr><td style="padding-top: 5px;"><b>List Member:</b>&nbsp;</td>
+<tr><td style="padding-top: 5px;"><b>List Member:</b></td>
     <td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
-        <tr><td class="cell-header">Name</td>
-            <td class="cell-header">Location</td></tr>
+        <tr><th>Name</th>
+            <th>Location</th></tr>
 <!-- TMPL_LOOP NAME="memberloop" -->
-        <tr><td class="cell"><!-- TMPL_VAR NAME="name" --></td>
-            <td class="cell"><!-- TMPL_VAR NAME="location" --></td></tr>
+        <tr><td><!-- TMPL_VAR NAME="name" --></td>
+            <td><!-- TMPL_VAR NAME="location" --></td></tr>
 <!-- /TMPL_LOOP -->
         </table></td></tr>
-<tr><td colspan="2">&nbsp;</td></tr>
 <tr><td><b>Notes:</b></td>
     <td><!-- TMPL_VAR NAME="routingnotes" --></td></tr>
 </table>
 <input type="submit" name="delete" class="button" value="Delete" /></p>
 </form>
 
-<script type="text/javascript">
-<!--
-
-function print_slip(subscriptionid,issue){
-    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
-window.open(myurl,'PrintSlip','width=400,height=500,toolbar=no,scrollbars=yes');
-    window.location.href='serials-home.pl';
-}
-//-->
-</script>
 </div>
 </div>
 </div>
index 4ec3d20..bebe93b 100644 (file)
@@ -1,6 +1,20 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="javascript" type="text/javascript">
+<!--
+
+function reorder_item(sid,rid,rank){
+    var mylocation = 'reorder_members.pl?subscriptionid='+sid+'&routingid='+rid+'&rank='+rank;
+    window.location.href=mylocation; 
+}
+
+function search_member(subscriptionid){
+    var myurl = 'member-search.pl?subscriptionid='+subscriptionid; window.open(myurl,'FindAMember','width=500,height=400,toolbar=no,scrollbars=yes');
+}
+
+//-->
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<script language="javascript" type="text/javascript">
-<!--
-
-function reorder_item(sid,rid,rank){
-    var mylocation = 'reorder_members.pl?subscriptionid='+sid+'&routingid='+rid+'&rank='+rank;
-    window.location.href=mylocation; 
-}
-//-->
-</script>
 
 <!-- TMPL_IF NAME="op" -->
 <h1>Create Routing List</h1>
@@ -47,22 +52,21 @@ function reorder_item(sid,rid,rank){
 <table border="0" cellspacing="0" cellpadding="0">
 <tr valign="top"><td style="padding-top:5px;"><b>List Member:</b></td>
     <td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
-        <tr><td class="cell-header">Name</td>
-            <td class="cell-header">Location</td>
-            <td class="cell-header">Rank</td>
-            <td class="cell-header">Delete</td></tr>
+        <tr><th>Name</th>
+            <th>Location</th>
+            <th>Rank</th>
+            <th>Delete</th></tr>
 <!-- TMPL_LOOP NAME="memberloop" -->
-        <tr><td class="cell"><!-- TMPL_VAR NAME="name" --></td>
-            <td class="cell"><!-- TMPL_VAR NAME="location" --></td>
-            <td class="cell"><!-- TMPL_VAR NAME="routingbox" --></td>
-            <td class="cell"><a href="/cgi-bin/koha/serials/routing.pl?routingid=<!-- TMPL_VAR NAME="routingid" -->&amp;subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=delete">Delete</a></td></tr>
+        <tr><td><!-- TMPL_VAR NAME="name" --></td>
+            <td><!-- TMPL_VAR NAME="location" --></td>
+            <td><!-- TMPL_VAR NAME="routingbox" --></td>
+            <td><a href="/cgi-bin/koha/serials/routing.pl?routingid=<!-- TMPL_VAR NAME="routingid" -->&amp;subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=delete">Delete</a></td></tr>
 <!-- /TMPL_LOOP -->
-        <tr><td colspan="4"><br /><a onclick="search_member(<!-- TMPL_VAR
+        </table><p><a onclick="search_member(<!-- TMPL_VAR
 NAME="subscriptionid" -->); return false"
 href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=<!-- TMPL_VAR
 NAME="subscriptionid" -->" class="button">Add List Member</a> &nbsp; <a
-href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=delete" class="button">Delete All</a></td></tr>
-        </table></td></tr>
+href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=delete" class="button">Delete All</a></p></td></tr>
 
 <!-- TMPL_ELSE -->
 <table border="0" cellspacing="0" cellpadding="0">
@@ -70,22 +74,12 @@ href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscr
     <td><p><a onclick="search_member(<!-- TMPL_VAR NAME="subscriptionid"
 -->); return false" href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button">Add List Member</a></p></td></tr>
 <!-- /TMPL_IF -->
-<tr><td valign="top" colspan="2"></td></tr>
-<tr><td valign="top"><b>Notes:</b></td>
-    <td><textarea name="notes" rows="3" cols="50"><!-- TMPL_VAR NAME="routingnotes" --></textarea></td></tr>
-<tr><td></td>
-    <td><input type="submit" name="submit" class="button" value="Save" /></td></tr>
+<tr><td valign="top"><label for="notes">Notes:</label></td>
+    <td><textarea name="notes" id="notes" rows="3" cols="50"><!-- TMPL_VAR NAME="routingnotes" --></textarea></td></tr>
 </table>
+<p><input type="submit" name="submit" class="button" value="Save" /></p>
 </form>
-</div>
-<script type="text/javascript">
-<!--
 
-function search_member(subscriptionid){
-    var myurl = 'member-search.pl?subscriptionid='+subscriptionid; window.open(myurl,'FindAMember','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-//-->
-</script>
 </div>
 </div>
 </div>
index 2e38c38..061fd64 100644 (file)
@@ -1,17 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
-
 <script language="JavaScript" type="text/javascript">
 showlayer('<!-- TMPL_VAR NAME="yearmax"-->');
 
@@ -63,6 +52,17 @@ function popup(subscriptionid) {
     newin=window.open('subscription-renew.pl?mode=popup&subscriptionid='+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
 
 <!-- TMPL_UNLESS name="popup" -->
 
index a386abe..6942840 100644 (file)
@@ -1,6 +1,80 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="JavaScript" type="text/javascript">
+
+function popup(subscriptionid) {
+       window.open("subscription-renew.pl?subscriptionid="+subscriptionid,"subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
+}
+
+function barcode_check(){
+    <!-- TMPL_IF NAME="count" -->
+    var count = <!-- TMPL_VAR NAME="count" -->;
+    for(var i=1;i<=count;i++){
+
+        var barcodenum = "barcode"+i;
+        var statusnum = "status"+i;
+        var elembarcode = "document.getElementById('"+barcodenum+"')";
+        var elemstatus = "document.getElementById('"+statusnum+"')";
+// alert(elembarcode+"\n"+eval(elembarcode+".value));
+// alert(elemstatus+"\n"+eval(elemstatus+".value"));
+        if(eval(elembarcode+".value") =='' && eval(elemstatus+".value") == 2){
+            var answer = confirm("Leave barcode blank?\n - Note: unable to change this later");
+            if (answer){
+                document.f.submit();
+            } else {
+                return false;
+            }
+        }
+        if(eval(elembarcode+".value".indexOf('TEMP')) > 0 && eval(elemstatus+".value") == 2){
+            var answer = confirm("A barcode was not entered.\nDo you want to put in a barcode\nor do you want to use a system generated barcode?");
+            if (answer){
+                document.f.submit();
+            } else {
+                return false;
+            }
+        }
+    }
+    <!--/TMPL_IF-->
+}
+
+function Check(f) {
+    var total_errors=0;
+//     alert(f.field_value.length);
+    for (i=0 ; i<f.field_value.length ; i++) {
+//     alert (f.field_value[i].value);
+        if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
+            document.getElementById("error"+i).style.backgroundColor="#FF0000";
+            total_errors++;
+        } else {
+//                     document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
+        }
+    }
+    var alertString2;
+    if (total_errors==0) {
+        document.f.submit();
+    } else {
+        alertString2  = _("Form not submitted because of the following problem(s)");
+        alertString2 += "\n------------------------------------------------------------------------------------\n";
+        alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
+        alert(alertString2);
+    }
+}
+<!--TMPL_IF Name="serialsadditems"-->
+function unHideItems(index,labelindex) {
+       subfield = document.getElementById(index);
+       subfield.style.display = 'block';
+       label = document.getElementById(labelindex);
+       label.style.display='none';     
+}
+function HideItems(index,labelindex) {
+       subfield = document.getElementById(index);
+       subfield.style.display = 'none';
+       label = document.getElementById(labelindex);
+       label.style.display='block';    
+}
+<!--/TMPL_IF>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <form method="post" name="f" action="serials-edit.pl">
 <!--onsubmit="return barcode_check()">-->
 <div id="action">
-    <a href="serials-collection.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a>
+    <ul><li><a href="serials-collection.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a></li>
     <!--TMPL_LOOP Name="subscriptions"-->
-    <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription #<!-- TMPL_VAR name="subscriptionid" --></a>
-        <!--TMPL_IF name="abouttoexpire"--><a href="#" onclick="popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
+       <li><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription #<!-- TMPL_VAR name="subscriptionid" --></a></li>
+        <!--TMPL_IF name="abouttoexpire"--><li><a href="#" onclick="popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a></li>
         <!--/TMPL_IF-->
-        <!--TMPL_IF name="subscriptionexpired"--><a href="#" onclick="popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
+        <!--TMPL_IF name="subscriptionexpired"--><li><a href="#" onclick="popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a></li>
         <!--/TMPL_IF-->
       <!--/TMPL_LOOP-->
-    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a>
+    <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a></li></ul>
 </div>
 <!--TMPL_IF Name="barcode_not_unique" -->
 Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
@@ -33,21 +107,11 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
  <input type="hidden" name="op" value="serialchangestatus" />
        <table cellspacing="0" cellpadding="0" border="0" class="collapse">
        <tr>
-               <th>
-                       Numbered
-               </th>
-               <th>
-                       Published on
-               </th>
-               <th>
-                       planned for
-               </th>
-               <th>
-                       Status
-               </th>
-               <th>
-                       Notes
-               </th>
+               <th>Numbered</th>
+               <th>Published on</th>
+               <th>planned for</th>
+               <th>Status</th>
+               <th>Notes</th>
        </tr>
 <!-- TMPL_LOOP name="serialslist" -->
     <tr>
@@ -254,84 +318,8 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 
 </table>
     <input type="submit" value="Save"  class="button" accesskey="w" /> <!--onclick="Check(this.form)" -->
-</div>
 </form>
 
-<script language="JavaScript" type="text/javascript">
-
-function popup(subscriptionid) {
-       window.open("subscription-renew.pl?subscriptionid="+subscriptionid,"subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
-}
-
-function barcode_check(){
-    <!-- TMPL_IF NAME="count" -->
-    var count = <!-- TMPL_VAR NAME="count" -->;
-    for(var i=1;i<=count;i++){
-
-        var barcodenum = "barcode"+i;
-        var statusnum = "status"+i;
-        var elembarcode = "document.getElementById('"+barcodenum+"')";
-        var elemstatus = "document.getElementById('"+statusnum+"')";
-// alert(elembarcode+"\n"+eval(elembarcode+".value));
-// alert(elemstatus+"\n"+eval(elemstatus+".value"));
-        if(eval(elembarcode+".value") =='' && eval(elemstatus+".value") == 2){
-            var answer = confirm("Leave barcode blank?\n - Note: unable to change this later");
-            if (answer){
-                document.f.submit();
-            } else {
-                return false;
-            }
-        }
-        if(eval(elembarcode+".value".indexOf('TEMP')) > 0 && eval(elemstatus+".value") == 2){
-            var answer = confirm("A barcode was not entered.\nDo you want to put in a barcode\nor do you want to use a system generated barcode?");
-            if (answer){
-                document.f.submit();
-            } else {
-                return false;
-            }
-        }
-    }
-    <!--/TMPL_IF-->
-}
-
-function Check(f) {
-    var total_errors=0;
-//     alert(f.field_value.length);
-    for (i=0 ; i<f.field_value.length ; i++) {
-//     alert (f.field_value[i].value);
-        if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
-            document.getElementById("error"+i).style.backgroundColor="#FF0000";
-            total_errors++;
-        } else {
-//                     document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
-        }
-    }
-    var alertString2;
-    if (total_errors==0) {
-        document.f.submit();
-    } else {
-        alertString2  = _("Form not submitted because of the following problem(s)");
-        alertString2 += "\n------------------------------------------------------------------------------------\n";
-        alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
-        alert(alertString2);
-    }
-}
-<!--TMPL_IF Name="serialsadditems"-->
-function unHideItems(index,labelindex) {
-       subfield = document.getElementById(index);
-       subfield.style.display = 'block';
-       label = document.getElementById(labelindex);
-       label.style.display='none';     
-}
-function HideItems(index,labelindex) {
-       subfield = document.getElementById(index);
-       subfield.style.display = 'none';
-       label = document.getElementById(labelindex);
-       label.style.display='block';    
-}
-<!--/TMPL_IF>
-</script>
-
 </div>
 </div>
 </div>
index f6adc60..37ce9c3 100644 (file)
@@ -1,6 +1,44 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="JavaScript" type="text/javascript">
+
+function popup() {
+       window.open("subscription-renew.pl?subscriptionid=<!-- TMPL_VAR
+name="subscriptionid">","subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
+}
+
+function barcode_check(){
+    <!-- TMPL_IF NAME="count" -->
+       var count = '<!-- TMPL_VAR NAME="count" -->';
+       for(var i=1;i<=count;i++){
+
+               var barcodenum = "barcode"+i;
+               var statusnum = "status"+i;
+               var elembarcode = "document.getElementById('"+barcodenum+"')";
+               var elemstatus = "document.getElementById('"+statusnum+"')";
+// alert(elembarcode+"\n"+eval(elembarcode+".value));
+// alert(elemstatus+"\n"+eval(elemstatus+".value"));
+               if(eval(elembarcode+".value") =='' && eval(elemstatus+".value") == 2){
+                       var answer = confirm("Leave barcode blank?\n - Note: unable to change this later");
+                       if (answer){
+                               document.f.submit();
+                       } else {
+                               return false;
+                       }
+               }
+               if(eval(elembarcode+".value".indexOf('TEMP')) > 0 && eval(elemstatus+".value") == 2){
+                       var answer = confirm("A barcode was not entered.\nDo you want to put in a barcode\nor do you want to use a system generated barcode?");
+                       if (answer){
+                               document.f.submit();
+                       } else {
+                               return false;
+                       }
+               }
+       }
+    <!-- /TMPL_IF -->
+}
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
                <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><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></p>
                <p>Missing issues</p>
-               <p>&nbsp;<textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></p>
+               <p><textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></p>
                <p>Opac's note</p>
-               <p>&nbsp;<textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></p>
+               <p><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></p>
                <input type="submit" value="Save changes" class="button">
        </form>
 
 </div>
-<script language="JavaScript" type="text/javascript">
-
-function popup() {
-       window.open("subscription-renew.pl?subscriptionid=<!-- TMPL_VAR
-name="subscriptionid">","subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
-}
 
-function barcode_check(){
-    <!-- TMPL_IF NAME="count" -->
-       var count = '<!-- TMPL_VAR NAME="count" -->';
-       for(var i=1;i<=count;i++){
-
-               var barcodenum = "barcode"+i;
-               var statusnum = "status"+i;
-               var elembarcode = "document.getElementById('"+barcodenum+"')";
-               var elemstatus = "document.getElementById('"+statusnum+"')";
-// alert(elembarcode+"\n"+eval(elembarcode+".value));
-// alert(elemstatus+"\n"+eval(elemstatus+".value"));
-               if(eval(elembarcode+".value") =='' && eval(elemstatus+".value") == 2){
-                       var answer = confirm("Leave barcode blank?\n - Note: unable to change this later");
-                       if (answer){
-                               document.f.submit();
-                       } else {
-                               return false;
-                       }
-               }
-               if(eval(elembarcode+".value".indexOf('TEMP')) > 0 && eval(elemstatus+".value") == 2){
-                       var answer = confirm("A barcode was not entered.\nDo you want to put in a barcode\nor do you want to use a system generated barcode?");
-                       if (answer){
-                               document.f.submit();
-                       } else {
-                               return false;
-                       }
-               }
-       }
-    <!-- /TMPL_IF -->
-}
-</script>
 
 </div>
 </div>
index c64f54c..92294b4 100644 (file)
@@ -1,17 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
-
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 <!--
+function _(s) { return s } // dummy function for gettext
 
 // 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 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;
 
@@ -51,7 +41,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         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}';
+        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;
@@ -71,7 +61,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value='';
-        document.f.numberingmethod.value= 'Vol {X}, No {Y}';
+        document.f.numberingmethod.value=_('Vol {X}, No {Y}');
         moreoptions(text[1],text[0]);
         display_table(0);
         break;
@@ -91,7 +81,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value='';
-        document.f.numberingmethod.value= 'Vol {X}, Issue {Y}';
+        document.f.numberingmethod.value=_('Vol {X}, Issue {Y}');
         moreoptions(text[1],text[2]);
         display_table(0);
         break;
@@ -111,7 +101,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value='';
-        document.f.numberingmethod.value= 'No {X}, Issue {Y}';
+        document.f.numberingmethod.value=_('No {X}, Issue {Y}');
         moreoptions(text[0],text[2]);
         display_table(0);
         break;
@@ -134,7 +124,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue2.value='1';
         document.f.lastvalue3.value='';
         document.f.periodicity.value='8';
-        document.f.numberingmethod.value='{Y} {X}';
+        document.f.numberingmethod.value=_('{Y} {X}');
         moreoptions_seasons(text[15],sYear);
         display_table(0);
         is_season = 1;
@@ -163,7 +153,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue2.value='1';
         document.f.lastvalue3.value='';
         document.f.periodicity.value=1;
-        document.f.numberingmethod.value='{X}/{Y}';
+        document.f.numberingmethod.value=_('{X}/{Y}');
         display_table(0);
         break;
     default:
@@ -249,8 +239,8 @@ function moreoptions_daily_check(x) {
     var errortext='';
     if(periodicity == 1){
         document.getElementById("irregularity").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 \/>";
+        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; ";
         }
@@ -289,14 +279,14 @@ var textbox = '';
         textbox +="<\/tr>\n";
         if(y){
             textbox +="<tr><td>"+text[6]+"<\/td>";
-            textbox +="<td><a href='javascript:irregularity_check()'>"+'Irregularity?'+"<\/a><\/td>\n";
+            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>";
         } else {
-          textbox +="<tr> <td>"+'issues expected'+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br /><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
+          textbox +="<tr> <td>"+_('issues expected')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
         }
         textbox +="<\/table>\n";
     }
@@ -359,7 +349,7 @@ var textbox = '';
         }
         textbox +="<\/select><\/td><\/tr>\n";
         textbox +="<tr><td>"+text[6]+"<\/td>";
-        textbox +="<td><a href='javascript:irregularity_check()'>"+'Irregularity?'+"<\/a><\/td>\n";
+        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";
     }
@@ -379,7 +369,7 @@ function irregularity_check(){
     var error='';
     var toobig;
     var expected; 
-    var errortext = "<b>Warning irregularity detected<\/b><br \/>";
+    var errortext = _("<b>Warning irregularity detected<\/b><br \/>");
     switch(periodicity){
     case "12":
         if(rollover < 730) expected =730;
@@ -470,17 +460,17 @@ function irregularity_check(){
     }
     if(expected){
         if(expected == 365 || expected==730){
-            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 \/>";
+            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; ";
+                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 \/>";
+            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 +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
                 errortext +=irregular_options(periodicity);
                 errortext +="<\/select>\n";
                 count++;
@@ -489,7 +479,7 @@ function irregularity_check(){
         }
     }
     if(toobig){
-        errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
+        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){
@@ -505,8 +495,8 @@ function irregular_options(periodicity){
 <!-- 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 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;
@@ -590,7 +580,7 @@ function display_example(expected){
     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";
+    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;
@@ -684,8 +674,68 @@ function check_input(e){
     }
 }
 
+function Create_biblio(f)
+{
+   window.open('/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup','FindABibIndex','width=1024,height=768,toolbar=no,scrollbars=yes');
+}
+
+function Plugin(f)
+{
+        window.open('subscription-bib-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
+}
+
+function FindAcqui(f)
+{
+        window.open('acqui-search.pl','FindASupplier','width=800,height=400,toolbar=no,scrollbars=yes');
+}
+
+function Find_ISSN(f)
+{
+        window.open('issn-search.pl','FindABibIndex','width=800,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;
+}
+<!-- TMPL_IF name="mod" -->
+window.onload = modify_num_pattern();
+    <!-- TMPL_IF name="hemisphere" -->
+    window.onload = hemispheres(<!-- TMPL_VAR NAME="hemisphere" -->);
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="irregularity" -->
+window.onload = irregularity_check();
+window.onload = irregular_order();
+<!-- /TMPL_IF -->
 -->
 </script>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
+
 
 <!-- TMPL_IF name="mod" -->
     <h1>Modify a subscription</h1>
@@ -1090,60 +1140,6 @@ function check_input(e){
 <!-- /TMPL_IF -->
 </form>
 
-<script language="JavaScript" type="text/javascript">
-function Create_biblio(f)
-{
-   window.open('/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup','FindABibIndex','width=1024,height=768,toolbar=no,scrollbars=yes');
-}
-
-function Plugin(f)
-{
-        window.open('subscription-bib-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
-}
-
-function FindAcqui(f)
-{
-        window.open('acqui-search.pl','FindASupplier','width=800,height=400,toolbar=no,scrollbars=yes');
-}
-
-function Find_ISSN(f)
-{
-        window.open('issn-search.pl','FindABibIndex','width=800,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 -->
-
 </div>
 </div>
 </div>
index a6b35b8..ac07665 100644 (file)
@@ -3,7 +3,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <div id="doc" class="yui-t7">
    <div id="bd">
index 29546ae..6907abf 100644 (file)
@@ -1,22 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials Detail for Subscription #<!-- TMPL_VAR name="subscriptionid" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
-
 <script type="text/javascript" language="javascript">
 <!--
+function _(s) { return s } // dummy function for gettext
+
 // 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 text = new Array(_('Number'),_('Volume'),_('Issue'),_('Month'),_('Week'),_('Starting with:'),_('Rollover at:'),_('Choose Hemisphere:'),_('Northern'),_('Southern',
+'Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'),_('Season'),_('Year'));
 
 
 // to display the options section
@@ -38,7 +29,7 @@ function irregularity(){
     var periodicity = '<!-- TMPL_VAR NAME="periodicity"-->';
     switch(periodicity){
     case "1":
-        var names = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+        var names = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
         break;
     case "2":
         <!-- TMPL_IF NAME="weekarrayjs" -->
@@ -56,19 +47,19 @@ function irregularity(){
         <!-- /TMPL_IF -->
         break;
     case "5":
-        var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+        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');
+        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');
+        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');
+        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');
+        var names = new Array(_('January'),_('February'),_('March'),_('April'),_('May'),_('June'),_('July'),_('August'),_('September'),_('October'),_('November'),_('December'));
         break;
     case "10":
         expected =1;
@@ -89,27 +80,49 @@ function irregularity(){
     <!-- /TMPL_IF -->
 }
 
+function confirm_deletion() {
+    var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
+    if (is_confirmed) {
+        window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
+    }
+}
+function popup(subscriptionid) {
+    newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
+
 -->
 </script>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
+
     <h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
     <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is by its end. It should be renewed now.</div><!--/TMPL_IF-->
     <div id="action">
         <div class="edit">
-            <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
-            <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>
-            <a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a>
-            <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a>
-            <a href="javascript:confirm_deletion()">
-                Delete
-            </a>
+<ul>
+       <li>            <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a></li>
+       <li>            <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a></li>
+       <li>            <a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a></li>
+       <li>            <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a></li>
+       <li>            <a href="javascript:confirm_deletion()">Delete</a></li>
+</ul>
         </div>
         <div class="view">
-            <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
-            <!-- TMPL_IF NAME="routing" -->
-            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a>
-            <!-- TMPL_ELSE -->
-            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a>
+<ul>
+       <li>            <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a></li>
+                   <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a></li><!-- TMPL_ELSE -->
+       <li>            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a></li>
             <!-- /TMPL_IF -->
+</ul>
         </div>
     </div>
     <div id="subscription_info">
@@ -358,20 +371,7 @@ function irregularity(){
                 <tr><td><label>Opac's note</label></td><td><!-- TMPL_VAR name="opacnote" --></td></tr>
         </table>
     </div>
-</div>
-<script type="text/javascript">
-function confirm_deletion() {
-    var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
-    if (is_confirmed) {
-        window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
-    }
-}
-function popup(subscriptionid) {
-    newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
 
-// window.onload = num_pattern();
-</script>
 </div>
 </div>
 </div>
index 886d074..9f3c663 100644 (file)
@@ -1,11 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Serials Subscription renew#<!-- TMPL_VAR name="subscriptionid" --></title>
+<title>Koha &rsaquo; Serials Subscription renew #<!-- TMPL_VAR name="subscriptionid" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 
 <!--TMPL_IF Name="renew"-->
- <div id="mainbloc">
   Subscription renewed.
   
   <script type="text/javascript">
   self.close();
   //-->
   </script>
-</div>
 <!--TMPL_ELSE-->
-<div id="mainbloc">
 
-<h1 class="serial">subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
+<h1>Subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
 
 <form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
-       <div id="bloc25">
-               <input type="hidden" name="op" value="renew">
-               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-               <p><label class="label100">start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
+               <input type="hidden" name="op" value="renew" />
+               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+               <p><label for="startdate">Start date</label><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /></p>
                <p>Subscription length :</p>
-               <p><label class="label100">Number of num</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>
-               <p>Note for the librarian that will manage your renewal request</p>
-               <ul><textarea name="note" rows="10" cols="60"></textarea></ul>
-               <input type="submit" value="Request a renewal" class="button serial">
-       </div>
+               <p><label for="numberlength">Number of num</label><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></p>
+               <p><label for="weeklength">Number of weeks</label><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></p>
+               <p><label for="monthlength">Number of months</label><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></p>
+               <p><label for="note">Note for the librarian that will manage your renewal request</label></p>
+               <ul><textarea name="note" id="note" rows="10" cols="60"></textarea></ul>
+               <input type="submit" value="Request a renewal" class="button serial" />
 </form>
-</div>
+
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
index 4ba46e7..30bf63a 100644 (file)
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<h1 class="serial">Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
+<h1>Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
                <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">subscription</a>
                <!-- TMPL_IF name="alertloop" -->
                        <table>
                        <tr>
-                               <th class="serial">Borrower name</th>
-                               <th class="serial">&nbsp;</th>
+                               <th>Borrower name</th>
+                               <th>&nbsp;</th>
                        </tr>
 
                        <!-- TMPL_LOOP NAME="alertloop" -->
                                <tr>
                                        <td><!-- TMPL_VAR name="name" --></td>
-                                       <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber">" class="button serial">View</a></td>
+                                       <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber">" class="button">View</a></td>
                                </tr>
                        <!-- /TMPL_LOOP -->
                        </table>