From 6e120941c3289faacac8460c0a0de129dfdc3e4c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Jan 2013 10:59:46 -0500 Subject: [PATCH] [SIGNED-OFF] Bug 9625 - Replace YUI buttons and menus on reports pages with Bootstrap This patch converts the toolbar include file used by guided/SQL report pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in reports/ which uses reports-toolbar.inc (Saved reports, Guided reports, SQL reports). Buttons and menus should look correct and work correctly. Signed-off-by: Bernardo Gonzalez Kriegel Comment: Works as described. No errors. --- .../prog/en/includes/reports-toolbar.inc | 59 ++++++-------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index a4e4226..5d93b20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -1,44 +1,17 @@ -[% UNLESS ( no_add ) %] -
- - -
    - [% IF ( CAN_user_reports_create_reports ) %]
  • New guided report
  • [% END %] -
  • New SQL report
  • - [% IF ( showsql || execute || editsql || save_successful ) %] - [% UNLESS ( errors ) %][%# Unless there are errors saving a report %] - [% UNLESS ( editsql ) %][%# Do not show edit button on edit page %] - [% IF ( CAN_user_reports_create_reports ) %]
  • Edit
  • [% END %] - [% END %] -
  • Run report
  • - [% END %] - [% END %] -
+
+ [% IF ( CAN_user_reports_create_reports ) %]
+ + +
[% END %] +[% IF ( showsql || execute || editsql || save_successful ) %]xx + [% UNLESS ( errors ) %][%# Unless there are errors saving a report %] + [% UNLESS ( editsql ) %][%# Do not show edit button on edit page %] + [% IF ( CAN_user_reports_create_reports ) %][% END %] + [% END %] + + [% END %] +[% END %]
-[% END %] \ No newline at end of file -- 1.7.9.5