@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/modules/serials/serials-collection.tt | 27 +++++++++----------- 2 files changed, 13 insertions(+), 16 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -305,7 +305,7 @@ caption { margin : .3em 0; } -span.problem { +.problem { background-color : #FFFFCC; color : #990000; font-weight : bold; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -113,8 +113,7 @@ $(document).ready(function() { Library Call number Notes - [% IF ( routing && CAN_user_serials_routing ) %]Routing[% END %] - Renew +   [% FOREACH subscription IN subscriptions %] @@ -132,28 +131,26 @@ $(document).ready(function() {
Subscription closed [% END %] - [% IF ( routing && CAN_user_serials_routing ) %] - - [% UNLESS subscription.closed %] + [% IF ( subscription.abouttoexpire ) || ( subscription.subscriptionexpired ) %][% ELSE %][% END %] + [% UNLESS subscription.closed %] + [% IF ( routing && CAN_user_serials_routing ) %] [% IF ( subscription.hasRouting ) %] - Edit routing list + Edit routing list [% ELSE %] - Create routing list + Create routing list [% END %] [% END %] - - [% END %] - [% UNLESS subscription.closed %] - [% IF ( subscription.abouttoexpire ) %] Renew + [% IF ( subscription.abouttoexpire ) %] Renew [% ELSE %] - [% IF ( subscription.subscriptionexpired ) %] Renew + [% IF ( subscription.subscriptionexpired ) %] Renew [% ELSE %] -   +   [% END %] [% END %] [% ELSE %] -   +   [% END %] + [% END %] [% IF ( subscr ) %] @@ -304,7 +301,7 @@ $(document).ready(function() { [% IF ( routing ) %] - Print list + Print list [% END %] --