Bug 11214: improve create/edit routing list links in serial collection page

[srvgit] / 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 2bac863..060ecaf 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,8 +1,11 @@
+[% USE Branches %]
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 
@@ -59,15 +62,17 @@ function CheckNone( node ) {
 }
 $(document).ready(function() {
     $('#subscription_years').tabs();
-    [% IF dateformatmetric %]
+    [% IF dateformat == "metric" %]
       dt_add_type_uk_date();
     [% END %]
 
     $(".subscription-year-table").dataTable($.extend(true, {}, dataTablesDefaults, {
         "aoColumnDefs": [
             { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
+            { "sType": "title-string", "aTargets" : [ "title-string" ] }
         ],
         "aaSorting": [[0, 'desc']],
+        "sDom": 't',
         "bAutoWidth": false,
         "bPaginate": false,
         "bInfo": false,
@@ -135,7 +140,11 @@ $(document).ready(function() {
         [% IF ( routing && CAN_user_serials_routing ) %]
         <td>
             [% UNLESS subscription.closed %]
-                <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
+                [% IF ( subscription.hasRouting ) %]
+                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
+                [% ELSE %]
+                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">Create routing list</a>
+                [% END %]
             [% END %]
         </td>
         [% END %]
@@ -196,9 +205,9 @@ $(document).ready(function() {
 [% IF ( subscriptions.size > 1 ) %]
                 <th># Subs</th>
 [% END %]
-                <th>Date published
+                <th class="title-string">Date published
                 </th>
-                <th>Date received
+                <th class="title-string">Date received
                 </th>
                 <th>Number
                 </th>
@@ -235,10 +244,10 @@ $(document).ready(function() {
                  <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid %]">[% serial.subscriptionid %]</a></td>
 [% END %]
                 <td>
-                    [% serial.publisheddate %]
+                    <span title="[% serial.publisheddate %]">[% serial.publisheddate | $KohaDates %]</span>
                 </td>
                 <td>
-                    [% serial.planneddate %]
+                    <span title="[% serial.planneddate %]">[% serial.planneddate | $KohaDates %]</span>
                 </td>
                 <td>
                     [% serial.serialseq %]
@@ -257,11 +266,11 @@ $(document).ready(function() {
                     [% serial.notes %]
                 </td>
                 <td>
-                    [% serial.branchcode %]
+                    [% Branches.GetName( serial.branchcode ) %]
                 </td>
                 [% IF ( routing ) %]
                 <td>
-                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
+                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.publisheddate %])'); return false" >Print list</a>
                 </td>
                 [% END %]
             </tr>