Menu
▾
▴
[TWiki-Dev] [SVN] r9272 - in twiki/branches/DEVELOP: data/TWiki twikiplugins/PatternSkin/data/TWiki twikiplugins/PatternSkin/pub/TWiki/PatternSkin twikiplugins/PatternSkin/templates
Author: ArthurClemens
Date: 2006-03-13 14:44:14 -0800 (Mon, 13 Mar 2006)
New Revision: 9272
Modified:
twiki/branches/DEVELOP/data/TWiki/WebSearch.txt
twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt
twiki/branches/DEVELOP/twikiplugins/PatternSkin/data/TWiki/PatternSkinCss.txt
twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/search.pattern.tmpl
Log:
Item1858: search fixes
Modified: twiki/branches/DEVELOP/data/TWiki/WebSearch.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/WebSearch.txt 2006-03-13 22:43:27 UTC (rev 9271)
+++ twiki/branches/DEVELOP/data/TWiki/WebSearch.txt 2006-03-13 22:44:14 UTC (rev 9272)
@@ -2,8 +2,6 @@
%META:TOPICPARENT{name="WebHome"}%
---+ %MAKETEXT{"Web Search"}%
-%IF{"defined search" then='<a href="#" style="text-decoration:none;" onclick="location.hash=\'twikiSearchForm\'; return false;">%ICON{down}% <span class="patternLinkLabel">%MAKETEXT{"Modify search"}%</span></a>'}%
-
%SEARCH{
"%URLPARAM{search}%"
type="keyword"
@@ -19,9 +17,9 @@
<form action="%SCRIPTURLPATH{view}%/%INCLUDINGWEB%/%INCLUDINGTOPIC%">
<table id="twikiSearchTable" border="0" cellspacing="0" cellpadding="0">
<tr>
-<td colspan="2" class="first"><div class="twikiLeft">
- <input type="text" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" />
- <input type="submit" class="twikiSubmit" value='%MAKETEXT{"Search"}%' /></div><div class="twikiLeft"><span class="twikiSmall"> [[%INCLUDINGWEB%.WebSearchAdvanced][%MAKETEXT{"Advanced search"}%]] | [[%TWIKIWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span></div><br class="twikiClear" />
+<td colspan="2" class="first">
+ <input type="text" class="twikiInputField" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" />
+ <input type="submit" class="twikiSubmit" value='%MAKETEXT{"Search"}%' /><span class="twikiSmall"> [[%INCLUDINGWEB%.WebSearchAdvanced][%MAKETEXT{"Advanced search"}%]] | [[%TWIKIWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span>
<div class="twikiSmall" 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>
</tr>
Modified: twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt 2006-03-13 22:43:27 UTC (rev 9271)
+++ twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt 2006-03-13 22:44:14 UTC (rev 9272)
@@ -2,8 +2,6 @@
%META:TOPICPARENT{name="WebSearch"}%
---+ %MAKETEXT{"Advanced Search"}%
-%IF{" '%URLPARAM{search}%' = '' " then="" else='<a href="#" style="text-decoration:none;" onclick="location.hash=\'twikiSearchForm\'; return false;">%ICON{down}% <span class="patternLinkLabel">%MAKETEXT{"Modify search"}%</span></a>'}%
-
%SEARCH{
"%URLPARAM{search}%"
type="keyword"
@@ -28,7 +26,7 @@
<table id="twikiSearchTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td colspan="2" class="first">
- <input type="text" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" />
+ <input class="twikiInputField" type="text" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" />
<input type="submit" class="twikiSubmit" value='%MAKETEXT{"Search"}%' /><span class="twikiSmall"> [[%INCLUDINGWEB%.WebSearch][%MAKETEXT{"Simple search"}%]] | [[%TWIKIWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span>
<div class="twikiSmall" 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>
@@ -73,7 +71,7 @@
</tr>
<tr>
<th class="last">%MAKETEXT{"Limit results to:"}%</th>
-<td class="last"><input type="text" id="limit" name="limit" size="3" value="%IF{" '%URLPARAM{"limit" default="all"}%' = 'all' " then="all" else="%URLPARAM{limit}%"}%" /><label for="limit"> %MAKETEXT{"Topics per web"}% </label><span class="twikiSmall">%MAKETEXT{"(=all= to show all topics)"}%</span>
+<td class="last"><input type="text" class="twikiInputField" id="limit" name="limit" size="3" value="%IF{" '%URLPARAM{"limit" default="all"}%' = 'all' " then="all" else="%URLPARAM{limit}%"}%" /><label for="limit"> %MAKETEXT{"Topics per web"}% </label><span class="twikiSmall">%MAKETEXT{"(=all= to show all topics)"}%</span>
</td>
</tr>
</table>
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/data/TWiki/PatternSkinCss.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/data/TWiki/PatternSkinCss.txt 2006-03-13 22:43:27 UTC (rev 9271)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/data/TWiki/PatternSkinCss.txt 2006-03-13 22:44:14 UTC (rev 9272)
@@ -103,7 +103,7 @@
* patternDiffOptions - row of revision options under "Compare revisions"
* Search results
- * .patternSearchResults - container
+ * .patternSearchResults - container on rename pages (no longer used on actual search results 'view' pages)
* .patternSearchResultsHeader - horizontal bar with the web color
* .patternSearchResults - block of one result
* .patternSearchResultCount - the number of results
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2006-03-13 22:43:27 UTC (rev 9271)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2006-03-13 22:44:14 UTC (rev 9272)
@@ -759,6 +759,7 @@
----------------------------------------------------------- */
.patternSearchResults {
+ /* no longer used in search.pattern.tmpl, but remains in rename templates */
margin:0 0 1em 0;
}
.patternSearchResults blockquote {
@@ -776,6 +777,7 @@
font-size:115%; /* same as twikiFormStep */
margin:0;
padding:.5em 20px;
+ font-weight:bold;
}
h4.patternSearchResultsHeader {
font-size:100%;
@@ -819,7 +821,7 @@
text-align:left;
}
.patternSearchResultCount {
- margin:0 0 3em 0;
+ margin:1em 0 3em 0;
}
.patternSearched {
}
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/search.pattern.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/search.pattern.tmpl 2006-03-13 22:43:27 UTC (rev 9271)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/search.pattern.tmpl 2006-03-13 22:44:14 UTC (rev 9272)
@@ -13,11 +13,11 @@
%TMPL:DEF{"textcontent"}%%SPLIT%%TMPL:P{"searched"}%
-%SPLIT%<div class="patternSearchResults">%TMPL:P{"header"}%
+%SPLIT%%TMPL:P{"header"}%
%REPEAT%
%TMPL:P{"result"}%
%REPEAT%
-%SPLIT%%TMPL:P{"count"}%</div><!--/patternSearchResults-->%SPLIT%%TMPL:END%
+%SPLIT%%TMPL:P{"count"}%%SPLIT%%TMPL:END%
|