X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fsuggestion%2Fsuggestion.tt;h=95c7c7f26b7818404f38f2ba459ca844319f43df;hb=b64e6be1c4f3dbdcde41ac8f4766b4d1f962610d;hp=e3096c3a5153ae1fa5f5e79cfd064d397142aa19;hpb=755655a42a2621c86fe3d171564401fd929c28cd;p=srvgit diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index e3096c3a51..95c7c7f26b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -1,5 +1,7 @@ [% USE Branches %] [% USE AuthorisedValues %] +[% USE KohaDates %] +[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( op_save ) %] @@ -45,11 +47,8 @@ $(document).ready(function() { $('#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(); - } + "activate": function(event, ui) { + $( $.fn.dataTable.tables( true ) ).DataTable().columns.adjust(); } }); $(".sorted").dataTable($.extend(true, {}, dataTablesDefaults, { @@ -199,8 +198,8 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <div class="yui-b"> <div id="toolbar" class="btn-toolbar"> - <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid %]"><i class="icon-pencil"></i> Edit</a> - <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&edit_field=[% suggestionid %]"><i class="icon-remove"></i> Delete</a> + <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid %]"><i class="fa fa-pencil"></i> Edit</a> + <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&edit_field=[% suggestionid %]"><i class="fa fa-remove"></i> Delete</a> </div> <fieldset class="rows"> @@ -214,14 +213,12 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <li><span class="label">Publication place:</span>[% place |html %]</li> <li><span class="label">Collection title:</span>[% collectiontitle |html %]</li> <li><span class="label">Document type:</span> - [% FOREACH itemtypeloo IN itemtypeloop %] - [% IF ( itemtypeloo.selected ) %][% itemtypeloo.description %][% END %] - [% END %] + [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', itemtype, 0 ) %] </li> [% IF ( patron_reason_loop ) %] <li><span class="label">Reason for suggestion: </span> [% FOREACH patron_reason_loo IN patron_reason_loop %] - [% IF ( patron_reason_loo.selected ) %][% patron_reason_loo.lib %][% END %] + [% IF patron_reason_loo.authorised_value == patronreason %][% patron_reason_loo.lib %][% END %] [% END %] </li> [% END %] @@ -261,18 +258,18 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <tbody> <tr> <th><span class="label">Suggestion creation</span> </th> - <td>[% suggesteddate %]</td> + <td>[% suggesteddate | $KohaDates %]</td> <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a> [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] </td> </tr> <tr> <th><span class="label">Suggestion management</span> </th> - <td>[% manageddate %]</td> + <td>[% manageddate | $KohaDates %]</td> <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td> </tr> <tr> <th><span class="label">Suggestion accepted</span> </th> - <td>[% accepteddate %]</td> + <td>[% accepteddate | $KohaDates %]</td> <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td> </tr> </tbody> @@ -293,10 +290,10 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <span class="label">Currency:</span>[% currency %] </li> <li> - <span class="label">Price:</span>[% price %] + <span class="label">Price:</span>[% price | $Price %] </li> <li> - <span class="label">Total</span>[% total %] + <span class="label">Total</span>[% total | $Price %] </li> </ol> </fieldset> @@ -330,23 +327,30 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <input type="text" id="title" name="title" size="80" maxlength="255" value="[% title |html %]" required="required" class="required" /> <span class="required">Required</span> </li> - <li><label for="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" value="[% author %]"/></li> - <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="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" value="[% author | html %]"/></li> + <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" value="[% copyrightdate | html %]" /></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 | html %]"/></li> + <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" value="[% publishercode | html %]"/></li> + <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="[% place | html %]"/></li> + <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="[% collectiontitle | html %]"/></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 %] - [% itemtypeloo.description %]</option> - [% END %] - </select> + [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, default=itemtype %] </li> - [% IF ( patron_reason_loop ) %]<li><label for="patronreason">Reason for suggestion: </label><select name="patronreason" id="patronreason"><option value=""> -- Choose -- </option>[% FOREACH patron_reason_loo IN patron_reason_loop %] - [% IF ( patron_reason_loo.selected ) %]<option value="[% patron_reason_loo.authorised_value %]" selected="selected">[% patron_reason_loo.lib %]</option>[% ELSE %]<option value="[% patron_reason_loo.authorised_value %]">[% patron_reason_loo.lib %]</option>[% END %] - [% END %]</select></li>[% END %] + [% IF patron_reason_loop %] + <li> + <label for="patronreason">Reason for suggestion: </label> + <select name="patronreason" id="patronreason"> + <option value=""> -- Choose -- </option> + [% FOREACH patron_reason_loo IN patron_reason_loop %] + [% IF patron_reason_loo.authorised_value == patronreason %] + <option value="[% patron_reason_loo.authorised_value %]" selected="selected">[% patron_reason_loo.lib %]</option> + [% ELSE %] + <option value="[% patron_reason_loo.authorised_value %]">[% patron_reason_loo.lib %]</option> + [% END %] + [% END %] + </select> + </li> + [% END %] <li><label for="note">Notes:</label><textarea name="note" id="note" rows="5" cols="40">[% note %]</textarea></li> </ol> </fieldset> @@ -397,18 +401,18 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <tbody> <tr> <th><label for="suggesteddate">Suggestion creation</label> </th> - <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td> + <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/></td> <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a> [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])[% END %] </td> </tr> <tr> <th><label for="managedon">Suggestion management</label> </th> - <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td> + <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" /></td> <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> [% Branches.GetName( managedby_branchcode ) %] ([% managedby_description %])[% END %]</td> </tr> <tr> <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="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" /></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> [% Branches.GetName( acceptedby_branchcode ) %] ([% acceptedby_description %])[% END %]</td> </tr> </tbody> @@ -417,7 +421,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <fieldset class="rows"> <legend>Acquisition information</legend><ol> <li><label for="branchcode">Library:</label> <select name="branchcode" id="branchcode"> - <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %] + <option value="">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> @@ -428,16 +432,25 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o </select> </li><li><label for="quantity">Copies:</label> <input type="text" size="10" id="quantity" name="quantity" value="[% quantity %]" onchange="calcNewsuggTotal();" /> - </li><li><label for="currency">Currency:</label> - [% FOREACH loop_currenc IN loop_currency %] - <input type="hidden" value="[% loop_currenc.rate %]" id="currency_rate_[% loop_currenc.currcode %]" name="currency_rate_[% loop_currenc.currcode %]" /> - <input type="hidden" id="[% loop_currenc.currcode %]" name="[% loop_currenc.currcode %]" value="[% loop_currenc.rate %]" /> - [% END %] - <select name="currency" id="currency" onchange="calcNewsuggTotal();"> - [% FOREACH loop_currenc IN loop_currency %] - [% IF ( loop_currenc.selected ) %]<option value="[% loop_currenc.currcode %]" selected="selected">[% loop_currenc.currcode %]</option>[% ELSE %]<option value="[% loop_currenc.currcode %]">[% loop_currenc.currcode %]</option>[% END %][% END %] - </select> - </li><li><label for="price">Price:</label> + </li> + <li> + <label for="currency">Currency:</label> + [% FOREACH c IN currencies %] + <input type="hidden" value="[% c.rate %]" id="currency_rate_[% c.currency %]" name="currency_rate_[% c.currency %]" /> + <input type="hidden" id="[% c.currency %]" name="[% c.currency %]" value="[% c.rate %]" /> + [% END %] + + <select name="currency" id="currency" onchange="calcNewsuggTotal();"> + [% FOREACH c IN currencies %] + [% IF suggestionid and suggestion.currency == c.currency or not suggestionid and c.active %] + <option value="[% c.currency %]" selected="selected">[% c.currency %]</option> + [% ELSIF not c.archived %] + <option value="[% c.currency %]">[% c.currency %]</option> + [% END %] + [% END %] + </select> + </li> + <li><label for="price">Price:</label> <input type="text" size="20" name="price" id="price" value="[% price %]" onchange="calcNewsuggTotal();" /> </li><li><label for="total">Total: </label> <input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total %]"/> @@ -450,11 +463,23 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o [% IF ( op_else ) %] <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> + <a class="btn btn-small" id="newsuggestion" href="suggestion.pl?op=add"><i class="fa fa-plus"></i> New purchase suggestion</a> </div> <h1>Suggestions management</h1> + +[% FOR m IN messages %] + <div class="dialog [% m.type %]"> + [% SWITCH m.code %] + [% CASE 'already_exists' %] + The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id %]&op=show'>suggestion #[% m.id %]</a>) + [% CASE %] + [% m.code %] + [% END %] + </div> +[% END %] + [% UNLESS ( notabs ) %] <div id="suggestiontabs" class="toptabs"> <ul class="ui-tabs-nav"> @@ -491,6 +516,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <table id="[% suggestion.suggestiontype %]t" class="sorted"> <thead> <tr><th> </th> + <th>No.</th> <th class="anti-the">Suggestion</th> <th>Suggested by - on</th> <th>Managed by - on</th> @@ -500,26 +526,29 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o </thead> <tbody> [% FOREACH suggestions_loo IN suggestion.suggestions_loop %] - [% IF ( suggestions_loo.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %] + <tr> <td> <input type="checkbox" name="edit_field" value="[% suggestions_loo.suggestionid %]" /> </td> <td> + [% suggestions_loo.suggestionid %] + </td> + <td> <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&op=show" title="suggestion" > [% suggestions_loo.title |html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %]</a> [<a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&op=edit" title="suggestion" >edit</a>] <br /> [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate |html %] [% END %] [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc |html %]</i> [% END %] - [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn |html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear |html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place |html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% suggestions_loo.itemtype |html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note |html%]</span>[% END %] + [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn |html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear |html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place |html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note |html%]</span>[% END %] </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.emailsuggestedby ) %]<a href="mailto:[% suggestions_loo.emailsuggestedby %]">[% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %] [% IF ( suggestions_loo.emailsuggestedby ) %]</a>[% END %] + [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% 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 | $KohaDates %][% END %] </td> <td> [% Branches.GetName( suggestions_loo.branchcode ) %] @@ -657,11 +686,11 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <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="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> + <li><label for="author"> Author:</label><input type="text" id="author" name="author" value="[% author | html %]" /></li> + <li><label for="isbn"> ISBN:</label><input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></li> + <li><label for="publishercode"> Publisher:</label><input type="text" id="publishercode" name="publishercode" value="[% publishercode | html %]" /></li> + <li><label for="copyrightdate_filter"> Copyright date:</label><input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate | html %]" /></li> + <li><label for="collectiontitle"> Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input type="submit" value="Go" /></li></ol> </fieldset> <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4> <ol> @@ -707,48 +736,49 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o <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> - <table class="invis"> - <tr> - <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><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> + <label for="suggesteddate_from">Suggested date from:</label> + <input type="text" id="suggesteddate_from" size="10" name="suggesteddate_from" value="[% suggesteddate_from %]" /> + </li> + <li> + <label for="suggesteddate_to">To:</label> + <input type="text" id="suggesteddate_to" size="10" name="suggesteddate_to" value="[% suggesteddate_to %]" /> </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> - <table class="invis"> - <tr> - <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><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> + <label for="manageddate_from">Management date from:</label> + <input type="text" id="manageddate_from" size="10" name="manageddate_from" value="[% manageddate_from %]" /> + </li> + <li> + <label for="manageddate_to">To:</label> + <input type="text" id="manageddate_to" size="10" name="manageddate_to" value="[% manageddate_to %]" /> </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> - <table class="invis"> - <tr> - <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><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> + <label for="accepteddate_from">Accepted date from:</label> + <input type="text" id="accepteddate_from" size="10" name="accepteddate_from" value="[% accepteddate_from %]" /> + </li> + <li> + <label for="accepteddate_to">To:</label> + <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to %]" /> </li> <li><input type="submit" value="Go" /></li></ol> </fieldset> <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 %] + <select name="budgetid" id="budgetid"> + <option value="__ANY__">Any</option> + [% IF budgetid == '__NONE__' %] + <option value="__NONE__" selected="selected">None</option> + [% ELSE %] + <option value="__NONE__">None</option> + [% END %] + [% 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 %] [% END %] </select></li>