lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsing...@apache.org
Subject svn commit: r1238126 - in /lucene/cms/trunk: content/solr/downloads.mdtext lib/path.pm templates/main.html templates/solr-simple.html templates/solr.html
Date Tue, 31 Jan 2012 01:43:39 GMT
Author: gsingers
Date: Tue Jan 31 01:43:39 2012
New Revision: 1238126

URL: http://svn.apache.org/viewvc?rev=1238126&view=rev
Log:
get solr slides working

Modified:
    lucene/cms/trunk/content/solr/downloads.mdtext
    lucene/cms/trunk/lib/path.pm
    lucene/cms/trunk/templates/main.html
    lucene/cms/trunk/templates/solr-simple.html
    lucene/cms/trunk/templates/solr.html

Modified: lucene/cms/trunk/content/solr/downloads.mdtext
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/content/solr/downloads.mdtext?rev=1238126&r1=1238125&r2=1238126&view=diff
==============================================================================
--- lucene/cms/trunk/content/solr/downloads.mdtext (original)
+++ lucene/cms/trunk/content/solr/downloads.mdtext Tue Jan 31 01:43:39 2012
@@ -2,16 +2,14 @@
 
 Official releases are usually created when the [developers](whoweare.html) feel there are
             sufficient changes, improvements and bug fixes to warrant a release.
-            Due to the voluntary nature of Lucene, no releases are scheduled in advance.
System Requirements are detailed
-            [here](systemrequirements.html).
+            Due to the voluntary nature of Solr, no releases are scheduled in advance.
 
