Attachment 15827 Details for Bug 9674 – [PASSED QA] Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap

[patch] [PASSED QA] Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap

PASSED-QA-Bug-9674---Replace-YUI-buttons-and-menu-.patch (text/plain), 5.49 KB, created by Katrin Fischer on 2013-03-02 17:09:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-03-02 17:09:47 UTC

Size: 5.49 KB

patch

obsolete

>From 8e9fcd98850ba23a4b5aba3b8c53ea741089f3c5 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 20 Feb 2013 12:58:46 -0500
>Subject: [PATCH] [PASSED QA] Bug 9674 - Replace YUI buttons and menu on
> acquisitions pages with Bootstrap
>
>This patch converts the toolbar on acquisitions pages to Bootstrap,
>replacing YUI button code with Bootstrap markup.
>
>To test, view acquisitions pages and confirm that buttons look correct
>and work correctly:
>
>- acqui-home.pl (Acquisitions home page)
>- booksellers.pl (Acquisitions -> Vendor search)
>- supplier.pl (Acquisitions -> Vendor search -> Vendor)
>- aqcontract.pl (Acquisitions -> Vendor search -> Vendor -> Contracts)
>- uncertainprice.pl (Aquisitions -> Vendor search -> Vendor -> Uncertain
>  prices)
>
>View these pages for vendors with and without orders.
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>
>Comment: Buttons works. No errors.
>Tested vendors with and without orders (delete button in last case)
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Works nicely, changes are consistent.
>---
> .../prog/en/includes/acquisitions-toolbar.inc      |   66 +++++++++-----------
> 1 file changed, 31 insertions(+), 35 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>index c0654fb..5308b5a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
>@@ -1,44 +1,40 @@
>-<div id="toolbar"><script type="text/javascript">
>-    //<![CDATA[
>-
>-    // prepare DOM for YUI Toolbar
>-
>-    $(document).ready(function() {
>-        yuiToolbar();
>-    });
>-
>-    // YUI Toolbar Functions
>-
>-    function yuiToolbar() {
>-        new YAHOO.widget.Button("editsupplier");
>-        new YAHOO.widget.Button("deletesupplier");
>-        new YAHOO.widget.Button("receive");
>-        [% UNLESS ( booksellerid ) %]new YAHOO.widget.Button("newvendor");[% END %]
>-
>-        var newmenu = [
>+<script type="text/javascript">
>+//<![CDATA[
>+function confirm_deletion() {
>+    if (confirm(_("Are you sure you want to delete this vendor?"))) {
>+        window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=delete";
>+    }
>+}
>+//]]>
>+</script>
>+<div id="toolbar" class="btn-toolbar">
>+    [% IF ( booksellerid ) %]
>+        <div class="btn-group">
>+        <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-plus"></i> New
>+        <span class="caret"></span>
>+        </a>
>+        <ul class="dropdown-menu">
>             [% IF ( CAN_user_acquisition_order_manage ) %]
>-                { text: _("Basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"},
>+                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">Basket</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_acquisition_contracts_manage ) %]
>+                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Contract</a></li>
>             [% END %]
>-            [% IF ( CAN_user_acquisition_contracts_manage ) %]{ text: _("Contract"), url: "/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]"},[% END %]
>-            { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?op=enter"}
>-        ]
>-        new YAHOO.widget.Button({type: "menu", label: _("New"), name: "newmenu", menu: newmenu, container: "newmenuc"});
>-    }
>-
>-    //]]>
>-    </script>
>-    <ul id="toolbar-list" class="toolbar">
>-        [% IF ( booksellerid ) %]
>             [% IF ( CAN_user_acquisition_vendors_manage ) %]
>-                <li id="newmenuc"></li>
>-                <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter">Edit vendor</a></li>
>+                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
>+            [% END %]
>+        </ul>
>+        </div>
>+            [% IF ( CAN_user_acquisition_vendors_manage ) %]
>+                <div class="btn-group"><a class="btn btn-small" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter"><i class="icon-pencil"></i> Edit vendor</a></div>
>                 [% UNLESS ( basketcount OR subscriptioncount ) %]
>-                    <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete vendor</a></li>
>+                    <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>
>                 [% END %]
>             [% END %]
>-                [% IF ( CAN_user_acquisition_order_receive && basketcount ) %]<li><a id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Receive shipments</a></li>[% END %]
>+            [% IF ( CAN_user_acquisition_order_receive && basketcount ) %]
>+                <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>
>+            [% END %]
>         [% ELSE %]
>-            <li><a id="newvendor" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li>
>+            <div class="btn-group"><a class="btn btn-small" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="icon-plus"></i> New vendor</a></div>
>         [% END %]
>-    </ul>
> </div>
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 9674: 15639 | 15640 | 15827