none

1 files changed, 27 insertions, 30 deletions

diff --git a/TWiki/WebSearch.mdwn b/TWiki/WebSearch.mdwn
index c29b44ee..99668967 100644
--- a/TWiki/WebSearch.mdwn
+++ b/TWiki/WebSearch.mdwn
@@ -19,39 +19,36 @@
         <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="%MAINWEB%">%MAINWEB%</option>
-              <option value="%TWIKIWEB%">%TWIKIWEB%</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="showlock" type="checkbox" /> locked topic   <input name="limit" size="5" type="text" value="all" /> topics (result count) </td>
+          <td><select name="web"><option value="all">all public</option></select></td>
         </tr>
       </table>
     </li>
-  </ul>
+  </ul> %WEBLIST{" <select><option>$name</option>"}% </select> web(s) <table>
+    <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="showlock" type="checkbox" /> locked topic   <input name="limit" size="5" type="text" value="all" /> topics (result count) </td>
+    </tr>
+  </table>
 </form>
 
 * **[Topic index](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=\.*)**: List of %WIKITOOLNAME%.%INCLUDINGWEB% topics in alphabetical order. <br />**|[All](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=\.*)|[A](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ea)|[B](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eb)|[C](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ec)|[D](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ed)|[E](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ee)|[F](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ef)|[G](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eg)|[H](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eh)|[I](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ei)|[J](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ej)|[K](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ek)|[L](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5El)|[M](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Em)|[N](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5En)|[O](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eo)|[P](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ep)|[Q](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eq)|[R](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Er)|[S](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Es)|[T](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Et)|[U](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Eu)|[V](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ev)|[W](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ew)|[X](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ex)|[Y](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ey)|[Z](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&search=%5Ez)| <br /> | [All](%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%INCLUDINGWEB%/?scope=topic&regex=on&bookview=on&search=\.*)** topics in %TWIKIWEB%.BookView **|**