From 2c515a8c67f46fd07688884eadde78597ca61ed3 Mon Sep 17 00:00:00 2001 From: Julian Maurice <julian.maurice@biblibre.com> Date: Tue, 20 Aug 2019 10:56:07 +0200 Subject: [PATCH] Bug 11708: Use bootstrap grid instead of yui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> --- .../prog/en/modules/acqui/basketgroups.tt | 156 ++++++++++----------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt index d7bd897..6848abb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt @@ -29,90 +29,90 @@ Basket groups </div> - <div id="doc3" class="yui-t2"> - <div id="bd"> - <div id="yui-main"> - <div class="yui-b"> - [% IF bookseller %] - <div id="toolbar" class="btn-toolbar"> - <div class="btn-group"> - <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% bookseller.id | $raw %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a> - </div> + <div class="main container-fluid"> + <div class="row"> + <div class="col-sm-10 col-sm-push-2"> + [% IF bookseller %] + <div id="toolbar" class="btn-toolbar"> + <div class="btn-group"> + <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% bookseller.id | $raw %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a> </div> + </div> - <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a></h1> - [% END %] + <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a></h1> + [% END %] - [% IF basketgroups.size > 0 %] - <table id="basketgroups-table" class="group"> - <thead> + [% IF basketgroups.size > 0 %] + <table id="basketgroups-table" class="group"> + <thead> + <tr> + <th>Name</th> + <th>Vendor</th> + <th>Billing place</th> + <th>Delivery place</th> + <th>No. of baskets</th> + <th>No. of ordered titles</th> + <th>No. of received titles</th> + <th>Date closed</th> + <th>Action</th> + </tr> + </thead> + <tbody> + [% FOREACH basketgroup IN basketgroups %] <tr> - <th>Name</th> - <th>Vendor</th> - <th>Billing place</th> - <th>Delivery place</th> - <th>No. of baskets</th> - <th>No. of ordered titles</th> - <th>No. of received titles</th> - <th>Date closed</th> - <th>Action</th> - </tr> - </thead> - <tbody> - [% FOREACH basketgroup IN basketgroups %] - <tr> - <td> - [% IF ( basketgroup.name ) %] - [% basketgroup.name | html %] - [% ELSE %] - Basket group no. [% basketgroup.id | $raw %] - [% END %] - </td> - <td>[% basketgroup.vendor.name | html %]</td> - <td>[% Branches.GetName(basketgroup.billingplace) | html %]</td> - <td> - [% IF (basketgroup.freedeliveryplace) %] - [% basketgroup.freedeliveryplace | html %] - [% ELSE %] - [% Branches.GetName(basketgroup.deliveryplace) | html %] - [% END %] - </td> - <td>[% basketgroup.baskets_count | $raw %]</td> - <td>[% basketgroup.ordered_titles_count | $raw %]</td> - <td>[% basketgroup.received_titles_count | $raw %]</td> - <td>[% basketgroup.closeddate | $KohaDates %]</td> - <td> - <div class="dropdown"> - <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id | $raw %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a> - <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id | $raw %]"> - [% IF basketgroup.closeddate %] - <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-eye"></i> View</a></li> - <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-folder-open"></i> Reopen</a></li> - <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Export as PDF</a></li> - <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-file-text"></i> Export as CSV</a></li> - <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]">Generate EDIFACT order</a></li> - [% ELSE %] - <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-pencil"></i> Edit</a></li> - <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Close and export as PDF</a></li> - [% UNLESS basketgroup.baskets_count %] - <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-trash"></i> Delete</a></li> - [% END %] + <td> + [% IF ( basketgroup.name ) %] + [% basketgroup.name | html %] + [% ELSE %] + Basket group no. [% basketgroup.id | $raw %] + [% END %] + </td> + <td>[% basketgroup.vendor.name | html %]</td> + <td>[% Branches.GetName(basketgroup.billingplace) | html %]</td> + <td> + [% IF (basketgroup.freedeliveryplace) %] + [% basketgroup.freedeliveryplace | html %] + [% ELSE %] + [% Branches.GetName(basketgroup.deliveryplace) | html %] + [% END %] + </td> + <td>[% basketgroup.baskets_count | $raw %]</td> + <td>[% basketgroup.ordered_titles_count | $raw %]</td> + <td>[% basketgroup.received_titles_count | $raw %]</td> + <td>[% basketgroup.closeddate | $KohaDates %]</td> + <td> + <div class="dropdown"> + <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id | $raw %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a> + <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id | $raw %]"> + [% IF basketgroup.closeddate %] + <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-eye"></i> View</a></li> + <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-folder-open"></i> Reopen</a></li> + <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Export as PDF</a></li> + <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-file-text"></i> Export as CSV</a></li> + <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]">Generate EDIFACT order</a></li> + [% ELSE %] + <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-pencil"></i> Edit</a></li> + <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Close and export as PDF</a></li> + [% UNLESS basketgroup.baskets_count %] + <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-trash"></i> Delete</a></li> [% END %] - </ul> - </div> - </td> - </tr> - [% END %] - </tbody> - </table> - [% END %] - </div> - </div> - <div class="yui-b"> - [% IF bookseller %] - [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %] + [% END %] + </ul> + </div> + </td> + </tr> + [% END %] + </tbody> + </table> [% END %] - [% INCLUDE 'acquisitions-menu.inc' %] + </div> + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% IF bookseller %] + [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %] + [% END %] + [% INCLUDE 'acquisitions-menu.inc' %] + </aside> </div> </div> -- 2.7.4