Bugzilla – Attachment 50770 Details for
Bug 16235
Making borrower account actions buttons
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16235: Making borrower account actions buttons
Bug-16235-Making-borrower-account-actions-buttons.patch (text/plain), 4.85 KB, created by
Aleisha Amohia
on 2016-04-27 00:22:56 UTC
(
hide
)
Description:
Bug 16235: Making borrower account actions buttons
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2016-04-27 00:22:56 UTC
Size:
4.85 KB
patch
obsolete
>From 0f7e96feeeda1db9bde483ad33176ecbd69d1015 Mon Sep 17 00:00:00 2001 >From: Aleisha <aleishaamohia@hotmail.com> >Date: Mon, 11 Apr 2016 02:10:54 +0000 >Subject: [PATCH] Bug 16235: Making borrower account actions buttons >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >EDIT: Fixing some indenting and adding actions class to the cells so the buttons don't wrap >EDIT: Comment 6 >EDIT: Moving the buttons into one column >EDIT: Fixing typo and js error >EDIT: removing tabs > >To test: >1) Go to a borrower's account page who has paid fines before > a) Confirm column heading is now 'Actions' and covers both Reverse column and Print column > b) Confirm Reverse and Print show as buttons and work as expected >2) Go to a borrower's account page who has never paid fines (or create a new borrower) > a) Create a manual credit (just to put something in their account) > b) Go back to their account page > c) Confirm the Reverse column does not show as the column heading for Print is (since there is only one action in this column and it's written on every button) > d) Confirm Print shows as a button and works as expected > >Sponsored-by: Catalyst IT > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../prog/en/modules/members/boraccount.tt | 40 +++++++++----------- > 1 file changed, 18 insertions(+), 22 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index 09b5c67..cbfb7c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -14,7 +14,8 @@ $(document).ready(function() { > 'aaSorting': [[0, 'desc']], > "sDom": 'C<"top pager"ilpf><"#filter_c">tr<"bottom pager"ip>', > "aoColumnDefs": [ >- { "sType": "title-string", "aTargets" : [ "title-string" ] } >+ { "sType": "title-string", "aTargets" : [ "title-string" ] }, >+ { "bSortable": false, "bSearchable": false, "aTargets": [-1] } > ] > })); > $("#filter_c").html('<p><a href="#" id="filter_transacs">'+txtActivefilter+'</a>'); >@@ -66,9 +67,10 @@ $(document).ready(function() { > <th>Amount</th> > <th>Outstanding</th> > [% IF ( reverse_col ) %] >+ <th>Actions</th> >+ [% ELSE %] > <th> </th> > [% END %] >- <th>Print</th> > </tr> > </thead> > >@@ -104,21 +106,19 @@ $(document).ready(function() { > <td>[% account.note | html_line_break %]</td> > [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount %]</td> > [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td> >- [% IF ( reverse_col ) %] >- <td> >- [% IF ( account.payment ) %] >- <a href="boraccount.pl?action=reverse&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]">Reverse</a> >- [% ELSE %] >- >- [% END %] >- </td> >- [% END %] >-<td> >- [% IF ( account.payment ) %] >- <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]">Print</a> >- [% ELSE %] >- <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]">Print</a> >- [% END %] >+ <td class="actions"> >+ [% IF ( account.payment ) %] >+ <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a> >+ [% ELSE %] >+ <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a> >+ [% END %] >+ [% IF ( reverse_col) %] >+ [% IF ( account.payment ) %] >+ <a href="boraccount.pl?action=reverse&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-undo"></i> Reverse</a> >+ [% ELSE %] >+ >+ [% END %] >+ [% END %] > </td> > </tr> > >@@ -131,11 +131,7 @@ $(document).ready(function() { > [% ELSE %] > <td class="debit"style="text-align: right;">[% total %]</td> > [% END %] >- [% IF ( reverse_col ) %] >- <td colspan="2"></td> >- [% ELSE %] >- <td></td> >- [% END %] >+ <td></td> > </tr> > </tfoot> > </table> >-- >1.7.10.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 16235
:
50102
|
50137
|
50139
|
50247
|
50300
|
50305
|
50545
|
50684
|
50770
|
50793
|
50794