Skip to content

Commit

Permalink
Item39: put help text in MAKETEXT; rephrased to make the benefit more…
Browse files Browse the repository at this point in the history
… clear; added focus to input fields.

git-svn-id: http://svn.foswiki.org/trunk@1459 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Dec 18, 2008
1 parent 4dc14e1 commit 6e69484
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion core/data/System/WebSearch.txt
Expand Up @@ -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>
Expand Down
11 changes: 4 additions & 7 deletions core/data/System/WebSearchAdvanced.txt
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down

0 comments on commit 6e69484

Please sign in to comment.