From 2378059720d6c2cc9a4a46961555ec51cad7926a Mon Sep 17 00:00:00 2001 From: Aleisha Date: Mon, 11 Apr 2016 02:10:54 +0000 Subject: [PATCH] [PASSED QA] 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 Followed test plan. White spaces OK. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- .../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('

'+txtActivefilter+''); @@ -66,9 +67,10 @@ $(document).ready(function() { Amount Outstanding [% IF ( reverse_col ) %] + Actions + [% ELSE %]   [% END %] - Print @@ -104,21 +106,19 @@ $(document).ready(function() { [% account.note | html_line_break %] [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount %] [% IF ( account.amountoutstandingcredit ) %][% ELSE %][% END %][% account.amountoutstanding %] - [% IF ( reverse_col ) %] - - [% IF ( account.payment ) %] - Reverse - [% ELSE %] -   - [% END %] - - [% END %] - - [% IF ( account.payment ) %] - Print - [% ELSE %] - Print - [% END %] + + [% IF ( account.payment ) %] + Print + [% ELSE %] + Print + [% END %] + [% IF ( reverse_col) %] + [% IF ( account.payment ) %] + Reverse + [% ELSE %] +   + [% END %] + [% END %] @@ -131,11 +131,7 @@ $(document).ready(function() { [% ELSE %] [% total %] [% END %] - [% IF ( reverse_col ) %] - - [% ELSE %] - - [% END %] + -- 1.9.1