Bug 32616: Add 'page-section' to various acquisitions pages

This patch adds a "page-section" container div around the main section
of acquisitions page which lack it.

This patch contains indentation changes, so please ignore whitespace
when looking at the diff.

To test, apply the patch and view the following pages to confirm that
the main content is contained in a white box:

- Acquisitions -> Vendor -> Basket -> Create EDIFACT order
- Acquisitions -> EDIFACT messages
- Acquisitions -> Orders search -> Results
- Acquisitions -> Late orders
- Acquisitions -> Vendor -> Add to basket -> From a subscription
- Acquisitions -> Vendor -> Add to basket -> From a suggestion
- Acquisitions -> All available funds -> Ordered
- Acquisitions -> All available funds -> Spent
- Acquisitions -> Vendor -> Add to basket -> From an external source ->
  Results

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b05ec80bbf46e039befcc978be3c101c2fd7f21e)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
index bed9283..f12c8fb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
@@ -30,20 +30,22 @@
             <main>
 
     <h1>Select the library account submitting the EDI order</h1>
-    <br />
-    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
-         <p>Select ordering library account: </p>
-         <select id="ean" name="ean">
-             [% FOREACH eanacct IN eans %]
-             <option value="[% eanacct.ean | html %]">[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct.description %][[% eanacct.description | html %]][% END %]</option>
-             [% END %]
-        </select>
-        <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
-        <input type="hidden" value="ediorder" name="op" />
-        <p>
-            <input type="submit" class="btn btn-primary" value="Send EDI order" />
-        </p>
-    </form>
+
+    <div class="page-section">
+        <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
+            <p>Select ordering library account: </p>
+            <select id="ean" name="ean">
+                [% FOREACH eanacct IN eans %]
+                    <option value="[% eanacct.ean | html %]">[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct.description %][[% eanacct.description | html %]][% END %]</option>
+                [% END %]
+            </select>
+            <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
+            <input type="hidden" value="ediorder" name="op" />
+            <p>
+                <input type="submit" class="btn btn-primary" value="Send EDI order" />
+            </p>
+        </form>
+    </div> <!-- /.page-section -->
 </main>
 </div> <!-- /.col-sm-10.col-sm-push-2 -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
index cd39408..c53ed21 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
@@ -37,7 +37,7 @@
 
 
 <h1>EDIFACT messages</h1>
-<div id="acqui_edifactmsgs">
+<div id="acqui_edifactmsgs" class="page-section">
 
 [% IF ( messages ) %]
 <table id="edi_msgs">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index d70e55d..4e56d56 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -63,7 +63,7 @@
 
 
     [% IF ( order_loop ) %]<h1>Search results</h1>
-       <div id="acqui_histsearch">
+    <div id="acqui_histsearch" class="page-section">
         <table id="histsearcht">
             <thead>
                        <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 9ac7041..e49a5b0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -38,7 +38,7 @@
             <main>
 
 <h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1>
