From aa3ff32c9d66c530af8a16246dd047a33eb69297 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Jan 2013 09:39:38 -0500 Subject: [PATCH] Bug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap This patch converts the toolbar include file used by Serials pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in serials/ which uses serials-toolbar.inc (subscription-detail.pl, serials-home.pl, etc). Buttons and menus should look correct and work correctly, including: - New subscription - Edit subscription - Edit as new (duplicate) - Delete subscription - Renew - Receive - Close Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described. No errors. For me it would be better to use icon-remove, because icon-remove-circle shows a little cross, think that a bigger cross is more clear. Signed-off-by: Katrin Fischer Works nicely, no problems found. I think there is a point in differentiating between closing and deleting, so the icon-remove-circle is maybe not ideal, but the icon-remove would falsely indicate a delete. Maybe we can find another icon that expresses the functionality a bit better later on. Signed-off-by: Jared Camins-Esakov --- .../prog/en/includes/serials-toolbar.inc | 108 +++++++----------- 1 file changed, 40 insertions(+), 68 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 0e7497dded..efc32dd9f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,4 +1,4 @@ -
-
    +
    + [% IF ( CAN_user_serials_create_subscription ) %] [% IF ( biblionumber_for_new_subscription ) %] -
  • New subscription
  • + [% ELSE %] -
  • New subscription
  • + [% END %] [% END %] @@ -83,37 +49,43 @@ onclick: {fn:function(){popup([% subscriptionid %])}} [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] [% UNLESS ( cannotedit ) %] -
  • Edit
  • +
    + + +
    [% END %] [% END %] - [% IF ( CAN_user_serials_create_subscription ) %] -
  • Duplicate
  • - [% END %] - [% UNLESS ( cannotedit ) %] [% UNLESS closed %] [% IF ( CAN_user_serials_renew_subscription ) %] -
  • Renew
  • + [% END %] [% END %] [% IF ( CAN_user_serials_receive_serials ) %] [% UNLESS closed %] -
  • Receive
  • + [% END %] [% END %] [% IF CAN_user_serials_edit_subscription %] [% IF closed %] -
  • Reopen
  • + [% ELSE %] -
  • Close
  • + [% END %] [% END %] - [% IF ( CAN_user_serials_delete_subscription ) %] -
  • Delete
  • - [% END %] [% END %] [% END %] [% END %] -
-- 2.39.5