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

Merge branch 'bug_9877' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-04-03 06:16:29 -04:00
commit cb86132048
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
View file

@ -136,10 +136,16 @@
//]]> //]]>
</script> </script>
[% ELSE %] [% ELSE %]
<link href="[% themelang %]/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" /> [% IF ( notree ) %]
<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>
[% ELSE %]
<link href="[% themelang %]/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script>
[% END %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script>
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.qtip.js"></script> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.qtip.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -174,11 +180,14 @@
} }
}); });
[% IF ( notree ) %] [% IF ( notree ) %]
$("#budgeth").tablesorter({ $("#budgeth").dataTable($.extend(true, {}, dataTablesDefaults, {
widgets : ['zebra'], "aoColumnDefs": [
sortList: [[0,0]], { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
headers: { 7: { sorter: false }} ],
}); "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
"iDisplayLength": 20,
"sPaginationType": "four_button"
}));
[% ELSE %] [% ELSE %]
$("#budgeth").treeTable(); $("#budgeth").treeTable();
[% END %] [% END %]
@ -221,6 +230,8 @@
[% INCLUDE 'budgets-active-currency.inc' %] [% INCLUDE 'budgets-active-currency.inc' %]
[% IF ( budget ) %]
<table id="budgeth"> <table id="budgeth">
<thead> <thead>
<tr> <tr>
@ -248,7 +259,6 @@
</tr> </tr>
</tfoot> </tfoot>
<tbody> <tbody>
[% IF ( budget ) %]
[% FOREACH budge IN budget %] [% FOREACH budge IN budget %]
[% IF ( budge.toggle ) %] [% IF ( budge.toggle ) %]
<tr id="node-[% budge.budget_id %]" class="highlight[% IF ( budge.budget_parent_id ) %] child-of-node-[% budge.budget_parent_id %][% END %] tooltiped"> <tr id="node-[% budge.budget_id %]" class="highlight[% IF ( budge.budget_parent_id ) %] child-of-node-[% budge.budget_parent_id %][% END %] tooltiped">
@ -295,12 +305,13 @@
[% END %] [% END %]
</tr> </tr>
[% END %] [% END %]
[% ELSE %]
<tr><td colspan="12">No fund found</td></tr>
[% END %]
</tbody> </tbody>
</table> </table>
[% ELSE %]
No fund found
[% END %]
[% IF ( pagination_bar ) %]<div class="pages">[% pagination_bar %]</div>[% END %] [% IF ( pagination_bar ) %]<div class="pages">[% pagination_bar %]</div>[% END %]
[% END %] <!-- else --> [% END %] <!-- else -->