[Rt-commit] r2704 - in rt/branches/PLATANO-EXPERIMENTAL-CSS: . html/Search html/Search/Elements

[jesse at bestpractical.com]

Author: jesse
Date: Sat Apr 16 04:16:31 2005
New Revision: 2704

Modified:
   rt/branches/PLATANO-EXPERIMENTAL-CSS/   (props changed)
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Build.html
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditQuery
Log:
 r13093 at hualien:  jesse | 2005-04-16 03:08:13 -0400
  r12992 at hualien:  jesse | 2005-04-16 02:23:47 -0400
   r10273 at hualien:  jesse | 2005-03-28 03:43:00 -0500
   * Completed deliverable B3; Significant cleanup of search UI
  
 


Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Build.html
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Build.html	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Build.html	Sat Apr 16 04:16:31 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/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditQuery
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditQuery	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Elements/EditQuery	Sat Apr 16 04:16:31 2005
@@ -44,7 +44,7 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <& NewListActions, actions => $actions &>
-<&| /Widgets/TitleBox, title => join(': ', grep defined, loc("Query"), $Description) &>
+<&|/Widgets/TitleBox, title => join(': ', grep defined, loc("Current search"), $Description) &>
 <select size="10" name="clauses" style="width: 100%" multiple>
 % $m->out($optionlist);
 </select>