You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ot...@apache.org on 2011/01/07 19:43:59 UTC
svn commit: r1056452 - in /lucene/dev/trunk/solr: site/ site/images/
site/skin/ src/site/src/documentation/skins/lucene/css/
src/site/src/documentation/skins/lucene/xslt/html/
Author: otis
Date: Fri Jan 7 18:43:58 2011
New Revision: 1056452
URL: http://svn.apache.org/viewvc?rev=1056452&view=rev
Log:
LUCENE-2660 - Added alternative search provider option for Solr
Modified:
lucene/dev/trunk/solr/site/features.html
lucene/dev/trunk/solr/site/images/solr.jpg
lucene/dev/trunk/solr/site/index.html
lucene/dev/trunk/solr/site/issue_tracking.html
lucene/dev/trunk/solr/site/linkmap.html
lucene/dev/trunk/solr/site/mailing_lists.html
lucene/dev/trunk/solr/site/skin/screen.css
lucene/dev/trunk/solr/site/tutorial.html
lucene/dev/trunk/solr/site/tutorial.pdf
lucene/dev/trunk/solr/site/version_control.html
lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/css/screen.css
lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
Modified: lucene/dev/trunk/solr/site/features.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/features.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/features.html (original)
+++ lucene/dev/trunk/solr/site/features.html Fri Jan 7 18:43:58 2011
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,6 +155,43 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit"></div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
Modified: lucene/dev/trunk/solr/site/images/solr.jpg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/images/solr.jpg?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/trunk/solr/site/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/index.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/index.html (original)
+++ lucene/dev/trunk/solr/site/index.html Fri Jan 7 18:43:58 2011
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,6 +155,43 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit">
<hr>
<a href="http://forrest.apache.org/"><img border="0" title="Built with Apache Forrest" alt="Built with Apache Forrest - logo" src="images/built-with-forrest-button.png" style="width: 88px;height: 31px;"></a>
Modified: lucene/dev/trunk/solr/site/issue_tracking.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/issue_tracking.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/issue_tracking.html (original)
+++ lucene/dev/trunk/solr/site/issue_tracking.html Fri Jan 7 18:43:58 2011
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,6 +155,43 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit"></div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
Modified: lucene/dev/trunk/solr/site/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/linkmap.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/linkmap.html (original)
+++ lucene/dev/trunk/solr/site/linkmap.html Fri Jan 7 18:43:58 2011
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,6 +155,43 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit"></div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
Modified: lucene/dev/trunk/solr/site/mailing_lists.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/mailing_lists.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/mailing_lists.html (original)
+++ lucene/dev/trunk/solr/site/mailing_lists.html Fri Jan 7 18:43:58 2011
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,6 +155,43 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit"></div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
Modified: lucene/dev/trunk/solr/site/skin/screen.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/skin/screen.css?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/skin/screen.css (original)
+++ lucene/dev/trunk/solr/site/skin/screen.css Fri Jan 7 18:43:58 2011
@@ -95,7 +95,7 @@ html>body #top .searchbox {
#top .searchbox {
position: absolute;
right: 10px;
- height: 42px;
+ height: 28px;
font-size: 70%;
white-space: nowrap;
text-align: right;
Modified: lucene/dev/trunk/solr/site/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/tutorial.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/tutorial.html (original)
+++ lucene/dev/trunk/solr/site/tutorial.html Fri Jan 7 18:43:58 2011
@@ -5,7 +5,7 @@
<meta content="Apache Forrest" name="Generator">
<meta name="Forrest-version" content="0.8">
<meta name="Forrest-skin-name" content="lucene">
-<title>Solr tutorial (version 3.0.0.2010.07.10.11.10.25)</title>
+<title>Solr tutorial (version 4.0.0.2011.01.04.00.08.44)</title>
<link type="text/css" href="skin/basic.css" rel="stylesheet">
<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,9 +155,46 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit">
<hr>
- This document is for Apache Solr version 3.0.0.2010.07.10.11.10.25. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+ This document is for Apache Solr version 4.0.0.2011.01.04.00.08.44. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
</div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -181,7 +218,7 @@ document.write("Last Published: " + docu
</div>
<h1>Solr tutorial</h1>
<div id="motd-area">
- This document is for Apache Solr version 3.0.0.2010.07.10.11.10.25. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+ This document is for Apache Solr version 4.0.0.2011.01.04.00.08.44. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
</div>
<div id="minitoc-area">
<ul class="minitoc">
@@ -252,14 +289,14 @@ To follow along with this tutorial, you
</p>
<ol>
-<li>Java 1.5 or greater. Some places you can get it are from
+<li>Java 1.6 or greater. Some places you can get it are from
<a href="http://java.sun.com/j2se/downloads.html">OpenJDK</a>,
<a href="http://java.sun.com/j2se/downloads.html">Sun</a>,
<a href="http://www.ibm.com/developerworks/java/jdk/">IBM</a>, or
<a href="http://www.oracle.com/technology/products/jrockit/index.html">Oracle</a>.
<br>
Running <span class="codefrag">java -version</span> at the command line should indicate a version
- number starting with 1.5. Gnu's GCJ is not supported and does not work with Solr.
+ number starting with 1.6. Gnu's GCJ is not supported and does not work with Solr.
</li>
<li>A <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr/">Solr release</a>.
Modified: lucene/dev/trunk/solr/site/tutorial.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/tutorial.pdf?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/trunk/solr/site/version_control.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/version_control.html?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/version_control.html (original)
+++ lucene/dev/trunk/solr/site/version_control.html Fri Jan 7 18:43:58 2011
@@ -48,12 +48,12 @@
|start Search
+-->
<div class="searchbox">
-<form action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
+<form id="searchform" action="http://search.lucidimagination.com/p:solr" method="get" class="roundtopsmall">
<input onFocus="getBlank (this, 'Search the site with Solr');" size="25" name="q" id="query" type="text" value="Search the site with Solr">
- <input name="Search" value="Search" type="submit">
+ <input onclick="selectProvider(this.form)" name="Search" value="Search" type="submit">
+ @
+ <select id="searchProvider" name="searchProvider"><option value="any">select provider</option><option value="lucid">Lucid Find</option><option value="sl">Search-Lucene</option></select>
</form>
-<div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com" style="color: #033268">Lucid Imagination</a>
-</div>
</div>
<!--+
|end search
@@ -155,6 +155,43 @@ document.write("Last Published: " + docu
<a href="http://lucene.apache.org/nutch/">Nutch</a>
</div>
</div>
+<script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
<div id="credit"></div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
Modified: lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/css/screen.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/css/screen.css?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/css/screen.css (original)
+++ lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/css/screen.css Fri Jan 7 18:43:58 2011
@@ -95,7 +95,7 @@ html>body #top .searchbox {
#top .searchbox {
position: absolute;
right: 10px;
- height: 42px;
+ height: 28px;
font-size: 70%;
white-space: nowrap;
text-align: right;
Modified: lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl?rev=1056452&r1=1056451&r2=1056452&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl (original)
+++ lucene/dev/trunk/solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl Fri Jan 7 18:43:58 2011
@@ -215,15 +215,20 @@ footer, searchbar, css etc. As input, i
</form>
</xsl:when>
<xsl:otherwise>
- <form class="roundtopsmall" method="get" action="http://search.lucidimagination.com/p:solr">
+ <form class="roundtopsmall" method="get" action="http://search.lucidimagination.com/p:solr" id="searchform">
<input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
<xsl:attribute name="value">
<xsl:value-of select="$search-prompt"/>
</xsl:attribute>
</input> 
- <input type="submit" value="Search" name="Search" i18n:attr="value"/>
+ <input type="submit" value="Search" name="Search" onclick="selectProvider(this.form)"/>
+ @
+ <select name="searchProvider" id="searchProvider">
+ <option value="any">select provider</option>
+ <option value="lucid">Lucid Find</option>
+ <option value="sl">Search-Lucene</option>
+ </select>
</form>
- <div style="position: relative; top: -5px; left: -10px">Powered by <a style="color: #033268" href="http://www.lucidimagination.com">Lucid Imagination</a></div>
</xsl:otherwise>
</xsl:choose>
<!--div id="roundbottomsmall">
@@ -472,13 +477,19 @@ document.write("]]><i18n:text >Last Publ
</form>
</xsl:when>
<xsl:otherwise>
- <form class="roundtopsmall" method="get" action="http://search.lucidimagination.com/p:solr">
+ <form class="roundtopsmall" method="get" action="http://search.lucidimagination.com/p:solr" id="searchform">
<input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
<xsl:attribute name="value">
<xsl:value-of select="$search-prompt"/>
</xsl:attribute>
</input> 
- <input type="submit" value="Search" name="Search" i18n:attr="value"/>
+ <input type="submit" value="Search" name="Search" onclick="selectProvider(this.form)"/>
+ @
+ <select name="searchProvider" id="searchProvider">
+ <option value="any">select provider</option>
+ <option value="lucid">Lucid Find</option>
+ <option value="sl">Search-Lucene</option>
+ </select>
</form>
</xsl:otherwise>
</xsl:choose>
@@ -487,6 +498,51 @@ document.write("]]><i18n:text >Last Publ
|end search
+</xsl:comment>
</xsl:if>
+ <xsl:if test="$config/search">
+ <xsl:choose>
+ <xsl:when test="$config/search/@provider = 'lucene'">
+ </xsl:when>
+ <xsl:otherwise>
+ <script type="text/javascript">
+ function selectProvider(form) {
+ provider = form.elements['searchProvider'].value;
+ if (provider == "any") {
+ if (Math.random() > 0.5) {
+ provider = "lucid";
+ } else {
+ provider = "sl";
+ }
+ }
+
+ if (provider == "lucid") {
+ form.action = "http://search.lucidimagination.com/p:solr";
+ } else if (provider == "sl") {
+ form.action = "http://search-lucene.com/solr";
+ }
+
+ days = 365; // cookie will be valid for a year
+ date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ expires = "; expires=" + date.toGMTString();
+ document.cookie = "searchProvider=" + provider + expires + "; path=/";
+ }
+
+ if (document.cookie.length>0) {
+ cStart=document.cookie.indexOf("searchProvider=");
+ if (cStart!=-1) {
+ cStart=cStart + "searchProvider=".length;
+ cEnd=document.cookie.indexOf(";", cStart);
+ if (cEnd==-1) {
+ cEnd=document.cookie.length;
+ }
+ provider = unescape(document.cookie.substring(cStart,cEnd));
+ document.forms['searchform'].elements['searchProvider'].value = provider;
+ }
+ }
+ </script>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
<!--credits in alternative location-->
<div id="credit">
<xsl:if test="$filename = 'index.html' and $config/credits and ($config/credits/credit/@box-location = 'alt')">