-<div id="acqui_lateorders">
+<div id="acqui_lateorders" class="page-section">
 
 [% IF error_claim %]
     [% IF ( error_claim == "no_email" ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index b4a6ac7..875921d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -45,70 +45,72 @@
             <main>
 
             <h1>Serials subscriptions</h1>
-            [% IF (done_searched) %]
-                <label for="show_only_renewed">
-                    <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
-                    Show only renewed
-                </label>
-                [% IF (subs_loop) %]
-                    <table id="srlt">
-                        <thead>
-                            <tr>
-                                <th>ISSN</th>
-                                <th class="anti-the">Title</th>
-                                <th> Notes </th>
-                                <th>Vendor</th>
-                                <th>Library</th>
-                                <th>Call number</th>
-                                <th>Expiration date</th>
-                                <th class="NoSort"></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        [% FOREACH sub IN subs_loop %]
-                            <tr data-reneweddate="[% sub.reneweddate | html %]" >
-                                <td>[% sub.issn | html %]</td>
-                                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
-                                ---
-                            [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
-                                </td>
-                                <td>[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %]
-                                    [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %]
-                                </td>
-                                <td>
-                                    [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %]
-                                </td>
-                                <td>
-                                    [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %]
-                                </td>
-                                <td>
-                                    [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
-                                </td>
-                                <td data-order="[% sub.enddate | html %]">
-                                    [% sub.enddate | $KohaDates %]
-                                </td>
-                                <td class="actions">
-                                    [% IF (sub.alreadyOnOrder) %]
-                                        Outstanding order
-                                    [% END %]
-                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
-                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
-                                            <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]
-                                        </a>
-                                    [% ELSE %]
-                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
-                                    [% END %]
-                                </td>
-                            </tr>
-                        [% END %]
-                        </tbody>
-                    </table>
+            <div class="page-section">
+                [% IF (done_searched) %]
+                    <label for="show_only_renewed">
+                        <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
+                        Show only renewed
+                    </label>
+                    [% IF (subs_loop) %]
+                        <table id="srlt">
+                            <thead>
+                                <tr>
+                                    <th>ISSN</th>
+                                    <th class="anti-the">Title</th>
+                                    <th> Notes </th>
+                                    <th>Vendor</th>
+                                    <th>Library</th>
+                                    <th>Call number</th>
+                                    <th>Expiration date</th>
+                                    <th class="NoSort"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            [% FOREACH sub IN subs_loop %]
+                                <tr data-reneweddate="[% sub.reneweddate | html %]" >
+                                    <td>[% sub.issn | html %]</td>
+                                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
+                                    ---
+                                [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
+                                    </td>
+                                    <td>[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %]
+                                        [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %]
+                                    </td>
+                                    <td>
+                                        [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %]
+                                    </td>
+                                    <td>
+                                        [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %]
+                                    </td>
+                                    <td>
+                                        [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
+                                    </td>
+                                    <td data-order="[% sub.enddate | html %]">
+                                        [% sub.enddate | $KohaDates %]
+                                    </td>
+                                    <td class="actions">
+                                        [% IF (sub.alreadyOnOrder) %]
+                                            Outstanding order
+                                        [% END %]
+                                        [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
+                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
+                                                <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]
+                                            </a>
+                                        [% ELSE %]
+                                            <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
+                                        [% END %]
+                                    </td>
+                                </tr>
+                            [% END %]
+                            </tbody>
+                        </table>
+                    [% ELSE %]
+                        <p>Sorry, there is no result for your search.</p>
+                    [% END %]
                 [% ELSE %]
-                    <p>Sorry, there is no result for your search.</p>
+                    <p>Use the search form on the left to find subscriptions.</p>
                 [% END %]
-            [% ELSE %]
-                <p>Use the search form on the left to find subscriptions.</p>
-            [% END %]
+            </div> <!-- /.page-section -->
         </main>
     </div> <!-- /.col-sm-10.col-sm-push-2 -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
index 4f838cf..3b1cc6e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -44,72 +44,75 @@
             <main>
 
 <h1>Suggestions</h1>
-    [% IF suggestions.size %]
-    <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
-    <table id="suggestionst">
-        <thead>
-        <tr>
-            <th>Mine</th>
-            <th>Suggestion</th>
-            <th>Suggested by</th>
-            <th>Accepted by</th>
-            <th>Library</th>
-            <th>Fund</th>
-            <th>Price</th>
-            <th>Quantity</th>
-            <th>Total</th>
-            <th>&nbsp;</th>
-        </tr>
-        </thead>
-        <tbody>
-        [% FOREACH suggestion IN suggestions %]
-            <tr>
-                <td>[% suggestion.managedby | html %]</td>
-                <td>
-                    <p>[% suggestion.title | html %] - [% suggestion.author | html %]</p>
-                    <p>
-                        [% IF ( suggestion.copyrightdate ) %]&copy; [% suggestion.copyrightdate | html %] [% END %]
-                        [% IF ( suggestion.volumedesc ) %]volume: <em>[% suggestion.volumedesc | html %]</em> [% END %]
-                        [% IF ( suggestion.isbn ) %]ISBN: <em>[% suggestion.isbn | html %]</em> [% END %]
-                        [% IF ( suggestion.publishercode ) %]<br />published by: [% suggestion.publishercode | html %] [% END %]
-                        [% IF ( suggestion.publicationyear ) %] in <em>[% suggestion.publicationyear | html %]</em> [% END %]
-                        [% IF ( suggestion.place ) %] in <em>[% suggestion.place | html %]</em> [% END %]
-                        [% IF ( suggestion.note ) %]<p><em>([% suggestion.note | html %])</em></p> [% END %]
-                    </p>
-                </td>
-                <td>[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %]</td>
-                <td>[% INCLUDE 'patron-title.inc' patron => suggestion.manager %]</td>
-                <td>
-                    [% Branches.GetName(suggestion.branchcode) | html %]
-                </td>
-                <td>
-                    [% suggestion.fund.budget_name | html %]
-                </td>
-                <td>
-                    [% suggestion.price | $Price %]
-                </td>
-                <td>
-                    [% IF (suggestion.quantity > 0) %]
-                        [% suggestion.quantity | html %]
-                    [% END %]
-                </td>
-                <td>
-                    [% suggestion.total | $Price %]
-                </td>
-                <td class="actions">
-                    [% IF ( suggestion.biblionumber ) %]
-                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
-                    [% ELSE %]
-                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
+
+    <div class="page-section">
+        [% IF suggestions.size %]
+            <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
+            <table id="suggestionst">
+                <thead>
+                <tr>
+                    <th>Mine</th>
+                    <th>Suggestion</th>
+                    <th>Suggested by</th>
+                    <th>Accepted by</th>
+                    <th>Library</th>
+                    <th>Fund</th>
+                    <th>Price</th>
+                    <th>Quantity</th>
+                    <th>Total</th>
+                    <th>&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody>
+                    [% FOREACH suggestion IN suggestions %]
+                        <tr>
+                            <td>[% suggestion.managedby | html %]</td>
+                            <td>
+                                <p>[% suggestion.title | html %] - [% suggestion.author | html %]</p>
+                                <p>
+                                    [% IF ( suggestion.copyrightdate ) %]&copy; [% suggestion.copyrightdate | html %] [% END %]
+                                    [% IF ( suggestion.volumedesc ) %]volume: <em>[% suggestion.volumedesc | html %]</em> [% END %]
+                                    [% IF ( suggestion.isbn ) %]ISBN: <em>[% suggestion.isbn | html %]</em> [% END %]
+                                    [% IF ( suggestion.publishercode ) %]<br />published by: [% suggestion.publishercode | html %] [% END %]
+                                    [% IF ( suggestion.publicationyear ) %] in <em>[% suggestion.publicationyear | html %]</em> [% END %]
+                                    [% IF ( suggestion.place ) %] in <em>[% suggestion.place | html %]</em> [% END %]
+                                    [% IF ( suggestion.note ) %]<p><em>([% suggestion.note | html %])</em></p> [% END %]
+                                </p>
+                            </td>
+                            <td>[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %]</td>
+                            <td>[% INCLUDE 'patron-title.inc' patron => suggestion.manager %]</td>
+                            <td>
+                                [% Branches.GetName(suggestion.branchcode) | html %]
+                            </td>
+                            <td>
+                                [% suggestion.fund.budget_name | html %]
+                            </td>
+                            <td>
+                                [% suggestion.price | $Price %]
+                            </td>
+                            <td>
+                                [% IF (suggestion.quantity > 0) %]
+                                    [% suggestion.quantity | html %]
+                                [% END %]
+                            </td>
+                            <td>
+                                [% suggestion.total | $Price %]
+                            </td>
+                            <td class="actions">
+                                [% IF ( suggestion.biblionumber ) %]
+                                    <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
+                                [% ELSE %]
+                                    <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
+                                [% END %]
+                            </td>
+                        </tr>
                     [% END %]
-                </td>
-            </tr>
+                </tbody>
+            </table>
+        [% ELSE %]
+            There are no outstanding (accepted) suggestions.
         [% END %]
-        </tbody>
-    </table>
-    [% ELSE %]
-        There are no outstanding (accepted) suggestions.
-    [% END %]
+    </div> <!-- /.page-section -->
 </main>
 </div> <!-- /.col-sm-10.col-sm-push-2 -->
 

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 ef5b999..a324b42 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -41,88 +41,90 @@
 
 <h1>Ordered - Fund: [% fund_code | html %]</h1>
 
-<table id="spent">
-    <thead>
-    <tr>
-    <th class="anti-the"> Title </th>
-    <th> [% tp('noun', 'Order') | html %] </th>
-    <th> Vendor </th>
-    <th> Item types </th>
-    <th> Left on order </th>
-    <th> Estimated cost per unit </th>
-    <th> Date ordered </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 | uri %]">
-        [% order.title | html %]
-            </a>
-    </td>
-    <td class="cell">
-        [% IF ( CAN_user_acquisition_order_manage ) %]
-            <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 | html %]
-        [% END %]
-    </td>
-    <td class="cell">
-        <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
-    </td>
-    <td class="cell">
-        [% FOREACH itemtype IN order.itemtypes %]
-            [% ItemTypes.GetDescription( itemtype ) | html %]
-            [% IF !loop.last() %] | [% END %]
-        [% END %]
-    </td>
-    <td class="cell">
-        [% order.left | html %]
-    </td>
-    <td class="data cell">
-        [% order.ecost_tax_included | $Price %]
-    </td>
-    <td class="cell" data-order="[% order.entrydate | html %]">
-        [% order.entrydate | $KohaDates %]
-    </td>
-    <td class="data cell">
-        [% 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
-                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
-                            [% adjustment.invoice.invoicenumber | html %]
-                        </a>
-                    </td>
-                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
-                </tr>
-            [% END %]
+                <div class="page-section">
+                    <table id="spent">
+                        <thead>
+                        <tr>
+                        <th class="anti-the"> Title </th>
+                        <th> [% tp('noun', 'Order') | html %] </th>
+                        <th> Vendor </th>
+                        <th> Item types </th>
+                        <th> Left on order </th>
+                        <th> Estimated cost per unit </th>
+                        <th> Date ordered </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 | uri %]">
+                            [% order.title | html %]
+                                </a>
+                        </td>
+                        <td class="cell">
+                            [% IF ( CAN_user_acquisition_order_manage ) %]
+                                <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 | html %]
+                            [% END %]
+                        </td>
+                        <td class="cell">
+                            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
+                        </td>
+                        <td class="cell">
+                            [% FOREACH itemtype IN order.itemtypes %]
+                                [% ItemTypes.GetDescription( itemtype ) | html %]
+                                [% IF !loop.last() %] | [% END %]
+                            [% END %]
+                        </td>
+                        <td class="cell">
+                            [% order.left | html %]
+                        </td>
+                        <td class="data cell">
+                            [% order.ecost_tax_included | $Price %]
+                        </td>
+                        <td class="cell" data-order="[% order.entrydate | html %]">
+                            [% order.entrydate | $KohaDates %]
+                        </td>
+                        <td class="data cell">
+                            [% 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
+                                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
+                                                [% adjustment.invoice.invoicenumber | html %]
+                                            </a>
+                                        </td>
+                                        <td class="data total">[% adjustment.adjustment | $Price %]</td>
+                                    </tr>
+                                [% END %]
 
-    [% END %]
-    <tr>
-        <td> Total </td>
-        <td> </td>
-        <td> </td>
-        <td> </td>
-        <td> </td>
-        <td> </td>
-        <td> </td>
-        <td class="data">
-            [% total | $Price %]
-        </td>
-    </tr>
-    </tfoot>
+                        [% END %]
+                        <tr>
+                            <td> Total </td>
+                            <td> </td>
+                            <td> </td>
+                            <td> </td>
+                            <td> </td>
+                            <td> </td>
+                            <td> </td>
+                            <td class="data">
+                                [% total | $Price %]
+                            </td>
+                        </tr>
+                        </tfoot>
 
-</table>
+                    </table>
+                </div> <!-- /.page-section -->
 
 </main>
 </div> <!-- /.col-sm-10.col-sm-push-2 -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 02cbeaa..3e9b043 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -41,101 +41,105 @@
 
 <h1>Spent - Fund: [% fund_code | html %]</h1>
 
-<table id="spent">
-    <thead>
-        <tr>
-           <th class="anti-the">Title</th>
-           <th>[% tp('noun', 'Order') | html %]</th>
-           <th>Vendor</th>
-           <th>Invoice</th>
-           <th>Item types</th>
-           <th>Received</th>
-           <th>Unit price</th>
-           <th>Date ordered</th>
-           <th>Date received</th>
-           <th>Subtotal</th>
-        </tr>
-    </thead>
+<div class="page-section">
 
-    [% FOREACH order IN spent %]
-        <tr>
-            <td class="cell">
-                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
-                    [% order.title | html %]
-                </a>
-            </td>
-            <td class="cell">
-                [% order.ordernumber | html %]
-            </td>
-            <td class="cell">
-                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
-            </td>
-            <td class="cell">
-                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
-            </td>
-            <td class="cell">
-                [% FOREACH itemtype IN order.itemtypes %]
-                    [% ItemTypes.GetDescription( itemtype ) | html %]
-                    [% IF !loop.last() %] | [% END %]
-                [% END %]
-            </td>
-            <td class="cell">
-                [% order.quantityreceived | html %]
-            </td>
-            <td class="cell">
-                [% order.unitprice_tax_included | $Price %]
-            </td>
-            <td class="cell" data-order="[% order.entrydate | html %]">
-                [% order.entrydate | $KohaDates %]
-            </td>
-            <td class="cell" data-order="[% order.datereceived | html %]">
-                [% order.datereceived | $KohaDates %]
-            </td>
-            <td class="data cell">
-                [% order.rowtotal | $Price %]
-            </td>
-        </tr>
-    [% END %]
+    <table id="spent">
+        <thead>
+            <tr>
+            <th class="anti-the">Title</th>
+            <th>[% tp('noun', 'Order') | html %]</th>
+            <th>Vendor</th>
+            <th>Invoice</th>
+            <th>Item types</th>
+            <th>Received</th>
+            <th>Unit price</th>
+            <th>Date ordered</th>
+            <th>Date received</th>
+            <th>Subtotal</th>
+            </tr>
+        </thead>
 
-    <tfoot>
-        [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
+        [% FOREACH order IN spent %]
             <tr>
-                <td colspan="9"> Sub total </td>
-                <td class="data"> [% subtotal | $Price %] </td>
+                <td class="cell">
+                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
+                        [% order.title | html %]
+                    </a>
+                </td>
+                <td class="cell">
+                    [% order.ordernumber | html %]
+                </td>
+                <td class="cell">
+                    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
+                </td>
+                <td class="cell">
+                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
+                </td>
+                <td class="cell">
+                    [% FOREACH itemtype IN order.itemtypes %]
+                        [% ItemTypes.GetDescription( itemtype ) | html %]
+                        [% IF !loop.last() %] | [% END %]
+                    [% END %]
+                </td>
+                <td class="cell">
+                    [% order.quantityreceived | html %]
+                </td>
+                <td class="cell">
+                    [% order.unitprice_tax_included | $Price %]
+                </td>
+                <td class="cell" data-order="[% order.entrydate | html %]">
+                    [% order.entrydate | $KohaDates %]
+                </td>
+                <td class="cell" data-order="[% order.datereceived | html %]">
+                    [% order.datereceived | $KohaDates %]
+                </td>
+                <td class="data cell">
+                    [% order.rowtotal | $Price %]
+                </td>
             </tr>
         [% END %]
-        [% IF shipmentcosts.size %]
-            [% FOREACH shipmentcost IN shipmentcosts %]
+
+        <tfoot>
+            [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
                 <tr>
-                    <td></td>
-                    <td colspan="8">Shipping cost for invoice
-                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% shipmentcost.invoiceid | uri %]">
-                             [% shipmentcost.invoicenumber | html %]
-                        </a>
-                    </td>
-                    <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td>
+                    <td colspan="9"> Sub total </td>
+                    <td class="data"> [% subtotal | $Price %] </td>
                 </tr>
             [% END %]
-        [% END %]
-        [% IF ( adjustments && adjustments.count > 0 ) %]
-            [% FOREACH adjustment IN adjustments %]
-                <tr>
-                    <td></td>
-                    <td colspan="8">Adjustment cost for invoice
-                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
-                            [% adjustment.invoice.invoicenumber | html %]
-                        </a>
-                    </td>
-                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
-                </tr>
+            [% IF shipmentcosts.size %]
+                [% FOREACH shipmentcost IN shipmentcosts %]
+                    <tr>
+                        <td></td>
+                        <td colspan="8">Shipping cost for invoice
+                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% shipmentcost.invoiceid | uri %]">
+                                [% shipmentcost.invoicenumber | html %]
+                            </a>
+                        </td>
+                        <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td>
+                    </tr>
+                [% END %]
             [% END %]
-        [% END %]
-        <tr>
-            <td colspan="9">TOTAL</td>
-            <td class="data total">[% total | $Price %]</td>
-        </tr>
-    </tfoot>
-</table>
+            [% IF ( adjustments && adjustments.count > 0 ) %]
+                [% FOREACH adjustment IN adjustments %]
+                    <tr>
+                        <td></td>
+                        <td colspan="8">Adjustment cost for invoice
+                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
+                                [% adjustment.invoice.invoicenumber | html %]
+                            </a>
+                        </td>
+                        <td class="data total">[% adjustment.adjustment | $Price %]</td>
+                    </tr>
+                [% END %]
+            [% END %]
+            <tr>
+                <td colspan="9">TOTAL</td>
+                <td class="data total">[% total | $Price %]</td>
+            </tr>
+        </tfoot>
+    </table>
+
+</div> <!-- /.page-section -->
 
 </main>
 </div> <!-- /.col-sm-10.col-sm-push-2 -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 2d7691b..774e452 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -129,7 +129,7 @@ tr.selected td {
     </div> <!-- /.col-sm-6 -->
 <div class="col-sm-6">
 <h2>Search targets</h2>
-    <div id="z3950_search_targets_acq">
+    <div id="z3950_search_targets_acq" class="page-section">
         <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
     [% FOREACH serverloo IN serverloop %]
         <p>