-Both binary and source releases for the latest version of Lucene are available from
-        [the Apache Mirrors](http://www.apache.org/dyn/closer.cgi/lucene/java/).
+Both binary and source releases for the latest version of Solr are available from
+        [the Apache Mirrors](http://www.apache.org/dyn/closer.cgi/lucene/solr/).
 
-Archives for all past versions of Lucene are available at [the Apache archives](http://archive.apache.org/dist/lucene/java/).
+Archives for all past versions of Lucene are available at [the Apache archives](http://archive.apache.org/dist/lucene/solr/).
 
-The <tt>lucene-VERSION.zip</tt> or <tt>.tar.gz</tt> (where VERSION
is the version number of the release, e.g. 3.0.1) file contains the
-            lucene-core jar file, html documentation, a demo application (see the "Getting
Started" section)
-            and various jar files containing contributed code.  The
-            <tt>lucene-VERSION-src.zip</tt> or <tt>.tar.gz</tt> contains
the full source
+The <tt>apache-solr-VERSION.zip</tt> or <tt>.tgz</tt> (where VERSION
is the version number of the release, e.g. 3.0.1) file contains
+            Apache Solr, html documentation and tutorial.  The
+            <tt>apache-solr-VERSION-src.zip</tt> or <tt>.tgz</tt>
contains the full source
             code for that version.

Modified: lucene/cms/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/lib/path.pm?rev=1238126&r1=1238125&r2=1238126&view=diff
==============================================================================
--- lucene/cms/trunk/lib/path.pm (original)
+++ lucene/cms/trunk/lib/path.pm Tue Jan 31 01:43:39 2012
@@ -19,8 +19,7 @@ our @patterns = (
 	 [qr!core\/.*?\.mdtext$!, main => { template => "core-simple.html"
 	}],
 
-	[qr!solr\/.*?\.mdtext$!, main => { template => "solr-simple.html"
-	 }],
+	[qr@solr\/(?!index).*?\.mdtext$@, main => { template => "solr-simple.html"}],
 	[qr!pylucene/jcc/.*?\.mdtext$!, main => { template => "jcc-simple.html" }],
 	[qr!pylucene/.*?\.mdtext$!, main => { template => "pylucene-simple.html" }],
 	[qr!openrelevance\/.*?\.mdtext$!, main => { template => "openrelevance-simple.html"
}],

Modified: lucene/cms/trunk/templates/main.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/main.html?rev=1238126&r1=1238125&r2=1238126&view=diff
==============================================================================
--- lucene/cms/trunk/templates/main.html (original)
+++ lucene/cms/trunk/templates/main.html Tue Jan 31 01:43:39 2012
@@ -131,9 +131,7 @@ https://docs.djangoproject.com/en/dev/to
       <h1 class="title">{% block title %}{{ headers.title }}{% endblock %}</h1>
 
       <div>{% block content %}{{ content|markdown }}{% endblock %}</div>
-      {% block news %}
-      <div>{% filter markdown %}{% include "mainnews.mdtext" %}{% endfilter %}</div>
-      {% endblock %}
+      {% block news %}<div>{% filter markdown %}{% include "mainnews.mdtext" %}{% endfilter
%}</div>{% endblock %}
       {% block asfboiler %}
       <div>{% filter markdown %}{% include "asf.mdtext" %}{% endfilter %}</div>
       {% endblock %}

Modified: lucene/cms/trunk/templates/solr-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-simple.html?rev=1238126&r1=1238125&r2=1238126&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr-simple.html (original)
+++ lucene/cms/trunk/templates/solr-simple.html Tue Jan 31 01:43:39 2012
@@ -1,6 +1,7 @@
+<!-- solr-simple.html -->
 {% extends "solr.html" %}
 {#
 No news section
 #}
-{% block news %}
-{% endblock %}
+{% block news %}<!-- Here no news -->{% endblock %}
+{% endextends %}
\ No newline at end of file

Modified: lucene/cms/trunk/templates/solr.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr.html?rev=1238126&r1=1238125&r2=1238126&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr.html (original)
+++ lucene/cms/trunk/templates/solr.html Tue Jan 31 01:43:39 2012
@@ -33,7 +33,7 @@
   <script type="text/javascript" src="../scripts/effects.js"></script>
   <script type="text/javascript" src="../scripts/search.js"></script>
   <script type="text/javascript" src="../scripts/slides.js"></script>
-  <script type="text/javascript" src="../scripts/jquery.js"></script>
+  <!--<script type="text/javascript" src="../scripts/jquery.js"></script>-->
 </head>
 {% endblock %}
 {% block logo %}
@@ -47,7 +47,8 @@
             Ultra-fast Lucene-based Search Server<br/>
           </div>
           <div class="descwrapper"><div class="description">
-            Apache Solr offers Lucene's capabilities in an easy to use, fast search server
+            Apache Solr offers Lucene's capabilities in an easy to use,
+            fast search server with additional features like faceting, scalability and much
more
           </div></div>
           <div class="mantle">
             <img alt="Apache Solr" src="../images/mantle-solr.png"/>
@@ -69,11 +70,12 @@
             Scalable
           </div>
           <div class="descwrapper"><div class="description">
-            Apache Solr has been deployed successfully in both high query volume situations
and
+            Apache Solr has been deployed successfully in both high query volume
+            situations and
             large collection sizes
           </div></div>
           <div class="mantle">
-            <img alt="Apache Mahout community" src="../images/mantle-scale.png"/>
+            <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
           </div>
         </div>
         <div id="slide4" style="display:none">
@@ -95,6 +97,12 @@
         <a class="stop" id="stop" title="Stop" href="#">Stop</a>
       </div>
     </div>
+    <script type="text/javascript">
+      function StartSlides() {
+        new Slides('mantleSlides');
+      }
+      document.observe('dom:loaded', StartSlides);
+    </script>
 {% endblock %}
 {% block nav %}
 <ul>
@@ -107,9 +115,8 @@
   <li><a class="last" href="../">Lucene</a></li>
 </ul>
 {% endblock %}
-{% block news %}
-  <div>{% filter markdown %}{% include "../content/solr/solrnews.mdtext" %}{% endfilter
%}</div>
-{% endblock %}
+
+{% block news %}<div>{% filter markdown %}{% include "../content/solr/solrnews.mdtext"
%}{% endfilter %}</div>{% endblock %}
 
 {% block sidebar %}
     <div id="sidebar">
@@ -148,4 +155,5 @@
       </span>
     </div>
 {% endblock %}
-{% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
\ No newline at end of file
+{% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
+{% endextends %}
\ No newline at end of file



Mime
View raw message