Bug 9806: Remove single pixel on the basketgroup table
[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / basketgroup.tt
index f19b299..853c95a 100644 (file)
@@ -1,6 +1,10 @@
+[% USE KohaBranchName %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Basket Grouping for [% booksellername |html %]</title>
+<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 [% IF ( grouping ) %]
 <script type="text/javascript" src="[% yuipath %]/yahoo-dom-event/yahoo-dom-event.js"></script>
@@ -17,7 +21,9 @@ body {
        margin:0;
        padding:0;
 }
-
+#basketgroupcolumns {
+    width: 58em;
+}
 #ungrouped {
        overflow: auto;
        height: 400px;
@@ -94,42 +100,21 @@ function submitForm(form) {
        form.appendChild(input);
     }
 }
-// prepare DOM for YUI Toolbar
 
  $(document).ready(function() {
-  //  $("#toolbar").empty();
-    yuiToolbar();
-    $("#basket_groups > ul").tabs();
- });
+    $("#basket_groups").tabs();
 
-// YUI Toolbar Functions
+    $("table").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aoColumnDefs": [
+            { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+        ],
+        sDom: 't',
+        "bAutoWidth": false
+    } ));
+
+ });
 
-function yuiToolbar() {
-       var booksellermenu = [
-               { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]" },
-               { text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter"},
-       ]
-       var ordersbutton = [
-                { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" },
-                { text: _("Edit uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" },
-       ]
-       new YAHOO.widget.Button("newbasketgroup");
-    new YAHOO.widget.Button({
-        type: "menu",
-        label: _("Vendor"),
-        name: "booksellerbutton",
-        menu: booksellermenu,
-        container: "toolbar"
-    });
 
-    new YAHOO.widget.Button({
-        type: "menu",
-        label: _("Orders"),
-        name: "ordersbutton",
-        menu: ordersbutton,
-        container: "toolbar"
-    });
-}
 //]]>
 </script>
 </head>
@@ -137,26 +122,28 @@ function yuiToolbar() {
 [% 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 |html %]</a> &rsaquo; Basket Grouping</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;
+[% IF ( grouping ) %]
+    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername |html %]</div>
+[% ELSE %]
+    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket grouping</div>
+[% END %]
+
+<div id="doc3" class="yui-t2">
+    <div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
 
-<div id="doc" class="yui-t7">
-            
-        <div class="yui-b"> 
-               <div id="toolbar">
-                               <a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
-                       </div>
-                       <h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
-               </div>
 [% IF ( grouping ) %]
-       <div id="bd"> 
-           <div class="yui-g"> 
+    <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+        <div id="basketgroupcolumns" class="yui-g">
                    <div class="yui-u">
 
                                <form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
                    <div id="groups">
                    <fieldset class="brief">
                    <div class="workarea_alt" >
-                   <h3>Ungrouped Baskets</h3>
+                <h3>Ungrouped baskets</h3>
                    <ul id="ungrouped" class="draglist_alt">
                    [% IF ( baskets ) %]
                        [% FOREACH basket IN baskets %]
@@ -185,16 +172,17 @@ function yuiToolbar() {
                        <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
                                        <fieldset id="various" class="brief">
                                        <ol>
-                                               <li><label for="basketgroupname">Basket Group Name:</label>
+                        <li><label for="basketgroupname">Basket group name:</label>
                                                        <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
-                                               <li><label for="billingplace">Billing Place:</label>
+                        <li><label for="billingplace">Billing place:</label>
                                                        <select name="billingplace" id="billingplace" style="width:13em;">
+                                <option value="">--</option>
                                                                [% FOREACH billingplaceloo IN billingplaceloop %]
                                        [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
                                        [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
                                                                [% END %]
                                                                                                </select></li>
-                                               <li><label for="deliveryplace">Delivery Place:</label>
+                        <li><label for="deliveryplace">Delivery place:</label>
                                                        <select name="deliveryplace" id="deliveryplace" style="width:13em;">
                                                                <option value="">--</option>
                                                                [% FOREACH deliveryplaceloo IN deliveryplaceloop %]
@@ -203,7 +191,7 @@ function yuiToolbar() {
                                                                [% END %]
                                                                                                </select></li>
                         <li><p>or</p></li>
-                        <li><label for="freedeliveryplace">Delivery Place:</label>
+                        <li><label for="freedeliveryplace">Delivery place:</label>
                             <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
                                                <li><label for="deliverycomment">Delivery comment:</label>
                                                        <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
@@ -234,14 +222,18 @@ function yuiToolbar() {
                                        <input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
                                [% END %]
                                <input type="hidden" name="op" value="attachbasket" />
-                               <input type="submit" value="Save" />
+                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
                        </fieldset>
                                </form>
                        </div> 
                </div>   
-    </div> 
 [% ELSE %]
-       <div class="yui-g">
+
+    <div id="toolbar" class="btn-toolbar">
+        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="icon-plus"></i> New basket group</a></div>
+    </div>
+    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+
        <div id="basket_groups" class="toptabs">
        <ul class="ui-tabs-nav">
         [% UNLESS ( closed ) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
@@ -250,29 +242,34 @@ function yuiToolbar() {
         [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]
     </ul>
     <div id="opened">
-               <table>
+        <table id="basket_group_opened">
                        <thead>
                                <tr>
-                                       <th>Basket Group</th><th colspan="3">Action</th>
+                                        <th>Name</th>
+                                        <th>Number</th>
+                                        <th>Billing place</th>
+                                        <th>Delivery place</th>
+                                        <th>Number of baskets</th>
+                                        <th>Action</th>
                                </tr>
                        </thead>
                        <tbody>
                        [% FOREACH basketgroup IN basketgroups %]
                                [% UNLESS ( basketgroup.closed ) %]
                                        <tr>
-                                               <td><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% IF ( basketgroup.name ) %]
+                                               <td>[% IF ( basketgroup.name ) %]
                                                                                                        [% basketgroup.name %]
                                                                                                [% ELSE %]
                                                                                                        Basket group no. [% basketgroup.id %]
-                                                                                               [% END %]</a>
+                                                                                               [% END %]
                                                </td>
+                                    <td>[% basketgroup.id %]</td>
+                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
+                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
+                                    <td>[% basketgroup.basketsqty %]</td>
                                                        <td>
-                                                               <input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and Print" />
-                                                       </td>
-                                                       <td>
+                                                               <input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />
                                                                <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
-                                                       </td>
-                                                       <td>
                                                                <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
                                                        </td>
                                        </tr>
@@ -282,10 +279,15 @@ function yuiToolbar() {
                </table>
     </div>
     <div id="closed">
-               <table>
+        <table id="basket_group_closed">
                        <thead>
                                <tr>
-                                       <th>Basket Group</th><th colspan="3">Action</th>
+                                        <th>Name</th>
+                                        <th>Number</th>
+                                        <th>Billing place</th>
+                                        <th>Delivery place</th>
+                                        <th>Number of baskets</th>
+                                        <th>Action</th>
                                </tr>
                        </thead>
                        <tbody>
@@ -293,26 +295,36 @@ function yuiToolbar() {
                                [% IF ( basketgroup.closed ) %]
                                <tr>
                                <td>
-                                       <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid[% basketgroup.id %]">[% IF ( basketgroup.name ) %]
+                                     [% IF ( basketgroup.name ) %]
                                                                                        [% basketgroup.name %]
                                                                                [% ELSE %]
                                                                                        Basket group no. [% basketgroup.id %]
-                                                                               [% END %]</a>
+                                                                               [% END %]
                                        </td>
+                                    <td>[% basketgroup.id %]</td>
+                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
+                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
+                                    <td>[% basketgroup.basketsqty %]</td>
                                        <td>
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
-                                               </td>
-                                               <td>
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
-                                               </td>
+                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
+                    </td>
                                </tr>
                                [% END %]
                                [% END %]
                                </tbody>
                        </table>
                        </div>
-                   </div>
-                   </div>
+        </div>
 [% END %]
-
+</div>
+</div>
+<div class="yui-b">
+[% IF ( booksellerid ) %]
+[% INCLUDE 'vendor-menu.inc' %]
+[% END %]
+[% INCLUDE 'acquisitions-menu.inc' %]
+</div>
+</div>
 [% INCLUDE 'intranet-bottom.inc' %]