- Lots of markup corrections, in scripts and templates, for XHTML compliance

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 69972c0..7b81c50 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -254,7 +254,7 @@ div#header_search ul.link-tabs li.off a {
        padding : 0.1em .5em .2em .5em;
 }
 
-div#circ_search,div#catalog_search,div#patron_search {
+div#circ_search,div#catalog_search,div#patron_search,div#subscription_search {
        border : 0;
        border-bottom : 1px solid #FF9900;
        padding : 0 0 .2em 0;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index e2542fa..42e4441 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -8,6 +8,8 @@
        <li class="more"><a href="/cgi-bin/koha/mainpage.pl">More</a><ul>
        <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></li>
        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
+       <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+       <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
        <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
        <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
new file mode 100644 (file)
index 0000000..d3192e7
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
@@ -0,0 +1,6 @@
+<ul>
+       <li>        <a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a></li>
+       <li>        <a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
+       <li>        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a></li>
+       <li>        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
+</ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
new file mode 100644 (file)
index 0000000..12451a8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -0,0 +1,30 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+       <div id="subscription_search">
+       <p class="tip">Search Subscriptions:</p>
+ <form action="/cgi-bin/koha/serials/serials-home.pl" method="get"><!-- TMPL_IF NAME="routing" --><input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" /><!-- /TMPL_IF --><input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" /><input type="submit" value="Search" class="button" />
+</form>
+       </div>
+       <div id="circ_search">
+       <p class="tip">Enter patron card number or partial name:</p>
+       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+       <input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <input value="Submit" type="submit" />
+       </form>
+       </div>  
+       <div id="catalog_search">
+       <p class="tip">Enter search keywords:</p>
+               <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                        <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                               <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/serials/serials-home.pl#subscription_search">Search Subscriptions</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+                       </ul>   
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index c5af098..a4beae7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -15,7 +15,7 @@ function GetIt(aqbooksellerid,name)
 
 <div id="doc" class="yui-t7">
    <div id="bd">
-       <div class="yui-g">
+       
 
 <h1>Supplier Search Results</h1>
 <h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
@@ -35,11 +35,8 @@ function GetIt(aqbooksellerid,name)
 </table>
 <!-- /TMPL_IF -->
 
-    <p><a href="javascript:back();">Perform a new search</a></p>
+    <p><a href="/cgi-bin/koha/serials/acqui-search.pl">Perform a new search</a></p>
 
