X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Facqui%2Fbooksellers.tt;h=525ea667e72301650cf6f177623465eaa86ed11f;hb=600eff7827be1c396e7ea13cd7c7159003d6c794;hp=4077b5db9c2434e677e61bd9cb28961c41ceaafc;hpb=068e5be6395088793aeab66d67c36c2b9da2c5d9;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 4077b5db9c..525ea667e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -18,9 +18,11 @@ $(document).ready(function() {
         dt_add_type_uk_date();
     [% END %]
     $("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
+        'sDom': 't',
         'bPaginate': false,
         'bFilter': false,
         'bInfo': false,
+        "aaSorting": [[ 1, "asc" ]],
         'aoColumnDefs': [
             { 'aTargets': [-1], 'bSortable': false }
         ]
@@ -47,21 +49,24 @@ $(document).ready(function() {
     <div class="yui-b">
     
 [% INCLUDE 'acquisitions-toolbar.inc' %]
-[% IF ( count == 1 ) %]	
-<h1> [% supplier_name %] </h1>
-[% ELSE %]
+[% UNLESS ( count == 1 ) %]
 <h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1>
 [% END %]
 [% IF ( loop_suppliers.size ) %]
     [% UNLESS (count == 1) %]
         <p>Choose a vendor in the list to jump directly to the right place.
         <select id="supplierlist">
-            [% FOREACH supplier IN loop_suppliers %]
-                <option value="[% supplier.booksellerid %]">[% supplier.name %]</option>
+            [% FOREACH supplier1 IN loop_suppliers %]
+                <option value="[% supplier1.booksellerid %]">[% supplier1.name %]</option>
             [% END %]
         </select>
         </p>
     [% END %]
+    [% IF ( allbaskets ) %]
+        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]">Show active baskets only</a></p>
+    [% ELSE %]
+        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]&allbaskets=1">Show all baskets</a></p>
+    [% END %]
     <div id="acqui_order_supplierlist">
         [% FOREACH supplier IN loop_suppliers %]
             <div class="supplier">
@@ -87,7 +92,8 @@ $(document).ready(function() {
                         <table class="baskets">
                             <thead>
                                 <tr>
-                                    <th>Basket (#)</th>
+                                    <th>No.</th>
+                                    <th>Name</th>
                                     <th>Item count</th>
                                     <th>Biblio count</th>
                                     <th>Items expected</th>
@@ -103,7 +109,8 @@ $(document).ready(function() {
                                     [% ELSE %]
                                         <tr>
                                     [% END %]
-                                        <td>[% basket.basketname %] (#[% basket.basketno %])</td>
+                                        <td>[% basket.basketno %]</td>
+                                        <td>[% basket.basketname %]</td>
                                         <td>[% basket.total_items %]</td>
                                         <td>[% basket.total_biblios %]</td>
                                         <td>[% basket.expected_items %]</td>
@@ -139,6 +146,9 @@ $(document).ready(function() {
 </div>
 </div>
 <div class="yui-b">
+[% IF ( booksellerid ) %]
+[% INCLUDE 'vendor-menu.inc' %]
+[% END %]
 [% INCLUDE 'acquisitions-menu.inc' %]
 </div>
 </div>