Attachment 53543 Details for Bug 16874 – Bug 16874: Making serials collections actions buttons

[patch] Bug 16874: Making serials collections actions buttons

Bug-16874-Making-serials-collections-actions-butto.patch (text/plain), 5.62 KB, created by Aleisha Amohia on 2016-07-20 23:02:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2016-07-20 23:02:47 UTC

Size: 5.62 KB

patch

obsolete

>From fadb6d9e6f1ae94ed6b3d4627007e0a1d5fd6588 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Thu, 7 Jul 2016 22:20:55 +0000
>Subject: [PATCH] Bug 16874: Making serials collections actions buttons
>
>To test:
>1) Go to serials -> Search a subscription (or make a new one)
>2) Ensure that subscription has an end-date that has passed or will pass soon
>3) Go to Serials collection (left sidebar menu)
>4) Ensure that Subscription summary table has two buttons, Create routing list and Renew. These buttons should be bolded and the table cell highlighted
>5) Ensure 'Print list' is a button in year tables below
>6) Edit subscription to have a later end-date (will not expire soon)
>7) Go back to serials collection
>8) Ensure that table cell is no longer highlighted and buttons not bolded. Renew button should not be there.
>9) Ensure that both buttons do not wrap when the browser is narrow
>
>Sponsored-by: Catalyst IT
>---
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
> .../prog/en/modules/serials/serials-collection.tt | 29 +++++++++-----------
> 2 files changed, 14 insertions(+), 17 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index 525cd0e..de0e492 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/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;
>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 9a79eca..f723626 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
>@@ -113,8 +113,7 @@ $(document).ready(function() {
> <th>Library</th>
> <th>Call number</th>
> <th>Notes</th>
>- [% IF ( routing && CAN_user_serials_routing ) %]<th>Routing</th>[% END %]
>- <th>Renew</th>
>+ <th>&nbsp;</th>
> </tr>
> [% FOREACH subscription IN subscriptions %]
> <tr>
>@@ -132,28 +131,26 @@ $(document).ready(function() {
> Subscription closed
> [% END %]
> </td>
>- [% IF ( routing && CAN_user_serials_routing ) %]
>- <td>
>- [% UNLESS subscription.closed %]
>+ [% IF ( subscription.abouttoexpire ) || ( subscription.subscriptionexpired ) %]<td class="problem actions">[% ELSE %]<td class="actions">[% END %]
>+ [% UNLESS subscription.closed %]
>+ [% IF ( routing && CAN_user_serials_routing ) %]
> [% IF ( subscription.hasRouting ) %]
>- <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
>+ <a class="btn btn-mini" 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>
>+ <a class="btn btn-mini" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new"> Create routing list</a>
> [% END %]
> [% END %]
>- </td>
>- [% END %]
>- [% UNLESS subscription.closed %]
>- [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
>+ [% IF ( subscription.abouttoexpire ) %]<a class="btn btn-mini" href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;"> Renew</a>
> [% ELSE %]
>- [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
>+ [% IF ( subscription.subscriptionexpired ) %]<a class="btn btn-mini" href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;"> Renew</a>
> [% ELSE %]
>- <td> &nbsp;</td>
>+ &nbsp;
> [% END %]
> [% END %]
> [% ELSE %]
>- <td> &nbsp;</td>
>+ &nbsp;
> [% END %]
>+ </td>
> </tr>
> [% END %]
> [% IF ( subscr ) %]
>@@ -303,8 +300,8 @@ $(document).ready(function() {
> [% Branches.GetName( serial.branchcode ) %]
> </td>
> [% IF ( routing ) %]
>- <td>
>- <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" >Print list</a>
>+ <td class="actions">
>+ <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-mini"> Print list</a>
> </td>
> [% END %]
> </tr>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16874: 53208 | 53543 | 54946 | 54961