Attachment 48918 Details for Bug 16038 – Bug 16038: Moving basketgroups actions into dropdown menus

[patch] Bug 16038: Moving basketgroups actions into dropdown menus

Bug-16038-Moving-basketgroups-actions-into-dropdow.patch (text/plain), 7.92 KB, created by Aleisha Amohia on 2016-03-10 04:18:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2016-03-10 04:18:17 UTC

Size: 7.92 KB

patch

obsolete

>From abf4790ace735f482b671ff53d9c46aa58aa2acd Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Thu, 10 Mar 2016 04:14:25 +0000
>Subject: [PATCH] Bug 16038: Moving basketgroups actions into dropdown menus
>
>To test:
>1) Go to Acquisitions
>2) Go to the basket groups of a vendor (ie basketgroup.pl)
>3) Confirm that for OPEN basket groups, all actions ('Close basket group and print' (NOTICE changed wording for clarity), 'Edit' and 'Delete') are in drop down and behave as expected
>4) Confirm that for CLOSED basket groups, all actions ('View', 'Reopen', 'Print' and 'Export as CSV') are in drop down and behave as expected
>
>Sponsored-by: Catalyst IT
>---
> .../prog/en/modules/acqui/basketgroup.tt           |   30 ++++++++++++++------
> 1 file changed, 21 insertions(+), 9 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index 0bdd830..1efca35 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -320,7 +320,7 @@ function submitForm(form) {
>                                         <th>Billing place</th>
>                                         <th>Delivery place</th>
>                                         <th>Number of baskets</th>
>-                                        <th>Action</th>
>+                                        <th>&nbsp;</th>
>                                     </tr>
>                                 </thead>
>                                 <tbody>
>@@ -338,9 +338,15 @@ function submitForm(form) {
>                                                 <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
>                                                 <td>[% basketgroup.basketsqty %]</td>
>                                                 <td>
>-                                                    <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
>+                                                  <div class="dropdown">
>+                                                    <a class="btn btn-mini dropdown-toggle" id="openbasketgroupactions[% basketgroup.id %]" role="button" data-toggle="dropdown" href="#">
>+                                                      Actions <b class="caret"></b></a>
>+                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="openbasketgroupactions[% basketgroup.id %]">
>+                                                      <li><a onclick="closeandprint('[% basketgroup.id %]');"><i class="fa fa-print"></i> Close basket group and print</a></li>
>+                                                      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-pencil"></i> Edit</a></li>
>+                                                      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                                                    </ul>
>+                                                  </div>
>                                                 </td>
>                                             </tr>
>                                         [% END %]
>@@ -357,7 +363,7 @@ function submitForm(form) {
>                                         <th>Billing place</th>
>                                         <th>Delivery place</th>
>                                         <th>Number of baskets</th>
>-                                        <th>Action</th>
>+                                        <th>&nbsp;</th>
>                                     </tr>
>                                 </thead>
>                                 <tbody>
>@@ -376,10 +382,16 @@ function submitForm(form) {
>                                                 <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
>                                                 <td>[% basketgroup.basketsqty %]</td>
>                                                 <td>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
>-                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
>+                                                  <div class="dropdown">
>+                                                    <a class="btn btn-mini dropdown-toggle" id="closedbasketgroupactions[% basketgroup.id %]" role="button" data-toggle="dropdown" href="#">
>+                                                      Actions <b class="caret"></b></a>
>+                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="closedbasketgroupactions[% basketgroup.id %]">
>+                                                      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-eye"></i> View</a></li>
>+                                                      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-repeat"></i> Reopen</a></li>
>+                                                      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Print</a></li>
>+                                                      <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id %]"><i class="fa fa-upload"></i> Export as CSV</a></li>
>+                                                    </ul>
>+                                                  </div>
>                                                 </td>
>                                             </tr>
>                                         [% END %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16038: 48918