From 81f1a4cbe3585dbe2b9361d3a24b3d8bce44172c Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Sun, 13 Nov 2016 16:49:58 +0000 Subject: [PATCH] Bug 17734: Make possible to pay and writeoff from boraccount page and make action buttons split button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test plan 0) Have a patron with some fines - some payd and some unpaid 1) Apply the patch 2) Go to boraccount.pl page 3) In most right column you should see apropriate combination of buttons for each row: Print - fee which was writted-off and write-off line Pay + Print in dropdown - unpaid fee, for user without permissin to writeoff Pay + Print and Write off in dropdown - unpaid fee, user with permission to writeoff Print + Reverse in dropdown - for payment row 4) Try all combination and use buttons and confirm they work as expected Signed-off-by: Radek Šiman --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 18 ++++++------- .../prog/en/modules/members/boraccount.tt | 31 +++++++++++++++++----- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index ba6c8fb..70a35b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2033,7 +2033,7 @@ ul.ui-tabs-nav li { color: #538200; } -.statictabs ul { +.statictabs > ul { background: none repeat scroll 0 0 transparent; border: 0 none; margin: 0; @@ -2051,17 +2051,17 @@ ul.ui-tabs-nav li { text-decoration: none; } -.statictabs ul:after { +.statictabs > ul:after { clear: both; } -.statictabs ul:before, -.statictabs ul:after { +.statictabs > ul:before, +.statictabs > ul:after { content: ""; display: table; } -.statictabs ul li { +.statictabs > ul li { background: none repeat scroll 0 0 #E6F0F2; border: 1px solid #B9D8D9; border-bottom: 0 none; @@ -2080,14 +2080,14 @@ ul.ui-tabs-nav li { } -.statictabs ul li.active { +.statictabs > ul li.active { background-color: #FFFFFF; color: #212121; font-weight: normal; padding-bottom: 1px; } -.statictabs ul li a { +.statictabs > ul li a { color: #004D99; cursor: pointer; float: left; @@ -2095,14 +2095,14 @@ ul.ui-tabs-nav li { text-decoration: none; } -.statictabs ul li a:hover { +.statictabs > ul li a:hover { background-color : #EDF4F5; border-top-right-radius: 4px; border-top-left-radius: 4px; color : #538200; } -.statictabs ul li.active a { +.statictabs > ul li.active a { color: #000000; font-weight: bold; cursor: text; 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 ca0a804..66f0616 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -108,18 +108,35 @@ $(document).ready(function() { [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount %] [% IF ( account.amountoutstandingcredit ) %][% ELSE %][% END %][% account.amountoutstanding %] - [% IF ( account.payment ) %] - Print +