Bug 2365 : Inner counter not properly set for serials subscriptions not starting...

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / serials / serials-collection.tmpl

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 296d0a2..f32c776 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,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Serial Collection information for <!-- TMPL_VAR name="bibliotitle" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
+
 <script type="text/javascript">
 //<![CDATA[
 function addsubscriptionid()
@@ -31,7 +31,7 @@ function popup(subscriptionid) {
 }
 
 $(document).ready(function() {
-       $('#subscription_years').tabs();
+       $('#subscription_years > ul').tabs();
 });
  
 
@@ -68,14 +68,15 @@ $(document).ready(function() {
   <th>Subscription Num. </th>
   <th>Frequency</th>
   <th>Numbering pattern</th>
-  <th>Branch</th>
+  <th>Library</th>
   <th>Call Number</th>
   <th>Notes</th>
+  <th>Routing</th>
   <th>Renew</th>
 </tr>
 <!--TMPL_LOOP Name="subscriptions"-->
        <tr>
-      <td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">#<!-- TMPL_VAR name="subscriptionid" --></a> </td>
+      <td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->"># <!-- TMPL_VAR name="subscriptionid" --></a> </td>
       <td>         <!--TMPL_IF name="periodicity1" -->
                         1/day
                 <!-- /TMPL_IF -->
@@ -136,9 +137,10 @@ $(document).ready(function() {
         <td> <!-- TMPL_VAR name="notes" -->        <!--TMPL_IF name="subscriptionexpired"--><br /><span class="problem"> Subscription Expired</span>
         <!--/TMPL_IF-->
         </td>
-        <!--TMPL_IF name="abouttoexpire"--><td class="problem"> <a onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew</a></td>
+                       <td><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a></td>
+        <!--TMPL_IF name="abouttoexpire"--><td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->); return false;">Renew</a></td>
         <!--TMPL_ELSE-->
-        <!--TMPL_IF name="subscriptionexpired"--><td class="problem"> <a onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew</a></td>
+        <!--TMPL_IF name="subscriptionexpired"--><td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->) return false;">Renew</a></td>
         <!--TMPL_ELSE-->
         <td> &nbsp;</td>
         <!--/TMPL_IF-->
@@ -147,8 +149,9 @@ $(document).ready(function() {
       </tr>
 <!--/TMPL_LOOP -->
 <!--TMPL_IF Name="subscr"-->
+<!--TMPL_UNLESS Name="onesubscription"-->
 <tr ><td colspan="7">  <a href="serials-collection.pl?biblionumber=<!--TMPL_VAR Name="biblionumber" -->">See any subscription attached to this biblio</a></td>
-</tr>
+</tr><!-- /TMPL_UNLESS -->
 <!--/TMPL_IF-->
 </table>
 <!--/TMPL_IF -->
@@ -169,8 +172,7 @@ $(document).ready(function() {
         <table width="400px">
             <tr>
 <!--TMPL_UNLESS Name="onesubscription"-->
-                <th> # Subs.
-                </th>
+                <th># Subs</th>
 <!--/TMPL_UNLESS-->
                 <th>Date published
                 </th>
@@ -202,7 +204,7 @@ $(document).ready(function() {
                     <!-- TMPL_VAR Name="serialseq" -->
                 </td>
                 <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="status5" -->Not Available<!-- /TMPL_IF --><!-- TMPL_IF Name="status7" -->Claimed<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status1" -->Expected<!-- /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="status5" -->Not Available<!-- /TMPL_IF --><!-- TMPL_IF Name="status7" -->Claimed<!-- /TMPL_IF -->
                 </td>
                 <td>
                     <!-- TMPL_VAR Name="notes" -->