Bug 22015: Move DataTables CSS to global include

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / ordered.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 802ae05..6e20dfb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -1,10 +1,11 @@
+[% USE raw %]
 [% USE Asset %]
 [% USE KohaDates %]
 [% USE ItemTypes %]
+[% USE Price %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
-[% Asset.css("css/datatables.css") %]
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -12,67 +13,76 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund_code %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund_code | html %]</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">
-
-<h1>Fund: [% fund_code %]</h1>
+<h1>Fund: [% fund_code | html %]</h1>
 <h2>Ordered</h2>
 
 <table id="spent">
     <thead>
     <tr>
     <th class="anti-the"> Title </th>
-       <th> Order </th>
-       <th> Vendor </th>
+    <th> Order </th>
+    <th> Vendor </th>
     <th> Item type </th>
     <th> Left on order </th>
-       <th> Estimated cost per unit </th>
+    <th> Estimated cost per unit </th>
     <th class="title-string"> Date ordered </th>
-       <th> Subtotal </th>
+    <th> Subtotal </th>
     </tr>
     </thead>
     <tbody>
 [% FOREACH order IN ordered %]
     <tr>
-       <td class="cell">
-            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">
-           [% order.title %]
+    <td class="cell">
+            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
+        [% order.title | html %]
             </a>
-       </td>
-       <td class="cell">
+    </td>
+    <td class="cell">
         [% IF ( CAN_user_acquisition_order_manage ) %]
-            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&amp;booksellerid=[% order.booksellerid %]&amp;basketno=[% order.basketno %]">[% order.ordernumber %]</a>
+            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&amp;booksellerid=[% order.booksellerid | uri %]&amp;basketno=[% order.basketno | uri %]">[% order.ordernumber | html %]</a>
         [% ELSE %]
-            [% order.ordernumber %]
+            [% order.ordernumber | html %]
         [% END %]
-       </td>
-       <td class="cell">
-           <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid %]">[% order.booksellerid %]</a>
-       </td>
-       <td class="cell">
-        [% ItemTypes.GetDescription( order.itype ) %]
-       </td>
-       <td class="cell">
-           [% order.left %]
-       </td>
+    </td>
+    <td class="cell">
+        <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
+    </td>
+    <td class="cell">
+        [% ItemTypes.GetDescription( order.itype ) | html %]
+    </td>
+    <td class="cell">
+        [% order.left | html %]
+    </td>
     <td class="data cell">
-           [% order.ecost %]
-       </td>
+        [% order.ecost_tax_included | $Price %]
+    </td>
     <td class="cell">
-        <span title="[% order.entrydate %]">[% order.entrydate | $KohaDates %]</span>
-       </td>
+        <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
+    </td>
     <td class="data cell">
-           [% order.subtotal %]
-       </td>
+        [% order.subtotal | $Price %]
+    </td>
     </tr>
 [% END %]
     </tbody>
     <tfoot>
+    [% IF ( adjustments && adjustments.count > 0 ) %]
+            [% FOREACH adjustment IN adjustments %]
+                <tr>
+                    <td></td>
+                    <td colspan="6">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
+                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
+                </tr>
+            [% END %]
+
+    [% END %]
     <tr>
         <td> Total </td>
         <td> </td>
@@ -80,26 +90,29 @@
         <td> </td>
         <td> </td>
         <td> </td>
-       <td> </td>
+        <td> </td>
         <td class="data">
-            [% total %]
+            [% total | $Price %]
         </td>
     </tr>
     </tfoot>
 
 </table>
 
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'acquisitions-menu.inc' %]
-</div>
-</div>
+</main>
+</div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+<div class="col-sm-2 col-sm-pull-10">
+    <aside>
+        [% INCLUDE 'acquisitions-menu.inc' %]
+    </aside>
+</div> <!-- /.col-sm-2.col-sm-pull-10 -->
+</div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
-    [% Asset.js("js/acquisitions-menu.js") %]
+    [% Asset.js("js/acquisitions-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [