projects / koha-ffzg.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 21505: Box around 'Additional fields' does not contain the fields
[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / modules / serials / subscription-detail.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 73f9100..a2cb7d4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -5,24 +5,29 @@
 [% USE Branches %]
 [% USE AuthorisedValues %]
 [% USE Price %]
+[% USE ColumnsSettings %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid | html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css("css/datatables.css") %]
+[% Asset.css("css/datatables.css") | $raw %]
 </head>
 
 <body id="ser_subscription-detail" class="ser">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'serials-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Details for subscription #[% subscriptionid | html %]</div>
+<div id="breadcrumbs">
+    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+    &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
+    [% UNLESS blocking_error %]&rsaquo; Details for subscription #[% subscriptionid | html %][% END %]
+</div>
+
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
        [% INCLUDE 'serials-toolbar.inc' %]
 
     <h1>Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]</h1>
@@ -63,8 +68,8 @@
 </ul>
 
 <div id="subscription_info">
-    <div class="yui-g">
-    <div class="yui-u first">
+    <div class="row">
+    <div class="col-sm-6">
     <div class="rows">
                <ol>
                <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
@@ -95,7 +100,7 @@
         </ol>
     </div>
     </div>
-    <div class="yui-u">
+    <div class="col-sm-6">
     <div class="rows">
         <ol>
         [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %]
@@ -114,11 +119,12 @@
      </div>
      </div>
 
-     [% IF additional_fields_for_subscription %]
-    <div class="yui-g">
-      <div class="yui-u first">
+    [% IF additional_fields_for_subscription %]
+    <hr>
+    <div class="row">
+      <div class="col-sm-6">
+        <h3>Additional fields:</h3>
         <div class="rows">
-          <legend>Additional fields:</legend>
           <ol>
             [% FOR field IN additional_fields_for_subscription %]
               <li>
@@ -138,7 +144,8 @@
 </div>
 
     <div id="subscription_planning">
-    <div class="yui-g">
+    <div class="row">
+    <div class="col-sm-12">
     <div class="rows">
         <ol>
             <li><span class="label">Beginning date:</span> [% startdate | html %]
@@ -196,6 +203,7 @@
     </div>
     </div>
     </div>
+    </div>
     <div id="subscription_numbering" style="display:none;">
         <h3>Numbering calculation</h3>
         <p><label>Numbering formula:</label> [% numberingmethod | html %]</p>
@@ -312,7 +320,8 @@
         </table>
     </div>
     <div id="subscription_summary">
-    <div class="yui-g">
+    <div class="row">
+    <div class="col-sm-12">
     <div class="rows">
         <ol>
             <li><span class="label">Start date:</span> [% startdate | html %] </li>
@@ -349,9 +358,11 @@
                         <th class="title-string">Creation date</th>
                         <th class="title-string">Receive date</th>
                         <th class="title-string">Status</th>
+                        <th>Internal note</th>
+                        <th>Vendor note</th>
                         <th>Fund</th>
-                        <th>Ordered</th>
-                        <th>Spent</th>
+                        <th title="ecost tax exc. / ecost tax inc.">Ordered</th>
+                        <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -360,7 +371,7 @@
                         <td>
                         [% IF order.invoice %]
                             [% IF CAN_user_acquisition %]
-                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid %]" title="Invoice detail page">
+                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]" title="Invoice detail page">
                                    [% order.invoice.invoicenumber | html %]</a>
                             [% ELSE %]
                                 [% order.invoice.invoicenumber | html %]
@@ -384,6 +395,8 @@
                             [% CASE 'cancelled' %]<span title="status_5">Cancelled</span>
                           [% END %]
                         </td>
+                        <td>[% order.order_internalnote | html %]</td>
+                        <td>[% order.order_vendornote | html %]</td>
                         <td>[% order.fund.budget_name | html %]</td>
                         <td>
                             [% UNLESS order.datereceived %]
@@ -403,16 +416,18 @@
           </div>
       [% END %]
 
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'serials-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript">
+    <script>
         var subscriptionid = "[% subscriptionid | html %]";
         var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?");
         var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?");
@@ -420,7 +435,8 @@
     </script>
     [% Asset.js("js/serials-toolbar.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    [% INCLUDE 'columns_settings.inc' %]
+    <script>
         // the english words used in display purposes
         var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern",
         "Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"),_("Season"),_("Year"));
@@ -431,14 +447,15 @@
                 return false;
             })
 
-            var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
+            var columns_settings = [% ColumnsSettings.GetColumns( 'serials', 'subscription-detail', 'orders', 'json' ) | $raw %];
+            var table = KohaTable("orders", {
                 'bPaginate': false,
                 'bAutoWidth': false,
                 "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
                 "aoColumnDefs": [
                     { "aTargets": "title-string", "sType": "title-string" }
                 ]
-            }));
+            }, columns_settings);
 
             $("#hide_received_orders").click(function(e){
                 e.preventDefault();
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git