Menu
▾
▴
[TWiki-Dev] [SVN] r9297 - in twiki/branches/DEVELOP: data/TWiki pub/TWiki/TWikiJavascripts twikiplugins/PatternSkin/pub/TWiki/PatternSkin twikiplugins/PatternSkin/templates
|
From: <Art...@nt...> - 2006-03-15 01:19:49
|
Author: ArthurClemens
Date: 2006-03-14 17:16:29 -0800 (Tue, 14 Mar 2006)
New Revision: 9297
Modified:
twiki/branches/DEVELOP/data/TWiki/WebSearch.txt
twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt
twiki/branches/DEVELOP/pub/TWiki/TWikiJavascripts/twiki.js
twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/layout.css
twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl
twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/searchbase.pattern.tmpl
Log:
Item1864: fixes "modify search" link and introduces some javascript magic to show the number of results at the top
Modified: twiki/branches/DEVELOP/data/TWiki/WebSearch.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/WebSearch.txt 2006-03-14 23:49:55 UTC (rev 9296)
+++ twiki/branches/DEVELOP/data/TWiki/WebSearch.txt 2006-03-15 01:16:29 UTC (rev 9297)
@@ -11,6 +11,13 @@
zeroresults="off%URLPARAM{search}%"
}%
+<script type="text/javascript">
+//<![CDATA[
+ var linkText='<a href="#" onclick="location.hash=\'twikiSearchForm\'; return false;"><span class="patternLinkLabel twikiSmallish">%MAKETEXT{"Modify search"}%</span></a>';
+ %IF{"defined search" then="writeHtml(' ' + linkText, 'twikiModifySearchContainer');"}%
+//]]>
+</script>
+
<a name="twikiSearchForm"></a>
<noautolink>
<div class="twikiPageForm">
Modified: twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt 2006-03-14 23:49:55 UTC (rev 9296)
+++ twiki/branches/DEVELOP/data/TWiki/WebSearchAdvanced.txt 2006-03-15 01:16:29 UTC (rev 9297)
@@ -19,6 +19,13 @@
zeroresults="off%URLPARAM{search}%"
}%
+<script type="text/javascript">
+//<![CDATA[
+ var linkText='<a href="#" onclick="location.hash=\'twikiSearchForm\'; return false;"><span class="patternLinkLabel twikiSmallish">%MAKETEXT{"Modify search"}%</span></a>';
+ %IF{"defined search" then="writeHtml(' ' + linkText, 'twikiModifySearchContainer');"}%
+//]]>
+</script>
+
<a name="twikiSearchForm"></a>
<noautolink>
<div class="twikiPageForm">
Modified: twiki/branches/DEVELOP/pub/TWiki/TWikiJavascripts/twiki.js
===================================================================
--- twiki/branches/DEVELOP/pub/TWiki/TWikiJavascripts/twiki.js 2006-03-14 23:49:55 UTC (rev 9296)
+++ twiki/branches/DEVELOP/pub/TWiki/TWikiJavascripts/twiki.js 2006-03-15 01:16:29 UTC (rev 9297)
@@ -54,6 +54,16 @@
return false;
}
+/**
+Writes html inside container with id inId.
+*/
+function writeHtml (inHtml, inId) {
+ var elem = document.getElementById(inId);
+ if (elem) {
+ elem.innerHTML = inHtml;
+ }
+}
+
// Remove the given class from an element, if it is there
function removeClass(element, classname) {
var classes = getClassList(element);
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/layout.css
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/layout.css 2006-03-14 23:49:55 UTC (rev 9296)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/layout.css 2006-03-15 01:16:29 UTC (rev 9297)
@@ -162,5 +162,5 @@
}
.twikiLast,
.patternTopic .twikiLast {
- border-width:0px;
+ border-bottom:0px;
}
\ No newline at end of file
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl 2006-03-14 23:49:55 UTC (rev 9296)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl 2006-03-15 01:16:29 UTC (rev 9297)
@@ -29,7 +29,7 @@
<form name="main" action="%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%" method="post">
<input type="hidden" name="t" value="%GMTIME{'$epoch'}%" />
-<div class="twikiFormSteps" style="border-bottom:none;">
+<div class="twikiFormSteps twikiLast">
<div class="twikiFormStep twikiLast">
---+++ %MAKETEXT{"Possible form templates"}%
%FORMLIST%
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/searchbase.pattern.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/searchbase.pattern.tmpl 2006-03-14 23:49:55 UTC (rev 9296)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/searchbase.pattern.tmpl 2006-03-15 01:16:29 UTC (rev 9297)
@@ -1,15 +1,21 @@
-%TMPL:DEF{"searched"}%<p><span class="patternSearched">%MAKETEXT{"Searched:"}% <b><nop>%SEARCHSTRING%</b></span><br />%TMPL:P{"modifysearch"}%</p>%TMPL:END%
+%TMPL:DEF{"searched"}%<span class="patternSearched">%MAKETEXT{"Searched:"}% <b><nop>%SEARCHSTRING%</b></span><span id="twikiNumberOfResultsContainer"></span><span id="twikiModifySearchContainer"></span>%TMPL:END%
-%TMPL:DEF{"modifysearch"}%%IF{" '%URLPARAM{search}%' = '' " then="" else='<a href="#" onclick="location.hash=\'twikiSearchForm\'; return false;">%MAKETEXT{"Modify search"}%</a>'}%%TMPL:END%
+%TMPL:DEF{"count"}%<div class="patternSearchResultCount" id="twikiBottomResultCount">%MAKETEXT{"Number of topics:"}% <b>%NTOPICS%</b></div><!--/patternSearchResultCount-->
+<script type="text/javascript">
+// write results at the top
+//<![CDATA[
+ writeHtml('<br />%MAKETEXT{"Number of topics:"}% <b>%NTOPICS%</b>', 'twikiNumberOfResultsContainer');
+ var count = %NTOPICS%;
+ if (count < 10) {
+ writeHtml('', 'twikiBottomResultCount');
+ }
+//]]>
+</script>%TMPL:END%
-%TMPL:DEF{"count"}%<div class="patternSearchResultCount">%MAKETEXT{"Number of topics:"}% <b>%NTOPICS%</b></div><!--/patternSearchResultCount-->%TMPL:END%
-
-
-
%TMPL:DEF{"header"}%<h4 class="patternSearchResultsHeader" %TMPL:P{"header:style:backgroundcolor"}%><span class="twikiLeft">%TMPL:P{"header:left"}%</span><span class="twikiRight">%TMPL:P{"header:right"}%</span><br class="twikiClear" /></h4>%TMPL:END%
|