From 4be4d824b196c059579e6ef905e1a59feb95c8d2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Wed, 13 Nov 2013 12:05:11 +0100 Subject: [PATCH] Bug 9261: QA followup: ergonomic improvement and GPL version change This patch: - changes the GPL version from 2 to 3. - uses the datatables.inc file - removes the single pixel before and after the DT (modifying the sDom value). Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> --- .../en/modules/members/purchase-suggestions.tt | 13 +++++++---- members/purchase-suggestions.pl | 24 ++++++++++---------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt index c0344ac..ea34d50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -8,15 +8,14 @@ </title> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> [% INCLUDE 'doc-head-close.inc' %] -<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> -[% INCLUDE 'datatables-strings.inc' %] -<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> +[% INCLUDE 'datatables.inc' %] <script type="text/javascript"> $(document).ready(function() { $("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, { 'bPaginate': false, 'bFilter': false, 'bInfo': false, + 'sDom': 't' } )); }); </script> @@ -44,7 +43,8 @@ <a class="btn" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% borrowernumber %]&redirect=purchase_suggestions&borrowernumber=[% borrowernumber %]"><i class="icon-plus"></i> New purchase suggestion</a> </div> - <table id="suggestions"> + [% IF suggestions %] + <table id="suggestions"> <thead> <tr> <th>Summary</th> @@ -98,7 +98,10 @@ </tr> [% END %] </tbody> - </table> + </table> + [% ELSE %] + There is no purchase suggestion for this patron. + [% END %] </div> </div> </div> diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl index 52feafe..d071425 100755 --- a/members/purchase-suggestions.pl +++ b/members/purchase-suggestions.pl @@ -1,21 +1,21 @@ #!/usr/bin/perl -# Copyright 2012 ByWater Solutions -# # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Copyright 2012 ByWater Solutions +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see <http://www.gnu.org/licenses>. use Modern::Perl; -- 1.7.10.4