-
-</div>
-</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
index 853f5f4..b179d95 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
@@ -1,21 +1,22 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Search for Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script language="Javascript">
-
+<script type="text/javascript">
+//<![CDATA[
 function GetIt(aqbooksellerid,name)
 {
   opener.document.f.aqbooksellerid.value = aqbooksellerid;
   opener.document.f.aqbooksellername.value = 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>
@@ -26,7 +27,5 @@ function GetIt(aqbooksellerid,name)
     </form>
 
 </div>
-</div>
-</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index bfa1058..d56108b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -1,11 +1,7 @@
 <!-- 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>
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
     
@@ -29,13 +25,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 
 <h1>Check expiration</h1>
@@ -133,9 +129,11 @@
     </table>
 <!-- /TMPL_IF -->
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
index 81746f2..db2d9aa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
@@ -23,7 +23,7 @@
 <body>
     <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_UNLESS NAME="preview" -->
-    <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+    <!--TMPL_INCLUDE NAME="serials-search.inc" -->
 <!-- /TMPL_UNLESS -->
 
 
@@ -34,7 +34,7 @@
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
     <h1>Claims</h1>
     <form name="claims" action="claims.pl" method="post">
@@ -125,7 +125,7 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
 
 <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" -->
@@ -185,14 +185,13 @@ 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 -->
 
-
-</div>
 </div>
 </div>
 
 <!-- TMPL_UNLESS NAME="preview" -->
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
 <!-- /TMPL_UNLESS -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
index aa46654..7937f0f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
@@ -2,7 +2,8 @@
 <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
+//<![CDATA[
+// GPL code coming from PhpMyAdmin
                function insertValueQuery() {
                        var myQuery = document.Aform.distributedto;
                        var myListBox = document.Aform.borlist;
@@ -41,21 +42,21 @@
                        document.Aform.SaveList.value="1";
                        document.Aform.submit();
                }
+       //]]>
        </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
        <h1>Select borrowers or enter manually the names</h1>
-       <p>
-               <form action="/cgi-bin/koha/serials/distributedto.pl" method="post" name="Aform">
+       <form action="/cgi-bin/koha/serials/distributedto.pl" method="post" name="Aform">
                        <table>
                        <tr>
                        <td>
@@ -67,9 +68,9 @@
                                <p>
                                        <textarea name="distributedto" rows="15" cols="30"><!-- TMPL_VAR name="distributedto" --></textarea>
                                </p>
-                               <p>
+                               
                                        <!-- TMPL_IF name="save" -->
-                                               saved</p>
+                                               <p>saved</p>
                                        <!-- /TMPL_IF -->
                                        <input type="hidden" name="SaveList" value="0" />
                                        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
@@ -80,24 +81,24 @@
                        <tr>
                        <td>
                                <!-- TMPL_VAR NAME="borrowername" -->
-                               <select name="borlist" size="15">
+                               <!-- TMPL_IF NAME="borlist" --><select name="borlist" size="15">
                                        <!-- TMPL_LOOP name="borlist" -->
                                                <option value="<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->">
                                                        <!-- TMPL_VAR name="surname" --> <!-- TMPL_VAR name="firstname" -->
                                                </option>
                                        <!-- /TMPL_LOOP -->
-                               </select>
+                               </select><!-- /TMPL_IF -->
                                <input type="button" name="insert" value="&gt;&gt;" class="button" onclick="insertValueQuery()" title="Insert" />
                        </td>
                        </tr>
                        </table>
                </form>
-       </p>
        
 </div>
 </div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
index 3e632b6..78462bb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
@@ -19,31 +19,32 @@ function add_member(subscriptionid,borrowernumber){
 
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
-       <div class="yui-g">
+       
 
 <h1>Member Search</h1>
 
-<p>
+
 <form name="search" action="/cgi-bin/koha/serials/member-search.pl" method="post">
 <input type="text" name="member" size="30" />
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
 <input type="submit" class="button" value="Search" />
 </form>
-</p>
+
 <!-- TMPL_IF NAME="memberloop" -->
 <div class="searchresults">
-<table cellspacing="0" cellpadding="0" border="0" width="480" class="collapse">
-<tr><th>Name</th>
+<table>
+<tr>
+       <th>Name</th>
     <th>Location</th>
-    <th>Add</th></tr>
+    <th>Add</th>
+</tr>
 <!-- TMPL_LOOP NAME="memberloop" -->
 <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>
-</table>
+        </table>
 </div>
 <!-- TMPL_ELSE -->
     <!-- TMPL_IF NAME="member" -->
@@ -53,7 +54,6 @@ NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false
 
 <p><a href="javascript:window.close()" class="button">Close</a></p>
 
-</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
index f72aaa7..e78d868 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script language="Javascript">
-
+//<![CDATA[
 function GetIt(bibno,title)
 {
     title = title.replace(/\?/,"\?");
@@ -12,13 +12,14 @@ function GetIt(bibno,title)
     opener.document.f.title.value = title;
     window.close();
 }
+//]]>
 </script>
 </head>
 <body>
 
 <div id="doc" class="yui-t7">
    <div id="bd">
-       <div class="yui-g">
+       
 
 <h1>Search results</h1>
 <!-- TMPL_IF NAME="total"-->
@@ -53,10 +54,7 @@ function GetIt(bibno,title)
 <!-- TMPL_ELSE -->
 No result found for <b><!-- TMPL_VAR NAME="query" --></b>
 <!-- /TMPL_IF-->
-</div>
 
-</div>
-</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
index 19aa69c..2df1f5c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl
@@ -10,17 +10,17 @@
 
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
-       <div class="yui-g">
+       
 
-<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 />
+<table>
+<tr><td colspan="3"><h3><!-- TMPL_VAR NAME="libraryname" --></h3></td></tr>
+<tr><td colspan="3"><b>Title:</b> <!-- TMPL_VAR NAME="title" --><br />
 <!-- TMPL_VAR NAME="issue" --></td></tr>
-<tr><td class="cell"><b>Name/Location</b></td>
-    <td class="cell"><b>Date Due</b></td></tr>
+<tr><td><b>Name/Location</b></td>
+    <td><b>Date Due</b></td></tr>
 <!-- TMPL_LOOP NAME="memberloop" -->
-        <tr><td class="name"><b><!-- TMPL_VAR NAME="name" --></b> <!-- TMPL_VAR NAME="location" --></td>
-            <td class="date">&nbsp;</td></tr>
+        <tr><td><b><!-- TMPL_VAR NAME="name" --></b> <!-- TMPL_VAR NAME="location" --></td>
+            <td>&nbsp;</td></tr>
 <!-- /TMPL_LOOP -->
 </table>
 <p><b>Notes:</b> Please return this journal
@@ -31,6 +31,5 @@ promptly as others are waiting.
    </div>
 
    </div>
-   </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
index df40093..6392703 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
@@ -14,13 +14,13 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 <h1>Preview Routing List</h1>
 
@@ -48,9 +48,11 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
 <input type="submit" name="delete" class="button" value="Delete" /></p>
 </form>
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
index bebe93b..9faa826 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
@@ -18,13 +18,13 @@ function search_member(subscriptionid){
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 
 <!-- TMPL_IF NAME="op" -->
@@ -41,7 +41,7 @@ function search_member(subscriptionid){
 
 <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_VAR NAME="planneddate" -->)" <!-- TMPL_IF NAME="selected" --> selected="selected" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option>
 <!-- /TMPL_LOOP -->
 </select>
 
@@ -80,9 +80,11 @@ href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscr
 <p><input type="submit" name="submit" class="button" value="Save" /></p>
 </form>
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
index 3995818..dc619b6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
@@ -1,7 +1,34 @@
-<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Serials &rsaquo; Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">
+//<![CDATA[
+active(<!-- TMPL_VAR name="yearmin" -->);
+function active(numlayer)
+{
+       for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
+               ong = i;
+               link = "link"+i;
+               if (numlayer==i) {
+                       document.getElementById(ong).style.visibility="visible";
+               } else {
+                       document.getElementById(ong).style.visibility="hidden";
+               }
+       }
+}
+//]]>
+</script>
+</head>
+<body>
 
 <!-- TMPL_UNLESS name="popup" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b">
        <h1>Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
        <p>
        <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial">Back to biblio</a>
@@ -48,21 +75,12 @@
                </table>
        </div>
        <!--/TMPL_LOOP -->
-<script language="JavaScript" type="text/javascript">
-active(<!-- TMPL_VAR name="yearmin" -->);
-function active(numlayer)
-{
-       for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
-               ong = i;
-               link = "link"+i;
-               if (numlayer==i) {
-                       document.getElementById(ong).style.visibility="visible";
-               } else {
-                       document.getElementById(ong).style.visibility="hidden";
-               }
-       }
-}
 
-</script>
-</body>
-</html>
+</div>
+</div>
+
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
index d76326e..c8b990d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
@@ -4,20 +4,19 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 <h1>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
 <div id="action">
     <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Subscriptions</a>
     <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Back to biblio</a>
     <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;selectview=full">Complete view</a>
-    </form>
 </div>
 <!-- TMPL_LOOP name="subscription_LOOP" -->
     <div id="serials_serial_issue_<!-- TMPL_VAR name="subscriptionid" -->">
@@ -111,9 +110,11 @@
     <!-- /TMPL_UNLESS -->
 <!-- /TMPL_LOOP -->
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
index 061fd64..f4d7e2d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
@@ -1,7 +1,8 @@
 <!-- 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">
+<script type="text/javascript">
+//<![CDATA[
 showlayer('<!-- TMPL_VAR NAME="yearmax"-->');
 
 function showlayer(numlayer)
@@ -51,22 +52,29 @@ function addsubscriptionid()
 function popup(subscriptionid) {
     newin=window.open('subscription-renew.pl?mode=popup&subscriptionid='+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
+
+$(document).ready(function() {
+       $('#subscription_years').tabs();
+});
+ 
+
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 
 <!-- TMPL_UNLESS name="popup" -->
 
-       <h1>Serial Collection information for<br /> <em><!-- TMPL_VAR name="bibliotitle" --></em></h1>
+       <h1>Serial Collection information for  <i><!-- TMPL_VAR name="bibliotitle" --></i></h1>
 <!-- /TMPL_UNLESS -->
 
 <!--TMPL_IF Name="subscriptions"-->
@@ -164,25 +172,20 @@ function popup(subscriptionid) {
 <!--/TMPL_IF-->
 </table>
 <!--/TMPL_IF -->
-    <div class="tabsubs">
-    <!-- TMPL_LOOP NAME="years" -->
+
+
+<!-- TMPL_IF NAME="years" --><form name="edition" action="serials-edit.pl">
+<div id="subscription-years">
+<ul>
+       <!-- TMPL_LOOP NAME="years" -->
         <!-- TMPL_IF NAME="year" -->
-        <!-- TMPL_IF NAME="first" -->
-            <a  id="link<!-- TMPL_VAR NAME="year" -->" class="tab_active" href="javascript:showlayer('<!-- TMPL_VAR NAME="year" -->')"><!-- TMPL_VAR NAME="year" --></a>
-        <!-- TMPL_ELSE -->
-            <a  id="link<!-- TMPL_VAR NAME="year" -->" class="tab_inactive" href="javascript:showlayer('<!-- TMPL_VAR NAME="year" -->')"><!-- TMPL_VAR NAME="year" --></a>
-        <!-- /TMPL_IF -->
+            <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->#subscription-year-<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a></li>
         <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-    </div>
+</ul>
 
-<form name="edition" action="serials-edit.pl">
  <!-- TMPL_LOOP NAME="years" -->
- <!--TMPL_IF Name="first" -->
-    <div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" class="content_visible" >
- <!--TMPL_ELSE -->
-    <div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" class="content_hidden">
- <!--/TMPL_IF -->
+<div id="subscription-year-<!-- TMPL_VAR NAME="year" -->">
         <table width="400px">
             <tr>
 <!--TMPL_UNLESS Name="onesubscription"-->
@@ -205,7 +208,7 @@ function popup(subscriptionid) {
                 </th>
             </tr>
       <!-- TMPL_LOOP Name="serials" -->
-            <tr name="branch <!--TMPL_VAR Name="branchcode"-->">
+            <tr>
 <!--TMPL_UNLESS Name="onesubscription"-->
                  <td><a href="serials-collection.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->"><!--TMPL_VAR Name="subscriptionid"--></a></td>
 <!--/TMPL_UNLESS-->
@@ -232,18 +235,18 @@ function popup(subscriptionid) {
                     <!-- TMPL_VAR Name="branchcode" -->
                 </td>
                 <td>
-                  <div visibility="hidden" name="subs" val="<!--TMPL_VAR Name="subscriptionid"-->"></div>
+                  <input type="hidden" name="subs" value="<!--TMPL_VAR Name="subscriptionid"-->" />
                   <!--TMPL_IF Name="subscriptionexpired"-->
                   <input type="checkbox" name="serialid" value="<!--TMPL_VAR Name="serialid"-->" disabled="disabled" />
                   <!--TMPL_ELSE-->
                     <!--TMPL_IF Name="status1"-->
-                    <input type="checkbox" name="serialid" checked value="<!--TMPL_VAR Name="serialid"-->" />
+                    <input type="checkbox" name="serialid" checked="checked" value="<!--TMPL_VAR Name="serialid"-->" />
                     <!--TMPL_ELSE -->
                     <!--TMPL_IF Name="status3"-->
-                    <input type="checkbox" name="serialid" checked value="<!--TMPL_VAR Name="serialid"-->" />
+                    <input type="checkbox" name="serialid" checked="checked" value="<!--TMPL_VAR Name="serialid"-->" />
                     <!--TMPL_ELSE -->
                       <!--TMPL_IF Name="status4"-->
-                      <input type="checkbox" name="serialid" checked value="<!--TMPL_VAR Name="serialid"-->" />
+                      <input type="checkbox" name="serialid" checked="checked" value="<!--TMPL_VAR Name="serialid"-->" />
                       <!--TMPL_ELSE -->
                       <input type="checkbox" name="serialid" value="<!--TMPL_VAR Name="serialid"-->" />
                       <!--/TMPL_IF-->           
@@ -259,12 +262,15 @@ function popup(subscriptionid) {
     <!--/TMPL_LOOP -->
   <input type="hidden" name="subscriptionid" value="<!--TMPL_VAR Name="subscriptionidlist"-->" />
 
+</div>
 </form>
+<!-- /TMPL_IF -->
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
index 2a8d37f..76354d7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script language="JavaScript" type="text/javascript">
-
+//<![CDATA[
 function popup(subscriptionid) {
        window.open("subscription-renew.pl?subscriptionid="+subscriptionid,"subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
 }
@@ -74,24 +74,26 @@ function HideItems(index,labelindex) {
        label.style.display='block';    
 }
 <!--/TMPL_IF>
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 <h1>Serial Edition <!-- TMPL_VAR name="bibliotitle" --></h1>
 <form method="post" name="f" action="serials-edit.pl">
 <!--onsubmit="return barcode_check()">-->
 <div id="action">
-    <ul><li><a href="serials-collection.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a></li>
+    <ul>
     <!--TMPL_LOOP Name="subscriptions"-->
+       <li><a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a></li>
        <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-->
@@ -105,7 +107,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 <!--/TMPL_IF -->
 
  <input type="hidden" name="op" value="serialchangestatus" />
-       <table cellspacing="0" cellpadding="0" border="0" class="collapse">
+       <table>
        <tr>
                <th>Numbered</th>
                <th>Published on</th>
@@ -236,7 +238,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
             <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
         </td>
         <td>
-            <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->">
+            <select name="status" size="1" id="addstatus<!-- TMPL_VAR NAME="num" -->">
   <!--TMPL_IF name="status1" -->
                     <option value="1" selected="selected">Waited</option>
   <!-- /TMPL_IF -->
@@ -321,9 +323,11 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
     <input type="submit" value="Save"  class="button" accesskey="w" /> <!--onclick="Check(this.form)" -->
 </form>
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index 69b8217..0616b37 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -4,13 +4,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 <!--TMPL_IF Name="information"-->
 Serials updated :
@@ -53,8 +53,9 @@ Serials updated :
 <!--/TMPL_LOOP -->
 </table>
 <!--/TMPL_IF-->
-<h1>Serials subscription</h1>
-<h2>Search existing subscription</h2>
+        <!-- TMPL_IF NAME="done_searched"-->
+<h1>Serials subscriptions</h1>
+
 <!-- TMPL_IF NAME="routing" -->
         <h3>Search for Serial Routing List</h3>
 <!-- /TMPL_IF -->
@@ -75,26 +76,7 @@ Serials updated :
               <th colspan="2">&nbsp;</th>
             <!-- /TMPL_IF -->        
         </tr>
-        <tr>
-            <form action="/cgi-bin/koha/serials/serials-home.pl" method="get">
-            <!-- TMPL_IF NAME="routing" -->
-                <input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" />
-            <!-- /TMPL_IF -->
-            <input type="hidden" name="searched" value="1" />
-            <td>
-                <input type="text" size="10" maxlength="11" name="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" title="type ISSN here to filter subscription" />
-            </td>
-            <td>
-                <input type="text" size="40" maxlength="40" name="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" title="type a title -complete or partial- to filter subscription" />
-            </td>
-            <td colspan="2">
-                &nbsp;
-            </td>
-            <td colspan="2">
-                <input type="submit" value="filter" class="button serial" title="set a filter on ISSN / title" />
-            </td>
-        </tr>
-        <!-- TMPL_IF NAME="done_searched"-->
+        
         <!-- TMPL_LOOP name="subscriptions" -->
             <tr>
                 <!-- TMPL_IF name="toggle" -->
@@ -156,12 +138,11 @@ Serials updated :
                 </td>
             </tr>
         <!-- /TMPL_LOOP -->
-        <!-- /TMPL_IF -->
     </table>
     
+        <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="routing" -->
     <!-- TMPL_ELSE -->
-       <h2>Add a new subscription</h2>
        <div id="action">
             <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button serial">
                 Add subscription
@@ -170,7 +151,9 @@ Serials updated :
     <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
index 37ce9c3..6ff155a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
@@ -2,7 +2,7 @@
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script language="JavaScript" type="text/javascript">
-
+//<![CDATA[
 function popup() {
        window.open("subscription-renew.pl?subscriptionid=<!-- TMPL_VAR
 name="subscriptionid">","subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
@@ -38,17 +38,18 @@ function barcode_check(){
        }
     <!-- /TMPL_IF -->
 }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 <h1>Check In subscription for: <!-- TMPL_VAR name="bibliotitle" --></h1>
 <div id="action">
@@ -62,49 +63,39 @@ function barcode_check(){
 
 <h2>waited or late numbers</h2>
        <form method="post" name="f" action="serials-recieve.pl" onsubmit="return barcode_check()">
-               <input type="hidden" name="op" value="serialchangestatus">
-               <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
-               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-               <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
-       <table cellspacing="0" cellpadding="0" border="0" class="collapse">
+               <input type="hidden" name="op" value="serialchangestatus" />
+               <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
+               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+               <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
+       <table>
        <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>
                        <td>
-                               Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100">
+                               Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />
-                               Callnumber <input type="text" name="itemcallnumber" value="<!--TMPL_VAR NAME="callnumber"-->" size="15" maxlength="100">
-                               Barcode <input type="text" name="barcode" value="<!-- TMPL_VAR NAME="barcode"-->" id="barcode<!-- TMPL_VAR NAME="num" -->" size="20" maxlength="20">
+                               Callnumber <input type="text" name="itemcallnumber" value="<!--TMPL_VAR NAME="callnumber"-->" size="15" maxlength="100" />
+                               Barcode <input type="text" name="barcode" value="<!-- TMPL_VAR NAME="barcode"-->" id="barcode<!-- TMPL_VAR NAME="num" -->" size="20" maxlength="20" />
                        <!--/TMPL_IF -->
                        </td>
                        <td>
-                               <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
+                               <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />&nbsp;
                        <!--/TMPL_IF  -->
                        </td>
                        <td>
-                               <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
+                               <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />
-                               <select name="branch" size="1">
+                               <select name="branch">
                                                <option value="">Branch</option>
                        <!-- TMPL_LOOP name="branchloop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
                                <!-- TMPL_ELSE -->
@@ -115,8 +106,8 @@ function barcode_check(){
                        <!--/TMPL_IF -->
                        </td>
                        <td>
-                               <input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
-                               <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->">
+                               <input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->" />
+                               <select name="status" id="status<!-- TMPL_VAR NAME="num" -->">
                                        <!--TMPL_IF name="status1" -->
                                                <option value="1" selected="selected">Waited</option>
                                        <!-- /TMPL_IF -->
@@ -159,7 +150,7 @@ function barcode_check(){
                                                        <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                    <!--TMPL_ELSE-->
-                                       <select name="itemstatus" size="1">
+                                       <select name="itemstatus">
                                                <option value="">Item Status</option>
                                                <!-- TMPL_LOOP name="itemstatusloop" -->
                                                <!-- TMPL_IF name="selected" -->
@@ -177,11 +168,11 @@ function barcode_check(){
 
                        </td>
                        <td>
-                               <input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size="20" maxlength="255">
+                               <input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size="20" maxlength="255" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />
                                <!--TMPL_IF Name="itemlocation"-->
-                                       <select name="location" size="1">
+                                       <select name="location">
                                                <option value="">Location</option>
                                                <!-- TMPL_LOOP name="itemlocationloop" -->
                                                <!-- TMPL_IF name="selected" -->
@@ -201,24 +192,24 @@ function barcode_check(){
        <!-- TMPL_UNLESS name="hassubscriptionexpired" -->
                <tr>
                        <td>
-                               Manual issue <input type="text" name="serialseq" size="30" maxlength="100" value="<!-- TMPL_VAR NAME="missingseq" -->">
+                               Manual issue <input type="text" name="serialseq" size="30" maxlength="100" value="<!-- TMPL_VAR NAME="missingseq" -->" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />
-                               Callnumber <input type="text" name="itemcallnumber" value="" size="10" maxlength="15">
-                               Barcode <input type="text" name="barcode" value="" size="20" maxlength="20">
+                               Callnumber <input type="text" name="itemcallnumber" value="" size="10" maxlength="15" />
+                               Barcode <input type="text" name="barcode" value="" size="20" maxlength="20" />
                        <!--/TMPL_IF-->
                        </td>
                        <td>
-                               <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
+                               <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />&nbsp;
                        <!--/TMPL_IF  -->
                        </td>
                        <td>
-                               <input type="text" name="planneddate" size="10" maxlength="15" value="<!-- TMPL_VAR NAME="missingdate" -->">
+                               <input type="text" name="planneddate" size="10" maxlength="15" value="<!-- TMPL_VAR NAME="missingdate" -->" />
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />
-                               <select name="branch" size="1">
+                               <select name="branch">
                                                <option value="">Branch</option>
                        <!-- TMPL_LOOP name="branchloop" -->
                                <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
@@ -231,11 +222,11 @@ function barcode_check(){
                        </td>
                        <td>
                                <!-- TMPL_IF NAME="frommissing" -->
-                               <input type="hidden" name="serialid" value="<!-- TMPL_VAR name="missingid" -->">
+                               <input type="hidden" name="serialid" value="<!-- TMPL_VAR name="missingid" -->" />
                                <!-- TMPL_ELSE -->
-                               <input type="hidden" name="serialid" value="0">
+                               <input type="hidden" name="serialid" value="0" />
                                <!--/TMPL_IF-->
-                               <select name="status" size="1">
+                               <select name="status">
                                                <!-- TMPL_IF NAME="frommissing" -->
                                                <option value="2" selected="selected">Arrived</option>
                                                <!-- TMPL_ELSE -->
@@ -265,7 +256,7 @@ function barcode_check(){
                                                        <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                    <!--TMPL_ELSE-->
-                                       <select name="itemstatus" size="1">
+                                       <select name="itemstatus">
                                                <option value="">Item Status</option>
                                                <!-- TMPL_LOOP name="itemstatusloop" -->
                                                <!-- TMPL_IF name="selected" -->
@@ -286,7 +277,7 @@ function barcode_check(){
                        <!--TMPL_IF Name="serialadditems" -->
                                <br /><br />
                                <!-- TMPL_IF Name="itemlocation"-->
-                                       <select name="location" size="1">
+                                       <select name="location">
                                                <option value="">Location</option>
                                                <!-- TMPL_LOOP name="itemlocationloop" -->
                                                <!-- TMPL_IF name="selected" -->
@@ -304,7 +295,7 @@ function barcode_check(){
                </tr>
        <!-- /TMPL_UNLESS -->
        </table>
-       <input type="submit" value="Save changes" accesskey="w" class="button">
+       <input type="submit" value="Save changes" accesskey="w" class="button" />
        <!-- TMPL_IF name="hassubscriptionexpired" -->
                <h3>Subscription has expired.</h3>
                <p><b>Waited last issue status can't be changed. <a href="#" onclick="popup()" class="button">Renew</a> your subscription</b></p>
@@ -321,28 +312,28 @@ function barcode_check(){
 
        <h2>Subscription summary</h2>
        <form method="post" name="f2" action="serials-recieve.pl">
-               <input type="hidden" name="op" value="modsubscriptionhistory">
-               <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
-               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-               <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
+               <input type="hidden" name="op" value="modsubscriptionhistory" />
+               <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
+               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+               <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
                <p><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
-               <p><label>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><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><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></p>
                <p>Missing issues</p>
                <p><textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></p>
                <p>Opac's note</p>
                <p><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></p>
-               <input type="submit" value="Save changes" class="button">
+               <input type="submit" value="Save changes" class="button" />
        </form>
 
-</div>
-
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 3348626..31195d1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -1,15 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</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" />
-<!-- End of additions -->
-
-<!-- Additions to enable Calendar system -->
-<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 -->
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 
 <script type="text/javascript">
 <!--
@@ -727,20 +719,20 @@ window.onload = irregular_order();
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 
 
 <!-- TMPL_IF name="mod" -->
     <h1>Modify a subscription</h1>
-    <form method="post" name="f">
+    <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl">
         <input type="hidden" name="op" value="modsubscription" />
         <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
 <!-- TMPL_ELSE -->
@@ -1141,9 +1133,11 @@ window.onload = irregular_order();
 <!-- /TMPL_IF -->
 </form>
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
index ac07665..e1d6a2d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
@@ -6,7 +6,7 @@
 
 <div id="doc" class="yui-t7">
    <div id="bd">
-       <div class="yui-g">
+       
 
 <h1>Catalogue search</h1>
 
@@ -18,8 +18,6 @@
     <input type="submit" value="Search" />
 </form>
 
-</div>
-</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 6907abf..5259932 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -95,13 +95,13 @@ function popup(subscriptionid) {
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 
     <h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
@@ -374,7 +374,9 @@ function popup(subscriptionid) {
 
 </div>
 </div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl
index 9f3c663..b055d70 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl
@@ -7,12 +7,12 @@
 <!--TMPL_IF Name="renew"-->
   Subscription renewed.
   
-  <script type="text/javascript">
-  <!--
+<script type="text/javascript">
+//<![CDATA[
   opener.document.location.reload();
   self.close();
-  //-->
-  </script>
+  //]]>
+</script>
 <!--TMPL_ELSE-->
 
 <h1>Subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
@@ -26,7 +26,7 @@
                <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>
+               <p><textarea name="note" id="note" rows="10" cols="60"></textarea></p>
                <input type="submit" value="Request a renewal" class="button serial" />
 </form>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl
index 30bf63a..d5b1976 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl
@@ -4,13 +4,13 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
 <h1>Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
                <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">subscription</a>
@@ -33,7 +33,9 @@
                <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/serials/routing.pl b/serials/routing.pl
index 0afa519..c612a78 100755 (executable)
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -114,9 +114,9 @@ for(my $i=0;$i<$routing;$i++){
     for(my $j=1; $j <= $routing; $j++) {
        $rankingbox .= "<option ";
        if($routinglist[$i]->{'ranking'} == $j){
-           $rankingbox .= " selected='SELECTED'";
+           $rankingbox .= " selected=\"selected\"";
        }
-       $rankingbox .= " value='$j'>$j</option>";
+       $rankingbox .= " value=\"$j\">$j</option>";
     }
     $rankingbox .= "</select>";
     $data->{'routingbox'} = $rankingbox;