Bug 37749 - query for changes to specific field in last n days not working. Rearrange time-based query UI to be more sane. Patch by mailto:anthony@itia.ntua.gr; r=gerv.

2 files changed, 20 insertions, 22 deletions

diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index efc5dd0b2..3ebe01f05 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -726,12 +726,13 @@ function selectProduct(f) {
 
 
 <dl>
-  <dt>Only bugs changed in the last </dt>
-  <dd><input name="changedin" size="3" value="[% default.changedin.0 FILTER html %]"> days</dd>
-</dl>
-
-<dl>
-  <dt>Only bugs where any of the fields</dt>
+  <dt>Only bugs changed between:</dt>
+  <dd>
+    <input name="chfieldfrom" size="10" value="[% default.chfieldfrom.0 FILTER html %]">
+    and <input name="chfieldto" size="10" value="[% default.chfieldto.0 FILTER html %]">
+    <br>(YYYY-MM-DD or <a href="queryhelp.cgi#changedbetween">relative dates</a>)
+  </dd><br>
+  <dt>where one or more of the following changed:</dt>
   <dd>
     <select name="chfield" multiple="multiple" size="4">
     [% FOREACH field = chfield %]
@@ -740,21 +741,13 @@ function selectProduct(f) {
         [% (field_descs.$field || field) FILTER html %]</option>
     [% END %]
     </select>
-  </dd>
-
-  <dt>were changed between</dt>
-  <dd>
-    <input name="chfieldfrom" size="10" value="[% default.chfieldfrom.0 FILTER html %]">
-    and <input name="chfieldto" size="10" value="[% default.chfieldto.0 FILTER html %]">
-    <br>(YYYY-MM-DD)
-  </dd>
-  <dt>to this value: (optional)</dt>
+  </dd><br>
+  <dt>and the new value was:</dt>
   <dd>
     <input name="chfieldvalue" size="20" value="[% default.chfieldvalue.0 FILTER html %]">
-  </dd>
+  </dd><br>
 </dl>
 
-
        </fieldset>
      </td>
   </tr>
diff --git a/template/en/default/search/search-help.html.tmpl b/template/en/default/search/search-help.html.tmpl
index 557209690..852955533 100644
--- a/template/en/default/search/search-help.html.tmpl
+++ b/template/en/default/search/search-help.html.tmpl
@@ -81,16 +81,21 @@
 { id => "votes", 
   html => "Some bugs can be voted for, and you can limit your search to bugs<br>
            with more than a certain number of votes." },   
-{ id => "changedin", 
-  html => "You can search by when bugs have changed - this field defines the<br>
-           timeframe for the search." },   
 { id => "chfield", 
   html => "You can search for specific types of change - this field define <br>
            which field you are interested in changes for." },   
 { id => "chfieldfrom", 
-  html => "The start time of the timeframe for the change." },   
+  html => "Specify the start and end dates either in YYYY-MM-DD format<br>
+           (optionally followed by HH:mm, in 24 hour clock), or in relative<br>
+           dates such as 1d, 2w, 3m, 4y, which respectively mean one day,<br>
+           two weeks, three months, or four years ago. 0d is last midnight,<br>
+           and 0w, 0m, 0y is the beginning of this week, month, or year." },
 { id => "chfieldto", 
-  html => "The end time of the timeframe for the change." },   
+  html => "Specify the start and end dates either in YYYY-MM-DD format<br>
+           (optionally followed by HH:mm, in 24 hour clock), or in relative<br>
+           dates such as 1d, 2w, 3m, 4y, which respectively mean one day,<br>
+           two weeks, three months, or four years ago. 0d is last midnight,<br>
+           and 0w, 0m, 0y is the beginning of this week, month, or year." },
 { id => "chfieldvalue", 
   html => "The value the field defined above changed to during that time." },   
 ] %]