Bugzilla – Attachment 61661 Details for
Bug 16939
Making all 'add to basket' actions buttons
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16939: Making all 'add to basket' actions buttons
Bug-16939-Making-all-add-to-basket-actions-buttons.patch (text/plain), 13.65 KB, created by
Marc Véron
on 2017-03-28 14:08:15 UTC
(
hide
)
Description:
Bug 16939: Making all 'add to basket' actions buttons
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2017-03-28 14:08:15 UTC
Size:
13.65 KB
patch
obsolete
>From 121508a2f6a24ea482fc25cced85c072077fa69f Mon Sep 17 00:00:00 2001 >From: Aleisha <aleishaamohia@hotmail.com> >Date: Tue, 19 Jul 2016 05:03:45 +0000 >Subject: [PATCH] Bug 16939: Making all 'add to basket' actions buttons >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Edit: Fixing 'clas' typo in addorderiso2709.tt >Edit: Adding actions class to td >Edit: Fixing js error >Edit: circ/reserveratios.tt updated so that the plus icon doesn't show > if there is no link >Edit: fixing logic in circ/reserveratios.tt >Edit: merge conflicts >Edit: updating buttons to bootstrap 3, which i believe fixes the problem > in comment 16 > >To test: > >1) Go to Acqui -> find a vendor -> view a basket >2) Click add to basket -> fill in 'for an existing record' and hit search >3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons >4) Click Order >5) Click add item when you are redirected to the New order page (no need to fill in any details) >6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons >7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch) >8) Confirm that 'Order' shows as a button with appropriate icon >9) Go back to your basket and click add to basket -> from an external source >10) fill in any fields and click search to bring up results >11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row >12) Go back to your basket and click add to basket -> from a staged file >13) 'Add orders' should now show as a button with appropriate icon >14) Go back to your basket and click add to basket -> from titles with highest hold ratios >15) 'X to order' should now show as a button with appropriate icon > >Sponsored-by: Catalyst IT > >Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> > >Followed test plan, works as expected. >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 13 ++++--------- > .../prog/en/modules/acqui/neworderempty.tt | 3 +-- > .../prog/en/modules/acqui/newordersubscription.tt | 6 +++--- > .../prog/en/modules/acqui/z3950_search.tt | 18 ++++++++++++++---- > .../prog/en/modules/circ/reserveratios.tt | 14 ++++++++++++-- > koha-tmpl/intranet-tmpl/prog/js/additem.js | 7 +++---- > 7 files changed, 38 insertions(+), 25 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index fe420c4..695a9ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -572,7 +572,7 @@ > </td> > <td><span title="[% batch_lis.staged_date %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</span></td> > <td>[% batch_lis.num_records %]</td> >- <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]">Add orders</a></td> >+ <td class="actions"><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a></td> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 3796d18..6aadd69 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -66,8 +66,7 @@ > <th>Summary</th> > <th>Publisher</th> > <th>Copyright</th> >- <th> </th> >- <th> </th> >+ <th>Actions</th> > </tr> > </thead> > <tbody> >@@ -89,13 +88,9 @@ > <td> > [% biblio.copyrightdate %] > </td> >- <td> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber %]&viewas=html" class="previewMARC">View MARC</a> >- </td> >- <td> >- <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&biblionumber=[% biblio.biblionumber %]" title="Order this one"> >- Order >- </a> >+ <td class="actions"> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber %]&viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a> >+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&biblionumber=[% biblio.biblionumber %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 7feb3d9..d22f976 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -423,8 +423,7 @@ $(document).ready(function() > <table> > <thead> > <tr> >- <th> </th> >- <th> </th> >+ <th>Actions</th> > <th>Barcode</th> > <th>Home library</th> > <th>Holding library</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index b97b20a..b3c1563 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -94,12 +94,12 @@ > <span title="0000-00-00"></span> > [% END %] > </td> >- <td> >+ <td class="actions"> > [% IF (sub.alreadyOnOrder) %] > Outstanding order (only one order per subscription is allowed) > [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%] >- <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&biblionumber=[% sub.biblionumber %]&subscriptionid=[% sub.subscriptionid %]" title="Order this one"> >- Order >+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&biblionumber=[% sub.biblionumber %]&subscriptionid=[% sub.subscriptionid %]" title="Order this one" class="btn btn-default btn-xs"> >+ <i class="fa fa-plus"></i> Order > </a> > [% ELSE %] > <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index ddf104a..74167f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -131,8 +131,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <th>Author</th> > <th>ISBN</th> > <th>LCCN</th> >- <th>Preview</th> >- <th> </th> >+ <th> </th> >+ <th> </th> > </tr></thead> > <tbody>[% FOREACH breeding_loo IN breeding_loop %] > [% IF ( breeding_loo.breedingid ) %] >@@ -143,8 +143,18 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <td>[% breeding_loo.author %]</td> > <td>[% breeding_loo.isbn %]</td> > <td>[% breeding_loo.lccn %]</td> >- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid %]" title="Card" class="previewData">Card</a></td> >- <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order</a></td> >+ <td> >+ <div class="dropdown"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="z3950preview[% breeding_loo.breedingid %]" role="button" data-toggle="dropdown" href="#"> >+ Preview <b class="caret"></b> >+ </a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid %]"> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li> >+ </ul> >+ </div> >+ </td> >+ <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&breedingid=[% breeding_loo.breedingid %]&booksellerid=[% booksellerid %]&basketno=[% basketno %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td> > > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index ec92cb7..13993fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -111,8 +111,18 @@ > [% END %] > </ul> > </td> >- <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber %]&booksellerid=[% booksellerid %]&basketno=[% basketno %]&rr_quantity_to_order=[% reserveloo.ratiocalc %]">[% END %]<b>[% reserveloo.ratiocalc %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %] >- [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders %] pending</b>[% END %]</p>[% END %]</td> >+ <td class="actions"> >+ <p> >+ [% IF ( reserveloo.thisratio_atleast1 ) %] >+ [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc %] --> >+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber %]&booksellerid=[% booksellerid %]&basketno=[% basketno %]&rr_quantity_to_order=[% reserveloo.ratiocalc %]" class="btn btn-default btn-xs"><b><i class="fa fa-plus"></i> [% reserveloo.ratiocalc %] to order</b></a> >+ [% END %] >+ [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders %] pending</b>[% END %] >+ [% ELSE %] >+ 0 to order >+ [% END %] >+ </p> >+ </td> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js >index 0f93310..59a5e3b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/additem.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/additem.js >@@ -87,13 +87,12 @@ function constructTrNode(index, unique_item_fields) { > 'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes']; > > var result = "<tr idblock='" + index + "'>"; >- var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");'>" >+ var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");' class='btn btn-default btn-xs'><i class='fa fa-pencil'></i> " > + (window.MSG_ADDITEM_JS_EDIT || "Edit") + "</a>"; > var del_link = "<a style='cursor:pointer' " >- + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");'>" >+ + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-default btn-xs'><i class='fa fa-trash'></i> " > + (window.MSG_ADDITEM_JS_DELETE || "Delete") + "</a>"; >- result += "<td>" + edit_link + "</td>"; >- result += "<td>" + del_link + "</td>"; >+ result += "<td class='actions'>" + edit_link + " " + del_link + "</td>"; > for(i in fields) { > var field = fields[i]; > var field_elt = $("#" + index) >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16939
:
53484
|
53538
|
53545
|
53565
|
53716
|
53791
|
54494
|
57874
|
61206
|
61655
|
61661
|
75641
|
80791
|
80792
|
80999
|
82986
|
82987
|
82988
|
83133
|
83134
|
83135