Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_9444' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-03-07 10:43:21 -05:00
commit 9f9130dedb
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js
View file

@ -1,10 +1,3 @@
$(document).ready(function() {
$("table.preferences").tablesorter({
sortList: [[0,0]],
headers: { 1: { sorter:false}}
});
});
// We can assume 'KOHA' exists, as we depend on KOHA.AJAX
KOHA.Preferences = {
@ -40,6 +33,15 @@ KOHA.Preferences = {
};
$( document ).ready( function () {
$("table.preferences").dataTable($.extend(true, {}, dataTablesDefaults, {
"sDom": 't',
"aoColumnDefs": [
{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }
],
"bPaginate": false
}));
function mark_modified() {
$( this.form ).find( '.save-all' ).removeAttr( 'disabled' );
$( this ).addClass( 'modified' );
@ -96,11 +98,11 @@ $( document ).ready( function () {
$(collapsible).toggle(
function () {
$(this).addClass("collapsed").removeClass("expanded").attr("title",MSG_CLICK_TO_EXPAND);
$(this).next("table").hide();
$(this).next("div").hide();
},
function () {
$(this).addClass("expanded").removeClass("collapsed").attr("title",MSG_CLICK_TO_COLLAPSE);
$(this).next("table").show();
$(this).next("div").show();
}
);

5
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
View file

@ -1,7 +1,10 @@
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
<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>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" />
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
<script type="text/javascript">