[Rt-commit] r2528 - in rt/branches/QUEBEC-EXPERIMENTAL: . html/Search html/Search/Elements lib/t/regression

[jesse at bestpractical.com]

Author: jesse
Date: Mon Mar 28 05:26:43 2005
New Revision: 2528

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/   (props changed)
   rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html
   rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Elements/EditQuery
   rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/03basic_web.t
Log:
 r10273 at hualien:  jesse | 2005-03-28 16:43:00 +0800
 * Completed deliverable B3; Significant cleanup of search UI


Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Build.html	Mon Mar 28 05:26:43 2005
@@ -62,7 +62,7 @@
 <tr valign="top">
 <td class="boxcontainer" rowspan="2" width="65%">
 <& Elements/PickCriteria, query => $Query, cfqueues => \%queues &>
-<& /Elements/Submit, Caption => loc('Add additional criteria'), Label => loc('Add'), Name => 'AddClause'&>
+<& /Elements/Submit, Caption => loc('Add these terms to your search'), Label => loc('Refine'), Name => 'AddClause'&>
 </td>
 
 <td>
@@ -71,6 +71,7 @@
     actions => \@actions,
     optionlist => $optionlist,
     Description => $Description &>
+<& /Elements/Submit, Label => loc('Search'), Name => 'DoSearch'&>
 </td>
 </tr>
 
@@ -87,11 +88,6 @@
 AvailableColumns => $AvailableColumns,  CurrentFormat => $CurrentFormat, RowsPerPage => $RowsPerPage, OrderBy => $OrderBy, Order => $Order &>
 </td>
 </tr>
-<tr>
-<td colspan=2 class="boxcontainer">
-<& /Elements/Submit, Caption => loc("Do the Search"), Label => loc('Search'), Name => 'DoSearch'&>
-</td>
-</tr>
 </table>
 </FORM>
 
@@ -826,7 +822,7 @@
 # }}}
 
 # {{{ Show the results, if we were asked.
-if ( $ARGS{"DoSearch"} ) {
+if ( $ARGS{"DoSearch"}) {
     $m->comp(
         "Results.html",
         Query   => $Query,

Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Elements/EditQuery
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Elements/EditQuery	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Search/Elements/EditQuery	Mon Mar 28 05:26:43 2005
@@ -44,20 +44,14 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <& NewListActions, actions => $actions &>
-<& /Elements/TitleBoxStart, title => join(': ', grep defined, loc("Query"), $Description) &>
+<&|/Elements/TitleBox, title => join(': ', grep defined, loc("Current search"), $Description) &>
 <select size="10" name="clauses" style="width: 100%" multiple>
 % $m->out($optionlist);
 </select>
-<p align="center">
-<input type=submit name="Up" value="^">
-<input type=submit name="Down" value="v">
-<input type=submit name="Left" value="<">
-<input type=submit name="Right" value=">">
-<input type=submit name="Toggle" value="<&|/l&>And/Or</&>">
-<input type=submit name="DeleteClause" value="<&|/l&>Delete</&>">
-%#<input type=submit name="EditQuery" value="Advanced">
-</p>
-<& /Elements/TitleBoxEnd &>
+<br />
+<input type=submit name="Up" value="^" /><input type=submit name="Down" value="v" /><input type=submit name="Left" value="<" /><input type=submit name="Right" value=">" /><input type=submit name="Toggle" value="<&|/l&>And/Or</&>" /><input type=submit name="DeleteClause" value="<&|/l&>Delete</&>" />
+<br><br>
+</&>
 <%ARGS>
 $Description
 $optionlist

Modified: rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/03basic_web.t
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/03basic_web.t	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/lib/t/regression/03basic_web.t	Mon Mar 28 05:26:43 2005
@@ -82,14 +82,14 @@
 $agent->field("AttachmentField", "Subject");
 $agent->field("AttachmentOp", "LIKE");
 $agent->field("ValueOfAttachment", "aaa");
-$agent->submit();
+$agent->submit("AddClause");
 
 # set the next value
 ok($agent->form_name('BuildQuery'));
 $agent->field("AttachmentField", "Subject");
 $agent->field("AttachmentOp", "LIKE");
 $agent->field("ValueOfAttachment", "bbb");
-$agent->submit();
+$agent->submit("AddClause");
 
 ok($agent->form_name('BuildQuery'));