Merge remote-tracking branch 'origin/new/bug_5345'

2012-05-14 15:42:47 +02:00 · 2012-05-14 15:42:47 +02:00 · 9ec7ac5b8e
parent df98c8aaaa 4df6ccacf1
commit 9ec7ac5b8e
5 changed files with 92 additions and 8 deletions
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@ -1,7 +1,20 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search results[% ELSE %]Order search[% END %]</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>
+<script type="text/javascript">
+//<![CDATA[
+ $(document).ready(function() {
+    var histsearcht = $("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "sPaginationType": "four_button"
+    } ) );
+ });
+ //]]>
+</script>
 [% INCLUDE 'calendar.inc' %]
 </head>
 <body id="acq_histsearch" class="acq">
@ -62,7 +75,8 @@
 	</form>[% END %]
    [% IF ( suggestions_loop ) %]<h1>Search results</h1>
 	<div id="acqui_histsearch">
-		<table>
+        <table id="histsearcht">
+            <thead>
 			<tr>
 				<th>Basket</th>
 				<th>Basket group</th>
@ -75,7 +89,8 @@
 				<th>Quantity ordered</th>
 				<th>Unit cost</th>
 			</tr>
-			
+            </thead>
+            <tbody>
 			[% FOREACH suggestions_loo IN suggestions_loop %]
 				<tr>
                    <td>[% suggestions_loo.basketname %] (<a href="basket.pl?basketno=[% suggestions_loo.basketno %]">[% suggestions_loo.basketno %]</a>)</td>
@ -96,6 +111,7 @@
 					<td>[% suggestions_loo.ecost %]</td>
 				</tr>
 			[% END %]
+            </tbody>
 		</table>
 	</div>[% ELSE %][% END %]

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@ -1,6 +1,22 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</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>
+<script type="text/javascript">
+//<![CDATA[
+ $(document).ready(function() {
+    var suggestionst = $("#suggestionst").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aoColumnDefs": [
+            { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+        ],
+        "sPaginationType": "four_button"
+    } ) );
+ });
+ //]]>
+</script>
 </head>
 <body id="acq_newordersuggestion" class="acq">
 [% INCLUDE 'header.inc' %]
@ -16,14 +32,16 @@
 	
 <h1>Suggestions</h1>
    [% IF ( suggestions_loop ) %]
-	<table>
+    <table id="suggestionst">
+        <thead>
        <tr>
            <th>Suggestion</th>
            <th>Suggested by</th>
            <th>Accepted by</th>
            <th>&nbsp;</th>
        </tr>
-        
+        </thead>
+        <tbody>
        [% FOREACH suggestions_loo IN suggestions_loop %]
            <tr>
                <td>
@ -53,7 +71,11 @@
                </td>
            </tr>
        [% END %]
-    </table>[% ELSE %]There are no outstanding (accepted) suggestions.[% END %]
+        </tbody>
+    </table>
+    [% ELSE %]
+        There are no outstanding (accepted) suggestions.
+    [% END %]
 </div>
 </div>
 <div class="yui-b">
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@ -1,7 +1,20 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</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>
+<script type="text/javascript">
+//<![CDATA[
+ $(document).ready(function() {
+    var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "sPaginationType": "four_button"
+    } ) );
+ });
+ //]]>
+</script>
 </head>
 <body id="acq_ordered" class="acq">
 [% INCLUDE 'header.inc' %]
@ -31,7 +44,7 @@
 	<th> Subtotal </th>
    </tr>
    </thead>
-
+    <tbody>
 [% FOREACH order IN ordered %]
    [% IF loop.odd %]
        <tr class="highlight">
@ -68,7 +81,7 @@
 	</td>
    </tr>
 [% END %]
-
+    </tbody>
    <tfoot>
    <tr>
        <td> Total </td>
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@ -1,7 +1,20 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Spent</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>
+<script type="text/javascript">
+//<![CDATA[
+ $(document).ready(function() {
+    var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "sPaginationType": "four_button"
+    } ) );
+ });
+ //]]>
+</script>
 </head>
 <body id="acq_spent" class="acq">
 [% INCLUDE 'header.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@ -1,6 +1,22 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Orders with uncertain prices for Vendor [% booksellername %]</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>
+<script type="text/javascript">
+//<![CDATA[
+ $(document).ready(function() {
+    var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aoColumnDefs": [
+            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
+        ],
+        "sPaginationType": "four_button"
+    } ) );
+ });
+ //]]>
+</script>
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@ -68,7 +84,8 @@ function check(form) {
        <form action="[% scriptname %]" method="post" name="uncertainprices">
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
        <input type="hidden" name="op" value="validate" />
-        <table>
+        <table id="uncertainpricet">
+        <thead>
 	    <tr>
            <th>basket</th>
 	        <th>order</th>
@ -77,6 +94,8 @@ function check(form) {
 	        <th>price</th>
 	        <th>quantity</th>
 	    </tr>
+        </thead>
+        <tbody>
 	    [% FOREACH uncertainpriceorder IN uncertainpriceorders %]
 	    <tr>
        <td>
@ -105,6 +124,7 @@ function check(form) {
 	    </td>
 	    </tr>
 	    [% END %]
+    </tbody>
 	</table>
 	<fieldset class="action"><input type="button" value="Save" onclick="check(this.form)" /></fieldset>
 	</form>