From ebf593f6d70efc54dfc0be6f85c0dbaebf0d312e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 12 Sep 2012 14:02:19 -0400 Subject: [PATCH] Bug 8715 [Follow-up] Receiving all serials for a year Content-Type: text/plain; charset="utf-8" Follow-up: For consistency, I would prefer to have the column of checkboxes at the beginning of the table and the select/clear links above. --- .../prog/en/modules/serials/serials-collection.tt | 56 +++++++++----------- 1 file changed, 25 insertions(+), 31 deletions(-) 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 fc658c3..f8f1a84 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -60,7 +60,7 @@ $(document).ready(function() { $(".subscription-year-table").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ - { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, + { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, ], "bAutoWidth": false, "bPaginate": false, @@ -216,10 +216,16 @@ $(document).ready(function() {

[% END %] - + + Select all + | + + Clear all + + [% IF ( CAN_user_serials_receive_serials ) %][% END %] [% IF ( subscriptions.size > 1 ) %] [% END %] @@ -236,23 +242,28 @@ $(document).ready(function() { [% IF ( routing ) %][% END %] - [% IF ( CAN_user_serials_receive_serials ) %] - - [% END %] [% FOREACH serial IN year.serials %] [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + [% IF ( CAN_user_serials_receive_serials ) %] + + [% END %] [% IF ( subscriptions.size > 1 ) %] [% END %] @@ -279,23 +290,6 @@ $(document).ready(function() { Print list [% END %] - [% IF ( CAN_user_serials_receive_serials ) %] - - [% END %] [% END %] -- 1.7.9.5
Edit# SubsLibrary Routing - - - Select all - - - Clear all - - -
+ [% IF ( serial.cannotedit ) %] + disabled + [% ELSE %] + [% IF ( serial.subscriptionexpired ) %] + + [% ELSE %] + [% IF ( serial.checked ) %] + + [% ELSE %] + + [% END %] + [% END %] + [% END %] + [% serial.subscriptionid %] - [% IF ( serial.cannotedit ) %] - disabled - [% ELSE %] - [% IF ( serial.subscriptionexpired ) %] - - [% ELSE %] - [% IF ( serial.checked ) %] - - [% ELSE %] - - [% END %] - [% END %] - [% END %] -