Bug 23983: Contextualization of 'Order' (verb) vs 'Order' (noun)

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

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 fd225b9..3e14e75 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -1,11 +1,13 @@
+[% USE raw %]
 [% USE Asset %]
 [% USE KohaDates %]
 [% USE Branches %]
 [% USE Koha %]
+[%# USE the plugin and define some macros %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials [% biblionumber %]</title>
-[% Asset.css("css/datatables.css") %]
+<title>Koha &rsaquo; Serials [% biblionumber | html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -13,12 +15,13 @@
 [% 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; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a subscription</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; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Add order from a subscription</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">
             <h2>Serials subscriptions</h2>
             [% IF (done_searched) %]
                 <label for="show_only_renewed">
@@ -41,37 +44,38 @@
                         </thead>
                         <tbody>
                         [% FOREACH sub IN subs_loop %]
-                            <tr data-reneweddate="[% sub.reneweddate %]" >
-                                <td>[% sub.issn %]</td>
-                                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title |html %][% ELSE %]
+                            <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 %][% END %]</a>
+                            [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
                                 </td>
-                                <td>[% IF (sub.publicnotes) %][% sub.publicnotes %][% END %]
-                                    [% IF (sub.internalnotes) %]([% sub.internalnotes %])[% END %]
+                                <td>[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %]
+                                    [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %]
                                 </td>
                                 <td>
-                                    [% IF (sub.vendorname) %][% sub.vendorname %][% END %]
+                                    [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %]
                                 </td>
                                 <td>
-                                    [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) %][% END %]
+                                    [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %]
                                 </td>
                                 <td>
-                                    [% IF (sub.callnumber) %][% sub.callnumber %][% END %]
+                                    [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
                                 </td>
                                 <td>
                                     [% IF (sub.enddate) %]
-                                        <span title="[% sub.enddate %]">[% sub.enddate | $KohaDates %]</span>
+                                        <span title="[% sub.enddate | html %]">[% sub.enddate | $KohaDates %]</span>
                                     [% ELSE %]
                                         <span title="0000-00-00"></span>
                                     [% END %]
                                 </td>
-                                <td>
+                                <td class="actions">
                                     [% IF (sub.alreadyOnOrder) %]
-                                        Outstanding order (only one order per subscription is allowed)
-                                    [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
-                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;biblionumber=[% sub.biblionumber %]&amp;subscriptionid=[% sub.subscriptionid %]" title="Order this one">
-                                            Order
+                                        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>
@@ -87,19 +91,21 @@
             [% ELSE %]
                 <p>Use the search form on the left to find subscriptions.</p>
             [% END %]
-        </div>
-    </div>
+        </main>
+    </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-    <div class="yui-b">
+<div class="col-sm-2 col-sm-pull-10">
+    <aside>
         [% INCLUDE 'subscriptions-search.inc' %]
         [% INCLUDE 'acquisitions-menu.inc' %]
-    </div>
-</div>
+    </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>
         function updateRowsVisibility(show_only_renewed) {
             if ( show_only_renewed ) {
                 $("#srlt [data-reneweddate='']").hide();
@@ -115,7 +121,7 @@
                     { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
                     { "sType": "title-string", "aTargets" : [ "title-string" ] }
                 ],
-                "sPaginationType": "four_button"
+                "sPaginationType": "full"
             }));
 
             $("#show_only_renewed").click(function(){