Bug 22015: Move DataTables CSS to global include

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / reports / orders_by_budget.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
index 1b1c4d4..89a9d0c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
@@ -10,14 +10,13 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-[% Asset.css("css/datatables.css") | $raw %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( get_orders ) %] &rsaquo; <a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a> &rsaquo; Results[% ELSE %] &rsaquo; Orders by fund[% END %]</div>
 
-<div id="doc3" class="yui-t2">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
-<div id="bd">
-        <div id="yui-main">
-        <div class="yui-b">
 
 [% IF ( current_budget_name ) %]<h1>Orders for fund '[% current_budget_name | html %]'</h1>
 [% ELSE %]<h1>Orders by fund</h1>
@@ -59,17 +58,17 @@
             [% ELSE %] <tr>
             [% END %]
             <td>[% ordersloo.budget_name | html %]</td>
-            <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | html %]"> [% ordersloo.basketno | html %]</a></td>
+            <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | uri %]"> [% ordersloo.basketno | html %]</a></td>
             <td>[% ordersloo.basketname | html %]</td>
             <td>[% ordersloo.authorisedbyname | html %]</td>
-            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]"> [% ordersloo.title | html %]</a></td>
+            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]"> [% ordersloo.title | html %]</a></td>
             <td>[% ordersloo.currency | html %]</td>
-            <td>[% ordersloo.listprice | $Price | html %]</td>
-            <td>[% ordersloo.rrp | $Price | html %]</td>
-            <td>[% ordersloo.ecost | $Price | html %]</td>
+            <td>[% ordersloo.listprice | $Price %]</td>
+            <td>[% ordersloo.rrp | $Price %]</td>
+            <td>[% ordersloo.ecost | $Price %]</td>
             <td>[% ordersloo.quantity | html %]</td>
-            <td>[% ordersloo.total_rrp | $Price | html %]</td>
-            <td>[% ordersloo.total_ecost | $Price | html %]</td>
+            <td>[% ordersloo.total_rrp | $Price %]</td>
+            <td>[% ordersloo.total_ecost | $Price %]</td>
             <td>[% ordersloo.entrydate | html %]</td>
             <td>[% ordersloo.datereceived | html %]</td>
             <td>[% ordersloo.order_internalnote | html %]</td>
@@ -77,7 +76,7 @@
             </tr>
         [% END %]
         </tbody>
-        <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price | html %]</th><th>[% total_ecost | $Price | html %]</th><th></th><th></th><th></th><th></th></tr></tfoot>
+        <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot>
         </table>
     [% END %]
     [% ELSE %]
@@ -139,16 +138,19 @@
 
     [% END %]
 
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'reports-menu.inc' %]
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'reports-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         $(document).ready( function () {
             $('#funds').DataTable($.extend(true, {}, dataTablesDefaults,{"sPaginationType": "full_numbers"}));