Merge branch 'bug_9445' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-02 12:25:33 -05:00
commit 1f88190fdd

View file

@ -2,6 +2,24 @@
<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %] <title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title> [% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'doc-head-close.inc' %]
[% IF ( else ) %]
<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>
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
[% IF ( loop ) %]$("#sysprefst").dataTable($.extend(true, {}, dataTablesDefaults, {
"sDom": 't',
"aoColumnDefs": [
{ "aTargets": [ -1, -2, -3, -4 ], "bSortable": false, "bSearchable": false }
],
"bPaginate": false
}));[% END %]
});
</script>
[% END %]
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
[% IF ( add_form ) %] [% IF ( add_form ) %]
@ -73,18 +91,6 @@
//]]> //]]>
</script> </script>
[% IF ( else ) %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
[% IF ( loop ) %]$("#sysprefst").tablesorter({
sortList: [[0,0]],
headers: { 1: {sorter:false},2: { sorter: false },3: { sorter: false },4: { sorter: false }}
});[% END %]
});
</script>
[% END %]
</head> </head>
<body id="admin_systempreferences" class="admin"> <body id="admin_systempreferences" class="admin">
[% INCLUDE 'header.inc' %] [% INCLUDE 'header.inc' %]