none

1 files changed, 46 insertions, 3 deletions

diff --git a/TWiki/WebSearch.mdwn b/TWiki/WebSearch.mdwn
index 4a7448ba..ad3ee555 100644
--- a/TWiki/WebSearch.mdwn
+++ b/TWiki/WebSearch.mdwn
@@ -1,12 +1,55 @@
 <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
   <ul>
-    <li><b>Full text search</b>: Search the TWiki.%WEB% web. <br /><input name="scope" type="hidden" value="text" /> <input name="casesensitive" type="checkbox" /> Case sensitive     <input name="regex" type="checkbox" /> %TWIKIWEB%.RegularExpression search     <input name="bookview" type="checkbox" /> %TWIKIWEB%.BookView <br /><input name="search" size="32" type="text" /> <input type="submit" value="Search text" /></li>
+    <li><b>Simple search</b>: <table>
+        <tr>
+          <td><input checked name="scope" type="radio" value="text" /> Topic text (body)     </td>
+          <td><input name="web" type="checkbox" /> All webs (not only %WIKITOOLNAME%.%WEB% web) </td>
+        </tr>
+        <tr>
+          <td><input name="scope" type="radio" value="topic" /> Topic name </td>
+          <td><input name="bookview" type="checkbox" /> %TWIKIWEB%.BookView </td>
+        </tr>
+      </table><input name="search" size="32" type="text" /> <input type="submit" value="Search text" /></li>
   </ul>
 </form>
 
 <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
   <ul>
-    <li><b>Search topic</b>: If you know part of a topic name in TWiki.%WEB%. <br /><input name="scope" type="hidden" value="topic" /> <input name="casesensitive" type="checkbox" /> Case sensitive     <input name="regex" type="checkbox" /> %TWIKIWEB%.RegularExpression search     <input name="bookview" type="checkbox" /> %TWIKIWEB%.BookView <br /><input name="search" size="32" type="text" /> <input type="submit" value="Search topic" /></li>
+    <li><b>Advanced search</b>: <table>
+        <tr>
+          <td><input checked name="scope" type="radio" value="text" /> Topic text (body)     </td>
+          <td> Search </td>
+          <td><select name="web"><option selected value="all"> all </option>
+              <option value="Main">Main</option>
+              <option value="Know">Know</option>
+              <option value="Test">Test</option></select> web(s) </td>
+        </tr>
+        <tr>
+          <td><input name="scope" type="radio" value="topic" /> Topic name </td>
+          <td> Sort by </td>
+          <td><select name="order"><option value="topic">Topic name</option>
+              <option value="modified">Last modified time</option>
+              <option value="editby">Last editor</option></select> in <input name="reverse" type="checkbox" /> reversed order </td>
+        </tr>
+      </table><input name="search" size="32" type="text" /> <input type="submit" value="Search text" /><br />
+      <table>
+        <tr>
+          <td> Make search: </td>
+          <td><input name="casesensitive" type="checkbox" /> Case sensitive </td>
+          <td><input name="regex" type="checkbox" /> %TWIKIWEB%.RegularExpression search </td>
+        </tr>
+        <tr>
+          <td> Don't show: </td>
+          <td><input name="nosearch" type="checkbox" /> search string </td>
+          <td><input name="nosummary" type="checkbox" /> summaries   <input name="nototal" type="checkbox" /> total matches </td>
+        </tr>
+        <tr>
+          <td> Do show: </td>
+          <td><input name="bookview" type="checkbox" /> %TWIKIWEB%.BookView </td>
+          <td><input name="limit" size="5" type="text" value="all" /> topics (result count) </td>
+        </tr>
+      </table>
+    </li>
   </ul>
 </form>
 
@@ -14,7 +57,7 @@
 
 * **Jump to topic**: If you already know the name of the topic, enter the name of the topic at the second line of this page.
 
-* **[Recent changes](%SCRIPTURLPATH%/changes%SCRIPTSUFFIX%/%WEB%)**: Find out what topics in TWiki.%WEB% recently changed.
+* ** [[WebChanges]] **: Find out what topics in TWiki.%WEB% have changed recently.
 
 * **[How to edit text](%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/GoodStyle)**:
   * Make changes to topics in %TWIKIWEB%.GoodStyle,