Merge remote-tracking branch 'origin/new/bug_5347'

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / serials / serials-collection.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt

index 1db30c1..a478461 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -1,5 +1,5 @@
  [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; Serial Collection information for [% bibliotitle %]</title>
+<title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
  [% INCLUDE 'doc-head-close.inc' %]
  
  <script type="text/javascript">
@@ -48,11 +48,11 @@ $(document).ready(function() {
  //]]>
  </script>
  </head>
-<body class="yui-skin-sam">
+<body id="ser_serials-collection" class="yui-skin-sam ser">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'serials-search.inc' %]
  
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial Collection information for  <i>[% bibliotitle %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial collection information for  <i>[% bibliotitle %]</i></div>
  
  <div id="doc3" class="yui-t2">
     
@@ -77,7 +77,7 @@ $(document).ready(function() {
  <caption> Subscription summaries</caption>
  [% END %]
  <tr>
-  <th>Subscription num. </th>
+  <th>Subscription num.</th>
    <th>Frequency</th>
    <th>Numbering pattern</th>
    <th>Library</th>
@@ -127,16 +127,16 @@ $(document).ready(function() {
                      Number
                  [% END %]
                  [% IF ( subscription.numberpattern2 ) %]
-                    Volume, Number, Issue
+                    Volume, number, issue
                  [% END %]
                  [% IF ( subscription.numberpattern3 ) %]
-                    Volume, Number
+                    Volume, number
                  [% END %]
                  [% IF ( subscription.numberpattern4 ) %]
-                    Volume, Issue
+                    Volume, issue
                  [% END %]
                  [% IF ( subscription.numberpattern5 ) %]
-                    Number, Issue
+                    Number, issue
                  [% END %]
                  [% IF ( subscription.numberpattern6 ) %]
                      Seasonal only
@@ -186,6 +186,13 @@ $(document).ready(function() {
  
   [% FOREACH year IN years %]
  <div id="subscription-year-[% year.year %]">
+    [% IF ( CAN_user_serials_receive_serials ) %]
+        <p>
+            <input type="submit" value="Edit serials" />&nbsp;
+            <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
+        </p>
+    [% END %]
+
          <table>
           <tr>
  [% IF ( subscriptions.size > 1 ) %]
@@ -201,7 +208,7 @@ $(document).ready(function() {
                  </th>
                  <th>Notes
                  </th>
-                <th>Branch
+                <th>Library
                  </th>
                  [% IF ( routing ) %]<th>Routing</th>[% END %]
                  [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
@@ -231,7 +238,7 @@ $(document).ready(function() {
                  </td>
                  [% IF ( routing ) %]
                  <td>
-                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %]'); return false" >Print list</a>
+                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
                  </td>
                  [% END %]
              [% IF ( CAN_user_serials_receive_serials ) %]
@@ -254,12 +261,6 @@ $(document).ready(function() {
              </tr>
        [% END %]
          </table>
-    [% IF ( CAN_user_serials_receive_serials ) %]
-        <p>
-            <input type="submit" value="Edit serials" />&nbsp;
-            <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
-        </p>
-    [% END %]
      </div>
      [% END %]
    <input type="hidden" name="subscriptionid" value="[% subscriptionidlist %]" />