From 262a3521a65634e83afc0a7809550f2601c5be5a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 2 Dec 2014 12:02:50 +0100 Subject: [PATCH 4/9] Bug 13371: Reintroduce the action buttons Confirm the the "New basket" and "Receive shipment" buttons work as before. Signed-off-by: Paola Rossi --- koha-tmpl/intranet-tmpl/prog/en/css/datatables.css | 17 +++++++++++++++++ .../prog/en/modules/acqui/booksellers.tt | 13 ++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css index ee95fd8..66bc036 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css @@ -249,6 +249,23 @@ table.group td.group { background-color: #D1CFD0; border-bottom: 2px solid #A19B9E; border-top: 2px solid #A19B9E; + font-weight: bold; +} + +table.group tr.odd td { + background-color : #F3F3F3; + border : 1px solid #BCBCBC; + border-right : 1px solid #BCBCBC; +} + +table.group tr.even td { + background-color: #FFF; + border-right : 1px solid #BCBCBC; +} + +table.group td.group .action { + float: right; + font-weight: normal; } table.group tr.odd td { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1887cb8..7b5a770 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -132,7 +132,18 @@ $(document).ready(function() { [% ELSE %] [% END %] - [% supplier.name %] ([% supplier.booksellerid %]) + + [% supplier.name %] + ([% supplier.booksellerid %]) + + [% IF ( CAN_user_acquisition_order_manage ) %] + [% IF ( supplier.active ) %] + New basket + [% END %] + [% END %] + Receive shipment + + [% basket.basketno %] [% basket.basketname %] -- 1.7.10.4