Bug 5741 - Extra comma causes JavaScript error in Internet Explorer

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / includes / acquisitions-toolbar.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
index 5b77b93..9f7a8e5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -1,42 +1,55 @@
 <div id="toolbar"><script type="text/javascript">
-       //<![CDATA[
+    //<![CDATA[
 
-       // prepare DOM for YUI Toolbar
+    // prepare DOM for YUI Toolbar
 
-        $(document).ready(function() {
-           yuiToolbar();
-        });
+    $(document).ready(function() {
+        yuiToolbar();
+    });
 
-       // YUI Toolbar Functions
+    // YUI Toolbar Functions
 
-       function yuiToolbar() {   
-       
-           new YAHOO.widget.Button("newperiod");
-           new YAHOO.widget.Button("newbudget");
-           new YAHOO.widget.Button("newsupplier");
+    function yuiToolbar() {   
+    
+        new YAHOO.widget.Button("newperiod");
+        new YAHOO.widget.Button("newbudget");
+        new YAHOO.widget.Button("newsupplier");
+        new YAHOO.widget.Button("newbasket");
+        new YAHOO.widget.Button("editsupplier");
+        new YAHOO.widget.Button("receive");
+        new YAHOO.widget.Button("newcontract");
+        new YAHOO.widget.Button("editcontracts");
 
-           var manageorders = [
-               { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"},
-               { text: _("Basket grouping"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"},
-               { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" },
-               { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&owner=1"}
-           ]
-           <!-- TMPL_IF NAME="id" -->new YAHOO.widget.Button("newbasket");
-           new YAHOO.widget.Button("editsupplier");
-           new YAHOO.widget.Button("receive");
-           new YAHOO.widget.Button("editcontracts");
-           new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
-           <!-- /TMPL_IF -->
-       }
+        var manageorders = [
+            { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form"},
+            { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"},
+            { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"},
+            { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" },
+            <!-- TMPL_IF name="basketno" -->
+                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&basketno=<!--TMPL_VAR name="basketno" -->&owner=1"}
+            <!-- TMPL_ELSE -->
+                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&owner=1"}
+            <!-- /TMPL_IF -->
+        ]
+        <!-- TMPL_IF NAME="id" -->
+            <!-- TMPL_IF NAME="basketcount" -->
+                new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+    }
 
-       //]]>
-       </script>
-       <ul id="toolbar-list" class="toolbar">
-               <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li>
-               <!-- TMPL_IF NAME="id" -->
-               <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form">New Basket</a></li>
-               <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit Vendor</a></li>
-               <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Edit contracts</a></li>
-               <!-- /TMPL_IF -->
-       </ul>
+    //]]>
+    </script>
+    <ul id="toolbar-list" class="toolbar">
+        <!-- TMPL_IF NAME="id" -->
+            <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit</a></li>
+            <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=<!-- TMPL_VAR name="id" -->">New Contract</a></li>
+            <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Contracts</a></li>
+            <!-- TMPL_UNLESS NAME="basketcount" -->
+                <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR name="id" -->&op=add_form">New Basket</a></li>
+            <!-- /TMPL_UNLESS -->
+        <!-- TMPL_ELSE -->
+            <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Vendor</a></li>
+        <!-- /TMPL_IF -->
+    </ul>
 </div>