From 6e69484a6fc1956e200e01740c1b85e9b27c35f6 Mon Sep 17 00:00:00 2001
From: ArthurClemens <ArthurClemens@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Thu, 18 Dec 2008 20:07:54 +0000
Subject: [PATCH] Item39: put help text in MAKETEXT; rephrased to make the
 benefit more clear; added focus to input fields.

git-svn-id: http://svn.foswiki.org/trunk@1459 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 core/data/System/WebSearch.txt         |  2 +-
 core/data/System/WebSearchAdvanced.txt | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/data/System/WebSearch.txt b/core/data/System/WebSearch.txt
index a55193d877..0146aa3a99 100644
--- a/core/data/System/WebSearch.txt
+++ b/core/data/System/WebSearch.txt
@@ -20,7 +20,7 @@ zeroresults="%IF{ "defined search" then="on" else="off" }%"
 <table id="foswikiSearchTable" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td colspan="2" class="foswikiFirstRow">
-  <input type="text" class="foswikiInputField" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" /> 
+  <input type="text" class="foswikiInputField foswikiFocus" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" /> 
   <input type="submit" class="foswikiSubmit" value='%MAKETEXT{"Search"}%' /><span class="foswikiSmall">&nbsp;&nbsp;<a href='%SCRIPTURL{view}%/%BASEWEB%/WebSearchAdvanced?search=%URLPARAM{"search" encode="url"}%;type=%URLPARAM{"type" encode="url" default="word"}%;scope=%URLPARAM{"scope" encode="url"}%;web=%URLPARAM{"web" encode="url"}%;nosearch=%URLPARAM{"nosearch" encode="url"}%'>%MAKETEXT{"Advanced search"}%</a> | [[%SYSTEMWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span>
 <div class="foswikiSmall" style="padding:1em 0 0 0;">%MAKETEXT{"TIP: to search for all topics that contain =\"SOAP\"=, =\"WSDL\"=, a literal =\"web service\"=, but not =\"shampoo\"=, write:"}% <code>soap wsdl "web service" -shampoo</code></div>
 </td>
diff --git a/core/data/System/WebSearchAdvanced.txt b/core/data/System/WebSearchAdvanced.txt
index 4fcbe92e6e..655e63fc53 100644
--- a/core/data/System/WebSearchAdvanced.txt
+++ b/core/data/System/WebSearchAdvanced.txt
@@ -27,7 +27,7 @@ zeroresults="%IF{ "defined search" then="on" else="off" }%"
 <table id="foswikiSearchTable" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td colspan="2" class="foswikiFirstRow">
-  <input class="foswikiInputField" type="text" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" />
+  <input class="foswikiInputField foswikiFocus" type="text" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" />
   <input type="submit" class="foswikiSubmit" value='%MAKETEXT{"Search"}%' /><span class="foswikiSmall">&nbsp;&nbsp;<a href='%SCRIPTURL{view}%/%BASEWEB%/WebSearch?search=%URLPARAM{"search" encode="url"}%;type=%URLPARAM{"type" encode="url" default="word"}%;scope=%URLPARAM{"scope" encode="url"}%;web=%URLPARAM{"web" encode="url"}%;nosearch=%URLPARAM{"nosearch" encode="url"}%'>%MAKETEXT{"Simple search"}%</a> | [[%SYSTEMWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span>
 <div class="foswikiSmall" style="padding:1em 0 0 0;">%MAKETEXT{"TIP: to search for all topics that contain =\"SOAP\"=, =\"WSDL\"=, a literal =\"web service\"=, but not =\"shampoo\"=, write:"}% <code>soap wsdl "web service" -shampoo</code></div>
 </td>
@@ -81,18 +81,15 @@ zeroresults="%IF{ "defined search" then="on" else="off" }%"
 </div>
 </noautolink>
 
-<div class="foswikiHelp" %IF{"defined search" else="style=\"display:none;\""}% >
-The following Foswiki markup can be used in a topic to display the above result.
-<br />
-<span class="foswikiSmall">
-<pre>
+<div class="foswikiHelp%IF{"defined search" else=" foswikiHidden"}%">
+%MAKETEXT{"To display the above search results in a topic, copy-paste the following markup:"}%
+<pre class="foswikiSmall">
 %<nop>SEARCH{
    "%URLPARAM{"search" encode="quote"}%"
    type="%URLPARAM{"type" default="word"}%"
 %IF{"defined scope" then="   scope=\"%URLPARAM{"scope" encode="quote"}%\"$n"}%%IF{"defined web" then="   web=\"%URLPARAM{"web" encode="quote"}%\"$n"}%%IF{"defined nosearch" then="   nosearch=\"%URLPARAM{"nosearch" encode="quote"}%\"$n"}%%IF{"defined casesensitive" then="   casesensitive=\"%URLPARAM{"casesensitive" encode="quote"}%\"$n"}%%IF{"defined bookview" then="   bookview=\"%URLPARAM{"bookview" encode="quote"}%\"$n"}%%IF{"defined nosummary" then="   nosummary=\"%URLPARAM{"nosummary" encode="quote"}%\"$n"}%%IF{"defined nototal" then="   nototal=\"%URLPARAM{"nototal" encode="quote"}%\"$n"}%%IF{"defined order" then="   order=\"%URLPARAM{"order" encode="quote"}%\"$n"}%%IF{"defined reverse" then="   reverse=\"%URLPARAM{"reverse" encode="quote"}%\"$n"}%%IF{"defined limit" then="   limit=\"%URLPARAM{"limit" encode="quote"}%\"$n"}%   zeroresults="%IF{ "defined search" then="on" else="off" }%"
 }%
 </pre>
-</span>
 </div>
 
 <div class="foswikiHelp">