Bug 9928 - no way to see all purchase suggestions at all
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / suggestion / suggestion.tt
index 91c5a8f..f8566c9 100644 (file)
             Enter a new purchase suggestion
         [% END %]
     [% ELSE %]
-        Suggestions Management
+        Suggestions management
     [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-[% IF ( op_else ) %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+[% IF ( op_else ) %]
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 // <![CDATA[
-
-    function yuiToolbar() {
-        new YAHOO.widget.Button("newsuggestion");
-    }
-$.tablesorter.addParser({
-    id: 'articles',
-    is: function(s) {return false;  },
-    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
-    type: 'text'
-});
 /**
 *  displayOther.
 *  This function display the select or an textaera to write a reason.
@@ -39,28 +33,33 @@ function displayOther(id,show,hide){
        $("#"+show+id).show();
 }
 $(document).ready(function() {
-    yuiToolbar();
-    $('#suggestiontabs > ul').tabs({
-        select: function(ui) {
-            $("#loadingtab").show();
-        },
-        show: function(ui) {
-            $("#loadingtab").hide();
+    $('#suggestiontabs').tabs({
+        // Correct table sizing for tables hidden in tabs
+        // http://www.datatables.net/examples/api/tabs_and_scrolling.html
+        "show": function(event, ui) {
+            var oTable = $('div.dataTables_wrapper>table', ui.panel).dataTable();
+            if ( oTable.length > 0 ) {
+                oTable.fnAdjustColumnSizing();
+            }
         }
-        });
-    $.tablesorter.defaults.widgets = ['zebra'];
-
+    });
+    $(".sorted").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aoColumnDefs": [
+            { "aTargets": [ 0, -1, -2 ], "bSortable": false, "bSearchable": false },
+        ],
+        "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
+        "iDisplayLength": 20,
+        "sPaginationType": "four_button"
+    }));
 [% FOREACH suggestion IN suggestions %]
 // functions for [% suggestion.suggestiontype %] interactions
-    $("#[% suggestion.suggestiontype %]t").tablesorter({[% IF ( dateformat == 'metric' ) %]
-    dateFormat: 'uk',[% END %]
-    headers: {0:{sorter: false}, 1: { sorter: 'articles' },5:{sorter: false},6:{sorter: false},7:{sorter: false}, 8:{sorter: false},9:{sorter: false},10:{sorter: false}}
-    });
-    $("#CheckAll[% suggestion.suggestiontype %]").click(function(){
+    $("#CheckAll[% suggestion.suggestiontype %]").click(function(e){
                $("#[% suggestion.suggestiontype %]t").checkCheckboxes();
+        e.preventDefault();
     });
-    $("#UncheckAll[% suggestion.suggestiontype %]").click(function(){
+    $("#UncheckAll[% suggestion.suggestiontype %]").click(function(e){
                $("#[% suggestion.suggestiontype %]t").unCheckCheckboxes();
+        e.preventDefault();
        });
        $("#other_reason[% suggestion.suggestiontype %]").hide();
     $("input[name*=other_reason[% suggestion.suggestiontype %]]").focus(function(){ $(this).val(""); });
@@ -84,14 +83,55 @@ $(document).ready(function() {
            $("#reason"+sid).show().find("option[value='']").attr("selected","selected");
                $("#other_reason"+sid).hide();
     });
-       $("h4.collapse a").click(function(){
-               $(this).parent().parent().find("ol").toggle();
+    $("h4.local_collapse a").click(function(){
+        $(this).parent().parent().find("ol").toggle();
+        return false;
+    });
+    // http://jqueryui.com/demos/datepicker/#date-range
+    var dates = $( "#suggesteddate_from, #suggesteddate_to" ).datepicker({
+        changeMonth: true,
+        numberOfMonths: 1,
+        onSelect: function( selectedDate ) {
+            var option = this.id == "suggesteddate_from" ? "minDate" : "maxDate",
+                instance = $( this ).data( "datepicker" );
+                date = $.datepicker.parseDate(
+                    instance.settings.dateFormat ||
+                    $.datepicker._defaults.dateFormat,
+                    selectedDate, instance.settings );
+            dates.not( this ).datepicker( "option", option, date );
+        }
+    });
+    var datesMD = $( "#manageddate_from, #manageddate_to" ).datepicker({
+        changeMonth: true,
+        numberOfMonths: 1,
+        onSelect: function( selectedDate ) {
+            var option = this.id == "manageddate_from" ? "minDate" : "maxDate",
+                instance = $( this ).data( "datepicker" );
+                date = $.datepicker.parseDate(
+                    instance.settings.dateFormat ||
+                    $.datepicker._defaults.dateFormat,
+                    selectedDate, instance.settings );
+            datesMD.not( this ).datepicker( "option", option, date );
+        }
+    });
+    var datesAD = $( "#accepteddate_from, #accepteddate_to" ).datepicker({
+        changeMonth: true,
+        numberOfMonths: 1,
+        onSelect: function( selectedDate ) {
+            var option = this.id == "accepteddate_from" ? "minDate" : "maxDate",
+                instance = $( this ).data( "datepicker" );
+                date = $.datepicker.parseDate(
+                    instance.settings.dateFormat ||
+                    $.datepicker._defaults.dateFormat,
+                    selectedDate, instance.settings );
+            datesAD.not( this ).datepicker( "option", option, date );
+        }
     });
 });
 // ]]>
 </script>
 <style type="text/css">
-h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; }
+h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; }
 .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("/intranet-tmpl/prog/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; }
 </style>[% ELSE %]
 <script type="text/javascript">
@@ -102,7 +142,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
 [% END %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 </head>
-<body>
+<body id="acq_suggestion" class="acq">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 <div id="breadcrumbs">
@@ -115,7 +155,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
             Suggestion edit #[% suggestionid %]
         [% END %]
     [% ELSE %]
-        Suggestions Management
+        Suggestions management
     [% END %]
 </div>
 
@@ -133,9 +173,9 @@ $(document).ready(function() { calcNewsuggTotal(); });
         <li><span class="label">Copyright date:</span>[% copyrightdate %]</li>
         <li><span class="label">ISBN or ISSN or other standard number:</span>[% isbn %]</li>
         <li><span class="label">Publisher:</span>[% publishercode %]</li>
-        <li><span class="label">Publication Place:</span>[% place %]</li>
-        <li><span class="label">Collection Title:</span>[% collectiontitle %]</li>
-        <li><span class="label">Document Type:</span>
+        <li><span class="label">Publication place:</span>[% place %]</li>
+        <li><span class="label">Collection title:</span>[% collectiontitle %]</li>
+        <li><span class="label">Document type:</span>
             [% FOREACH itemtypeloo IN itemtypeloop %]
                 [% IF ( itemtypeloo.selected ) %][% itemtypeloo.description %][% END %]
             [% END %]
@@ -177,7 +217,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
                 <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
             </tr>
             <tr>
-                <th><span class="label">Suggestion Accepted</span> </th>
+                <th><span class="label">Suggestion accepted</span> </th>
                 <td>[% accepteddate %]</td>
                 <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
             </tr>
@@ -232,9 +272,9 @@ $(document).ready(function() { calcNewsuggTotal(); });
         <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" value="[% copyrightdate %]" /></li>
         <li><label for="isbn">ISBN or ISSN or other standard number:</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" value="[% isbn %]"/></li>
         <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" value="[% publishercode %]"/></li>
-        <li><label for="place">Publication Place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="[% place %]"/></li>
-        <li><label for="collectiontitle">Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="[% collectiontitle %]"/></li>
-        <li><label for="itemtype">Document Type:</label>
+        <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="[% place %]"/></li>
+        <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="[% collectiontitle %]"/></li>
+        <li><label for="itemtype">Document type:</label>
             <select id="itemtype" name="itemtype" >
             [% FOREACH itemtypeloo IN itemtypeloop %]
                 [% IF ( itemtypeloo.selected ) %]<option selected="selected" value="[% itemtypeloo.itemtype %]">[% ELSE %]<option value="[% itemtypeloo.itemtype %]">[% END %]
@@ -275,7 +315,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
                 <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode %] ([% managedby_description %])[% END %]</td>
             </tr>
             <tr>
-                <th><label for="accepteddate">Suggestion Accepted</label> </th>
+                <th><label for="accepteddate">Suggestion accepted</label> </th>
                 <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
                 <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]</td>
             </tr>
@@ -285,7 +325,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
     <fieldset class="rows"> <legend>Acquisition information</legend><ol>
         <li><label for="branchcode">Library:</label>
             <select name="branchcode" id="branchcode">
-                <option value="">Any</option>[% FOREACH branchloo IN branchloop %]
+                <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %]
                 [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %][% END %]
             </select>
         </li>
@@ -310,26 +350,23 @@ $(document).ready(function() { calcNewsuggTotal(); });
                        <input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total %]"/>
                 </li></ol>
     </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby %][% ELSE %]noone[% END %]"/>
-    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl?suggestionid=[% suggestionid %]&amp;op=show[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
+    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
     </fieldset>
     </form>
 [% END %]
 
 [% IF ( op_else ) %]
-    <div id="toolbar">
-    <ul class="toolbar">
-    <li> <a id="newsuggestion" href="suggestion.pl?op=add">New purchase suggestion</a></li>
-    </ul></div>
+<div id="toolbar" class="btn-toolbar">
+    <a class="btn btn-small" id="newsuggestion" href="suggestion.pl?op=add"><i class="icon-plus"></i> New purchase suggestion</a>
+</div>
 
-<h1>Suggestions Management</h1>
+<h1>Suggestions management</h1>
 
 [% UNLESS ( notabs ) %]
-<div id="sorting" class="overlay">Sorting...</div>
-<div id="loadingtab" class="overlay">Loading tab...</div>
 <div id="suggestiontabs" class="toptabs">
 <ul class="ui-tabs-nav">
 [% FOREACH suggestion IN suggestions %]
-[% IF ( suggestion.first ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="suggestion.pl#[% suggestion.suggestiontype %]">[% IF ( suggestion.suggestiontypelabel ) %]
+[% IF ( suggestion.first ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="#[% suggestion.suggestiontype %]">[% IF ( suggestion.suggestiontypelabel ) %]
     [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending
     [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted
     [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked
@@ -340,7 +377,6 @@ $(document).ready(function() { calcNewsuggTotal(); });
     [% ELSE %]No name[% END %] ([% suggestion.suggestionscount %])</a></li>
 [% END %]
     </ul>
-    </div>
 [% END %]
 
 [% FOREACH suggestion IN suggestions %]
@@ -348,13 +384,13 @@ $(document).ready(function() { calcNewsuggTotal(); });
 <form name="f[% suggestion.suggestiontype %]" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#[% suggestion.suggestiontype %]">
 
 [% IF ( suggestion.suggestions_loop ) %]
-<p><a id="CheckAll[% suggestion.suggestiontype %]" href="#">Check All</a> | <a id="UncheckAll[% suggestion.suggestiontype %]" href="#">Uncheck All</a></p>
-    <table id="[% suggestion.suggestiontype %]t">
+<p><a id="CheckAll[% suggestion.suggestiontype %]" href="#">Check all</a> | <a id="UncheckAll[% suggestion.suggestiontype %]" href="#">Uncheck all</a></p>
+    <table id="[% suggestion.suggestiontype %]t" class="sorted">
         <thead>
             <tr><th>&nbsp;</th>
             <th>Suggestion</th>
-            <th>Suggested by /on</th>
-            <th>Managed by /on</th>
+            <th>Suggested by on</th>
+            <th>Managed by on</th>
             <th>Library</th>
             <th>Budget</th>
             <th>Status</th></tr>
@@ -376,11 +412,11 @@ $(document).ready(function() { calcNewsuggTotal(); });
                 </td>
                 <td>
                     [% IF ( suggestions_loo.emailsuggestedby ) %]<a href="mailto:[% suggestions_loo.emailsuggestedby %]">[% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF ( suggestions_loo.emailsuggestedby ) %]</a>[% END %]
-                    [% IF ( suggestions_loo.suggesteddate ) %] / [% suggestions_loo.suggesteddate %][% END %]
+                    [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate %][% END %]
                 </td>
                 <td>
                     [% IF ( suggestions_loo.emailmanagedby ) %]<a href="mailto:[% suggestions_loo.emailmanagedby %]">[% END %][% suggestions_loo.surnamemanagedby %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby %][% END %] [% IF ( suggestions_loo.emailmanagedby ) %]</a>[% END %]
-                    [% IF ( suggestions_loo.manageddate ) %], [% suggestions_loo.manageddate %][% END %]
+                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
                 </td>
                 <td>
                     [% suggestions_loo.branchcode %]
@@ -427,10 +463,11 @@ $(document).ready(function() { calcNewsuggTotal(); });
     <input type="submit" value="Submit" /></fieldset>
 </form>
 [% ELSE %]
-    <b>No Results.</b>
+    <b>No results.</b>
 [% END %]
 </div>
 [% END %]
+    </div>
 [% END %]
 </div>
 </div>
@@ -441,24 +478,24 @@ $(document).ready(function() { calcNewsuggTotal(); });
                 <select name="displayby" id="displayby" style="width:auto;">
                     <option value="STATUS">Status</option>
                     <option value="branchcode">Library</option>
-                    <option value="itemtype">Item Type</option>
+                    <option value="itemtype">Item type</option>
                     <option value="managedby">Managed by</option>
                     <option value="acceptedby">Accepted by</option>
                 </select> <input type="submit" value="Go" /></li></ol></fieldset>
 <h4>Filter by: <a style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4>
                 <div style="display:block;" id="limits">
 
-                               <fieldset class="brief"><h4 class="collapse"><a href="#">Bibliographic information</a></h4>
+                               <fieldset class="brief"><h4 class="local_collapse"><a href="#">Bibliographic information</a></h4>
                    <ol> <li><label for="title"> Title:</label><input type="text" id="title" name="title" value="[% title |html %]" /></li>
                     <li><label for="author"> Author:</label><input type="text" id="author" name="author" value="[% author %]" /></li>
                     <li><label for="isbn"> ISBN:</label><input type="text" id="isbn"  name="isbn" value="[% isbn %]" /></li>
                     <li><label for="publishercode"> Publisher:</label><input type="text" id="publishercode" name="publishercode" value="[% publishercode %]" /></li>
-                    <li><label for="publicationyear"> Publication year:</label><input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear %]" /></li>
-                    <li><label for="collectiontitle"> Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle %]" /></li><li><input type="submit" value="Go" /></li></ol>
+                    <li><label for="copyrightdate_filter"> Copyright date:</label><input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate %]" /></li>
+                    <li><label for="collectiontitle"> Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle %]" /></li><li><input type="submit" value="Go" /></li></ol>
                 </fieldset>
-                                <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
+                                <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
                     <ol>
-                      <li><label for="status"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
+                      <li><label for="STATUS"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
                         [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
                         [% ELSE %]<option value="ASKED">Pending</option>[% END %]
                         [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
@@ -468,103 +505,49 @@ $(document).ready(function() { calcNewsuggTotal(); });
                         [% IF ( statusselected_REJECTED ) %]<option value="REJECTED" selected="selected">Rejected</option>
                         [% ELSE %]<option value="REJECTED">Rejected</option>[% END %]
                       </select></li>
-                    <li><label for="suggestedby"> Suggested By:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
+                    <li><label for="suggestedby"> Suggested by:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
 [% FOREACH suggestedby_loo IN suggestedby_loop %][% IF ( suggestedby_loo.selected ) %]<option value="[% suggestedby_loo.code %]" selected="selected">[% suggestedby_loo.desc %]</option>[% ELSE %]<option value="[% suggestedby_loo.code %]">[% suggestedby_loo.desc %]</option>[% END %][% END %]
                                                                      </select></li>
-                    <li><label for="suggesteddate_from"> Suggested on:</label>[% suggesteddate %]
+                    <li><label for="suggesteddate_from"> Suggested on:</label>
                         <table class="invis">
                         <tr>
-                        <td>from :</td><td><input type="text" id="suggesteddate_from" name="suggesteddate_from" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="suggesteddate_from_button" alt="Show Calendar" />
-                        <script language="JavaScript" type="text/javascript">
-                            Calendar.setup(
-                            {
-                                inputField : "suggesteddate_from",
-                                ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                //ifFormat : "%Y-%m-%d", 
-                                button : "suggesteddate_from_button"
-                            });
-                        </script></td>
+                        <td><label for="suggesteddate_from">from:</label></td><td><input type="text" id="suggesteddate_from" name="suggesteddate_from" value="[% suggesteddate_from %]" style="width:76px;" /></td>
                         </tr>
                         <tr>
-                        <td>to :</td><td><input type="text" id="suggesteddate_to" name="suggesteddate_to" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="suggesteddate_to_button" alt="Show Calendar" />
-                        <script language="JavaScript" type="text/javascript">
-                            Calendar.setup(
-                            {
-                                inputField : "suggesteddate_to",
-                                ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                //ifFormat : "%Y-%m-%d", 
-                                button : "suggesteddate_to_button"
-                            });
-                        </script></td>
+                        <td><label for="suggesteddate_to">to:</label></td><td><input type="text" id="suggesteddate_to" name="suggesteddate_to" value="[% suggesteddate_to %]" style="width:76px;" /></td>
                         </tr>
                         </table>
                     </li>
                     <li><label for="managedby"> Managed by:</label><select id="managedby" name="managedby"><option value="">Any</option>
 [% FOREACH managedby_loo IN managedby_loop %][% IF ( managedby_loo.selected ) %]<option value="[% managedby_loo.code %]" selected="selected">[% managedby_loo.desc %]</option>[% ELSE %]<option value="[% managedby_loo.code %]">[% managedby_loo.desc %]</option>[% END %][% END %]
                                                                      </select></li>
-                    <li><label for="manageddate_from"> Management date:</label>[% manageddate %]
+                    <li><label for="manageddate_from"> Management date:</label>
                         <table class="invis">
                         <tr>
-                        <td>from :</td><td><input type="text" id="manageddate_from" name="manageddate_from" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="manageddate_from_button" alt="Show Calendar" />
-                        <script language="JavaScript" type="text/javascript">
-                            Calendar.setup(
-                            {
-                                inputField : "manageddate_from",
-                                ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                //ifFormat : "%Y-%m-%d", 
-                                button : "manageddate_from_button"
-                            });
-                        </script></td>
+                        <td><label for="manageddate_from">from:</label></td><td><input type="text" id="manageddate_from" name="manageddate_from" value="[% manageddate_from %]" style="width:76px;" /></td>
                         </tr>
                         <tr>
-                        <td>to :</td><td><input type="text" id="manageddate_to" name="manageddate_to" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="manageddate_to_button" alt="Show Calendar" />
-                        <script language="JavaScript" type="text/javascript">
-                            Calendar.setup(
-                            {
-                                inputField : "manageddate_to",
-                                ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                //ifFormat : "%Y-%m-%d", 
-                                button : "manageddate_to_button"
-                            });
-                        </script></td>
+                        <td><label for="manageddate_to">to:</label></td><td><input type="text" id="manageddate_to" name="manageddate_to" value="[% manageddate_to %]" style="width:76px;" /></td>
                         </tr>
                         </table>
                     </li>
                     <li><label for="acceptedby"> Accepted by:</label><select id="acceptedby" name="acceptedby"><option value="">Any</option>
 [% FOREACH acceptedby_loo IN acceptedby_loop %][% IF ( acceptedby_loo.selected ) %] <option value="[% acceptedby_loo.code %]" selected="selected">[% acceptedby_loo.desc %]</option>[% ELSE %]<option value="[% acceptedby_loo.code %]">[% acceptedby_loo.desc %]</option>[% END %][% END %]
                                                      </select></li>
-                    <li><label for="accepteddate_from"> Accepted on:</label>[% accepteddate %]
+                    <li><label for="accepteddate_from"> Accepted on:</label>
                         <table class="invis">
                         <tr>
-                        <td>from :</td><td><input type="text" id="accepteddate_from" name="accepteddate_from" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="accepteddate_from_button" alt="Show Calendar" />
-                        <script language="JavaScript" type="text/javascript">
-                            Calendar.setup(
-                            {
-                                inputField : "accepteddate_from",
-                                ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                //ifFormat : "%Y-%m-%d", 
-                                button : "accepteddate_from_button"
-                            });
-                        </script></td>
+                        <td><label for="accepteddate_from">from:</label></td><td><input type="text" id="accepteddate_from" name="accepteddate_from" value="[% accepteddate_from %]" style="width:76px;" /></td>
                         </tr>
                         <tr>
-                        <td>to :</td><td><input type="text" id="accepteddate_to" name="accepteddate_to" style="width:80px;" /><img src="[% themelang %]/lib/calendar/cal.gif" id="accepteddate_to_button" alt="Show Calendar" />
-                        <script language="JavaScript" type="text/javascript">
-                            Calendar.setup(
-                            {
-                                inputField : "accepteddate_to",
-                                ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                //ifFormat : "%Y-%m-%d", 
-                                button : "accepteddate_to_button"
-                            });
-                        </script></td>
+                        <td><label for="accepteddate_to">to:</label></td><td><input type="text" id="accepteddate_to" name="accepteddate_to" value="[% accepteddate_to %]" style="width:76px;" /></td>
                         </tr>
                         </table>
                     </li>
                     <li><input type="submit" value="Go" /></li></ol>
                 </fieldset>
 
-                               <fieldset class="brief"><h4 class="collapse"><a href="#">Acquisition information</a></h4>
+                               <fieldset class="brief"><h4 class="local_collapse"><a href="#">Acquisition information</a></h4>
                     <ol><li><label for="budgetid"> Book fund:</label>
                     <select name="budgetid" id="budgetid"><option value="">Any</option>[% FOREACH budgetid_loo IN budgetid_loop %]
                         [% IF ( budgetid_loo.selected ) %] <option value="[% budgetid_loo.code %]" selected="selected">[% budgetid_loo.desc %]</option>[% ELSE %]<option value="[% budgetid_loo.code %]">[% budgetid_loo.desc %]</option>[% END %]
@@ -572,7 +555,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     </select></li>
                     <li><label for="branchcode"> For:</label>
                     <select name="branchcode" id="branchcode">
-                        <option value="">Any</option>[% FOREACH branchloo IN branchloop %]
+                        <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %]
                             [% IF ( branchloo.selected ) %] <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
                             [% END %]
                     </select></li><li><input type="submit" value="Go" /></li></ol>