Browse Source

Bug 9261: (follow-up) QA improvements 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>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
3.16.x
Jonathan Druart 11 years ago
committed by Galen Charlton
parent
commit
967a48e5af
  1. 13
      koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
  2. 24
      members/purchase-suggestions.pl

13
koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt

@ -8,15 +8,14 @@
</title> </title>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> [% INCLUDE 'datatables.inc' %]
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, { $("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, {
'bPaginate': false, 'bPaginate': false,
'bFilter': false, 'bFilter': false,
'bInfo': false, 'bInfo': false,
'sDom': 't'
} )); } ));
}); });
</script> </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> <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> </div>
<table id="suggestions"> [% IF suggestions %]
<table id="suggestions">
<thead> <thead>
<tr> <tr>
<th>Summary</th> <th>Summary</th>
@ -98,7 +98,10 @@
</tr> </tr>
[% END %] [% END %]
</tbody> </tbody>
</table> </table>
[% ELSE %]
There is no purchase suggestion for this patron.
[% END %]
</div> </div>
</div> </div>
</div> </div>

24
members/purchase-suggestions.pl

@ -1,21 +1,21 @@
#!/usr/bin/perl #!/usr/bin/perl
# Copyright 2012 ByWater Solutions
#
# This file is part of Koha. # This file is part of Koha.
# #
# Koha is free software; you can redistribute it and/or modify it under the # Copyright 2012 ByWater Solutions
# 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 # Koha is free software; you can redistribute it and/or modify it
# version. # 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 # Koha is distributed in the hope that it will be useful, but
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # WITHOUT ANY WARRANTY; without even the implied warranty of
# A PARTICULAR PURPOSE. See the GNU General Public License for more details. # 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 # You should have received a copy of the GNU General Public License
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # along with Koha; if not, see <http://www.gnu.org/licenses>.
# Suite 330, Boston, MA 02111-1307 USA
use Modern::Perl; use Modern::Perl;

Loading…
Cancel
Save