You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2012/01/31 15:24:09 UTC

svn commit: r1238606 - in /lucene/cms/trunk: lib/ templates/

Author: gsingers
Date: Tue Jan 31 14:24:08 2012
New Revision: 1238606

URL: http://svn.apache.org/viewvc?rev=1238606&view=rev
Log:
workaround for INFRA-3850

Added:
    lucene/cms/trunk/templates/analytics.html
    lucene/cms/trunk/templates/body.html
    lucene/cms/trunk/templates/head.html
    lucene/cms/trunk/templates/javascript.html
    lucene/cms/trunk/templates/solr-logo.html
    lucene/cms/trunk/templates/solr-nav.html
    lucene/cms/trunk/templates/solr-sidebar.html
    lucene/cms/trunk/templates/solr-slides.html
Modified:
    lucene/cms/trunk/lib/view.pm
    lucene/cms/trunk/templates/main.html
    lucene/cms/trunk/templates/solr-simple.html
    lucene/cms/trunk/templates/solr.html

Modified: lucene/cms/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/lib/view.pm?rev=1238606&r1=1238605&r2=1238606&view=diff
==============================================================================
--- lucene/cms/trunk/lib/view.pm (original)
+++ lucene/cms/trunk/lib/view.pm Tue Jan 31 14:24:08 2012
@@ -42,7 +42,7 @@ sub main {
             read_text_file $f, $args{$1};
         }
     }
-    print "Template: $template\n";
+    print "Template: $template \n";
     return Dotiac::DTL::Template($template)->render(\%args), html => \%args;
 }
 
@@ -156,7 +156,7 @@ sub fetch_doap_url_list {
     return @urls;
 }
 
-1;
+
 
 sub breadcrumbs {
     my @path = split m!/!, shift;

Added: lucene/cms/trunk/templates/analytics.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/analytics.html?rev=1238606&view=auto
==============================================================================
    (empty)

Added: lucene/cms/trunk/templates/body.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/body.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/body.html (added)
+++ lucene/cms/trunk/templates/body.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,130 @@
+<body id="home">
+<div id="wrap">
+  <div id="header">
+    <div id="logo">
+      {% block logo %}
+      <a href="http://lucene.apache.org/"><img border="0" src="images/lucene_logo_green_300.png" alt="Lucene Logo"/></a>
+      {% endblock %}
+    </div>
+    {% include "search.html" %}
+    <div id="nav">
+      {% block nav %}
+      <ul>
+        <li><a href="./core/">Core (Java)</a></li>
+        <li><a href="./solr/">Solr</a></li>
+        <li><a href="./pylucene/index.html">PyLucene</a></li>
+        <li><a href="./openrelevance/">Open Relevance</a></li>
+      </ul>
+      {% endblock %}
+    </div>
+    {% block slides %}
+    <div id="slides">
+      <div class="slideshow" id="mantleSlides">
+        <div id="slide1" >
+          <div class="callout">
+            Ultra-fast Search Library and Server<br/>
+          </div>
+          <div class="descwrapper"><div class="description">
+            Apache Lucene and Solr set the standard for search and indexing performance
+          </div></div>
+          <div class="mantle">
+            <img alt="Apache Lucene" src="images/mantle-lucene-solr.png"/>
+          </div>
+        </div>
+        <div id="slide2" style="display:none">
+          <div class="callout">
+            Proven search capabilities<br/>
+          </div>
+          <div class="descwrapper"><div class="description">
+            Our core algorithms along with the Solr search server power applications the world over, ranging
+            from mobile devices to sites like Twitter, Apple and Wikipedia.
+          </div></div>
+          <div class="mantle">
+            <img alt="Lucene Power" src="images/mantle-power.png"/>
+          </div>
+        </div>
+        <div id="slide3" style="display:none">
+          <div class="callout">
+            Large, Vibrant community
+          </div>
+          <div class="descwrapper"><div class="description">
+            The goal of Apache Lucene and Solr is to provide world class search capabilities
+          </div></div>
+          <div class="mantle">
+            <img alt="Apache Mahout community" src="images/mantle-community.png"/>
+          </div>
+        </div>
+        <div id="slide4" style="display:none">
+          <div class="callout">
+            Apache 2.0 licensed
+          </div>
+          <div class="descwrapper"><div class="description">
+            Apache Lucene and Solr are distributed under a commercially friendly Apache Software license
+          </div></div>
+          <div class="mantle">
+            <img alt="Apache Software Foundation" src="images/mantle-asf.png"/>
+          </div>
+        </div>
+      </div>
+      <div class="controls">
+        <a class="next" id="next" title="Next" href="#">Next</a>
+        <a class="previous" id="previous" title="Previous" href="#">Previous</a>
+        <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
+        <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 %}
+  </div>
+  <div id="content-wrap" class="clearfix">
+    <div id="main">
+      <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 news %}
+
+      {% block asfboiler %}
+      <div>{% filter markdown %}{% include "asf.mdtext" %}{% endfilter %}</div>
+      {% endblock %}
+    </div>
+    {% block sidebar %}
+    <div id="sidebar">
+      {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
+      <div class="status">
+        <div id="dev-mail">
+          <h1>Latest Dev</h1>
+          <div class="status-item">{% for e in dev.list %}
+          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
+          <hr>
+          {% endfor %}</div>
+        </div>
+        <div id="core-user-mail">
+          <h1>Latest Core User</h1>
+          <div class="status-item">{% for e in coreuser.list %}
+          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
+          <hr>
+          {% endfor %}</div>
+        </div>
+        <div id="solr-user-mail">
+          <h1>Latest Solr User</h1>
+          <div class="status-item">{% for e in solruser.list %}
+          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
+          <hr>
+          {% endfor %}</div>
+        </div>
+      </div>
+    </div>
+    {% endblock %}
+  </div>
+  {% include "footer.html" %}
+</div>
+{% include "analytics.html" %}
+</body>
\ No newline at end of file

Added: lucene/cms/trunk/templates/head.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/head.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/head.html (added)
+++ lucene/cms/trunk/templates/head.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,31 @@
+<head>
+  <!--
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE- 2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+  -->
+
+  {% block css %}<link href="css/global.css" rel="stylesheet" type="text/css">{% endblock %}
+  <title>Apache Lucene - {% block title %}{{ headers.title }}{% endblock %}</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="Distribution" content="Global"/>
+  <meta name="Robots" content="index,follow"/>
+  {% block metakeys %}<meta name="keywords"
+        content="apache, apache lucene, apache solr, solr, lucene
+        search, information retrieval, spell checking, faceting, inverted index, open source"/>{% endblock %}
+  {% block favicon %}<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"/>{% endblock %}
+  {% include "javascript.html" %}
+</head>
+

Added: lucene/cms/trunk/templates/javascript.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/javascript.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/javascript.html (added)
+++ lucene/cms/trunk/templates/javascript.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,5 @@
+<script type="text/javascript" src="scripts/prototype.js"></script>
+<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>-->
\ No newline at end of file

Modified: lucene/cms/trunk/templates/main.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/main.html?rev=1238606&r1=1238605&r2=1238606&view=diff
==============================================================================
--- lucene/cms/trunk/templates/main.html (original)
+++ lucene/cms/trunk/templates/main.html Tue Jan 31 14:24:08 2012
@@ -1,184 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-{#
-See for how templates work
-https://docs.djangoproject.com/en/dev/topics/templates/
-#}
-{% block head %}
-<head>
-  <!--
-         main.html
-
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements.  See the NOTICE file distributed with
-      this work for additional information regarding copyright ownership.
-      The ASF licenses this file to You under the Apache License, Version 2.0
-      (the "License"); you may not use this file except in compliance with
-      the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE- 2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-  -->
-
-  <link href="css/global.css" rel="stylesheet" type="text/css">
-  <title>Apache Lucene - {% block title %}{{ headers.title }}{% endblock %}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="Distribution" content="Global"/>
-  <meta name="Robots" content="index,follow"/>
-  <meta name="keywords"
-        content="apache, apache lucene, apache solr, solr, lucene
-        search, information retrieval, spell checking, faceting, inverted index, open source"/>
-  <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"/>
-  <script type="text/javascript" src="scripts/prototype.js"></script>
-  <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>-->
-</head>
-{% endblock %}
-<body id="home">
-<div id="wrap">
-  <div id="header">
-    <div id="logo">
-      {% block logo %}
-      <a href="http://lucene.apache.org/"><img border="0" src="images/lucene_logo_green_300.png" alt="Lucene Logo"/></a>
-      {% endblock %}
-    </div>
-    {% include "search.html" %}
-    <div id="nav">
-      {% block nav %}
-      <ul>
-        <li><a href="./core/">Core (Java)</a></li>
-        <li><a href="./solr/">Solr</a></li>
-        <li><a href="./pylucene/index.html">PyLucene</a></li>
-        <li><a href="./openrelevance/">Open Relevance</a></li>
-      </ul>
-      {% endblock %}
-    </div>
-    {% block slides %}
-    <div id="slides">
-      <div class="slideshow" id="mantleSlides">
-        <div id="slide1" >
-          <div class="callout">
-            Ultra-fast Search Library and Server<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Lucene and Solr set the standard for search and indexing performance
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Lucene" src="images/mantle-lucene-solr.png"/>
-          </div>
-        </div>
-        <div id="slide2" style="display:none">
-          <div class="callout">
-            Proven search capabilities<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            Our core algorithms along with the Solr search server power applications the world over, ranging
-            from mobile devices to sites like Twitter, Apple and Wikipedia.
-          </div></div>
-          <div class="mantle">
-            <img alt="Lucene Power" src="images/mantle-power.png"/>
-          </div>
-        </div>
-        <div id="slide3" style="display:none">
-          <div class="callout">
-            Large, Vibrant community
-          </div>
-          <div class="descwrapper"><div class="description">
-            The goal of Apache Lucene and Solr is to provide world class search capabilities
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Mahout community" src="images/mantle-community.png"/>
-          </div>
-        </div>
-        <div id="slide4" style="display:none">
-          <div class="callout">
-            Apache 2.0 licensed
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Lucene and Solr are distributed under a commercially friendly Apache Software license
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Software Foundation" src="images/mantle-asf.png"/>
-          </div>
-        </div>
-      </div>
-      <div class="controls">
-        <a class="next" id="next" title="Next" href="#">Next</a>
-        <a class="previous" id="previous" title="Previous" href="#">Previous</a>
-        <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
-        <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 %}
-  </div>
-  <div id="content-wrap" class="clearfix">
-    <div id="main">
-      <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 asfboiler %}
-      <div>{% filter markdown %}{% include "asf.mdtext" %}{% endfilter %}</div>
-      {% endblock %}
-    </div>
-    {% block sidebar %}
-    <div id="sidebar">
-      {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
-      <div class="status">
-        <div id="dev-mail">
-          <h1>Latest Dev</h1>
-          <div class="status-item">{% for e in dev.list %}
-          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-          <hr>
-          {% endfor %}</div>
-        </div>
-        <div id="core-user-mail">
-          <h1>Latest Core User</h1>
-          <div class="status-item">{% for e in coreuser.list %}
-          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-          <hr>
-          {% endfor %}</div>
-        </div>
-        <div id="solr-user-mail">
-          <h1>Latest Solr User</h1>
-          <div class="status-item">{% for e in solruser.list %}
-          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-          <hr>
-          {% endfor %}</div>
-        </div>
-      </div>
-    </div>
-    {% endblock %}
-  </div>
-  {% include "footer.html" %}
-</div>
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-94576-12']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-</body>
+{% include "head.html" %}
+{% include "body.html" %}
 </html>

Added: lucene/cms/trunk/templates/solr-logo.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-logo.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/solr-logo.html (added)
+++ lucene/cms/trunk/templates/solr-logo.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,2 @@
+{% block solrlogo %}<a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png"
+                                              alt="Solr Logo"/></a>{% endblock %}
\ No newline at end of file

Added: lucene/cms/trunk/templates/solr-nav.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-nav.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/solr-nav.html (added)
+++ lucene/cms/trunk/templates/solr-nav.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,9 @@
+<ul>
+  <li><a href="index.html">Solr</a></li>
+  <li><a href="downloads.html">Download</a></li>
+  <li><a href="documentation.html">Documentation</a></li>
+  <li><a href="quickstart.html">Tutorial</a></li>
+  <li><a href="https://issues.apache.org/jira/browse/SOLR">Bug Tracker</a></li>
+  <li><a href="discussion.html">Discussion</a></li>
+  <li><a class="last" href="../">Lucene</a></li>
+</ul>

Added: lucene/cms/trunk/templates/solr-sidebar.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-sidebar.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/solr-sidebar.html (added)
+++ lucene/cms/trunk/templates/solr-sidebar.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,47 @@
+{% block solrside %}
+<div id="sidebar">
+  <span class="sidenav">{% filter markdown %}{% include "solrnav.mdtext" %}{% endfilter %}
+    <div class="status">
+      <div id="svn">
+        <h1>Latest SVN</h1>
+
+        <div class="status-item">
+          {% for e in svn.list %}
+          <a class="svn" href="http://svn.apache.org/viewvc?revision={{ e.revision }};view=revision">r{{ e.revision
+            }}</a>
+          {{ e.message|safe|truncatewords_html:20 }} ({{
+          e.projects|safe }}) &mdash;
+          <a href="http://people.apache.org/committer-index.html#{{ e.author }}">{{ e.author }}</a>
+          {% endfor %}
+        </div>
+      </div>
+      <div id="jira">
+        <h1>Latest JIRA</h1>
+
+        <div class="status-item">{% for e in jira.list %}
+          <a class="bug" href="{{ e.url }}">{{ e.title|safe }}</a><br/>
+          {{ e.content|safe|truncatewords_html:20 }}
+          {% endfor %}
+        </div>
+      </div>
+      <div id="dev-mail">
+        <h1>Latest Dev</h1>
+
+        <div class="status-item">{% for e in dev.list %}
+          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
+          <hr>
+          {% endfor %}
+        </div>
+      </div>
+      <div id="solr-user-mail">
+        <h1>Latest Solr User</h1>
+
+        <div class="status-item">{% for e in solruser.list %}
+          <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
+          <hr>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+  </span>
+</div>{% endblock %}
\ No newline at end of file

Modified: lucene/cms/trunk/templates/solr-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-simple.html?rev=1238606&r1=1238605&r2=1238606&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr-simple.html (original)
+++ lucene/cms/trunk/templates/solr-simple.html Tue Jan 31 14:24:08 2012
@@ -1,7 +1,34 @@
 <!-- solr-simple.html -->
-{% extends "solr.html" %}
 {#
-No news section
+ This is a work around to the fact that the CMS doesn't allow inheritance of depth
+        2, so instead do a lot of includes.  See https://issues.apache.org/jira/browse/INFRA-3850
 #}
-{% block news %}<!-- Here no news -->{% endblock %}
+{% extends "head.html" %}
+{% block css %}
+    <link href="../css/global.css" rel="stylesheet" type="text/css">
+    <link href="../css/solr.css" rel="stylesheet" type="text/css">
+{% endblock %}
+{% block metakeys %}<meta name="keywords"
+        content="apache, apache lucene, apache solr, solr, lucene
+        search, information retrieval, spell checking, faceting, inverted index, open source"/>
+{% endblock %}
+{% endextends %}
+{% extends "body.html" %}
+{% block logo %}
+  {% include "solr-logo.html" %}
+{% endblock %}
+{% block slides %}
+  {% include "solr-slides.html" %}
+{% endblock %}
+{% block nav %}
+  {% include "solr-nav.html" %}
+{% endblock %}
+
+{% block news %}
+{% endblock %}
+{% block asfboiler %}{% endblock %}
+{% block sidebar %}
+    {% include "solr-sidebar.html" %}
+{% endblock %}
+{% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
 {% endextends %}
\ No newline at end of file

Added: lucene/cms/trunk/templates/solr-slides.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/solr-slides.html?rev=1238606&view=auto
==============================================================================
--- lucene/cms/trunk/templates/solr-slides.html (added)
+++ lucene/cms/trunk/templates/solr-slides.html Tue Jan 31 14:24:08 2012
@@ -0,0 +1,73 @@
+{% block theslides %}
+<div id="slides">
+  <div class="slideshow" id="mantleSlides">
+    <div id="slide1">
+      <div class="callout">
+        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 with additional features like faceting, scalability and much more
+        </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Solr" src="../images/mantle-solr.png"/>
+      </div>
+    </div>
+    <div id="slide2" style="display:none">
+      <div class="callout">
+        Proven search capabilities<br/>
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
+        </div>
+      </div>
+      <div class="mantle">
+        <img alt="Solr Power" src="../images/mantle-power.png"/>
+      </div>
+    </div>
+    <div id="slide3" style="display:none">
+      <div class="callout">
+        Scalable
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr has been deployed successfully in both high query volume
+          situations and
+          large collection sizes
+        </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
+      </div>
+    </div>
+    <div id="slide4" style="display:none">
+      <div class="callout">
+        Apache 2.0 licensed
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr is distributed under a commercially friendly Apache Software license
+        </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
+      </div>
+    </div>
+  </div>
+  <div class="controls">
+    <a class="next" id="next" title="Next" href="#">Next</a>
+    <a class="previous" id="previous" title="Previous" href="#">Previous</a>
+    <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
+    <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 %}
\ 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=1238606&r1=1238605&r2=1238606&view=diff
==============================================================================
--- lucene/cms/trunk/templates/solr.html (original)
+++ lucene/cms/trunk/templates/solr.html Tue Jan 31 14:24:08 2012
@@ -1,159 +1,33 @@
-{% extends "main.html" %}
-{% block head %}
-<head>
-  <!--
-       solr.html
-
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements.  See the NOTICE file distributed with
-      this work for additional information regarding copyright ownership.
-      The ASF licenses this file to You under the Apache License, Version 2.0
-      (the "License"); you may not use this file except in compliance with
-      the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE- 2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-  -->
-  <link href="../css/solr.css" rel="stylesheet" type="text/css">
-  <title>Apache Lucene - {% block title %}{{ headers.title }}{% endblock %}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta name="Distribution" content="Global"/>
-  <meta name="Robots" content="index,follow"/>
-  <meta name="keywords"
+{#
+ This is a work around to the fact that the CMS doesn't allow inheritance of depth
+        2, so instead do a lot of includes.  See https://issues.apache.org/jira/browse/INFRA-3850
+#}
+{% extends "head.html" %}
+{% block css %}
+    <link href="../css/global.css" rel="stylesheet" type="text/css">
+    <link href="../css/solr.css" rel="stylesheet" type="text/css">
+{% endblock %}
+{% block metakeys %}<meta name="keywords"
         content="apache, apache lucene, apache solr, solr, lucene
         search, information retrieval, spell checking, faceting, inverted index, open source"/>
-  <link rel="shortcut icon" type="image/x-icon" href="../images/favicon.ico"/>
-  <script type="text/javascript" src="../scripts/prototype.js"></script>
-  <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>-->
-</head>
 {% endblock %}
+{% endextends %}
+{% extends "body.html" %}
 {% block logo %}
-  <a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png" alt="Solr Logo"/></a>
+  {% include "solr-logo.html" %}
 {% endblock %}
 {% block slides %}
-<div id="slides">
-      <div class="slideshow" id="mantleSlides">
-        <div id="slide1" >
-          <div class="callout">
-            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 with additional features like faceting, scalability and much more
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr" src="../images/mantle-solr.png"/>
-          </div>
-        </div>
-        <div id="slide2" style="display:none">
-          <div class="callout">
-            Proven search capabilities<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
-          </div></div>
-          <div class="mantle">
-            <img alt="Solr Power" src="../images/mantle-power.png"/>
-          </div>
-        </div>
-        <div id="slide3" style="display:none">
-          <div class="callout">
-            Scalable
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr has been deployed successfully in both high query volume
-            situations and
-            large collection sizes
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
-          </div>
-        </div>
-        <div id="slide4" style="display:none">
-          <div class="callout">
-            Apache 2.0 licensed
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr is distributed under a commercially friendly Apache Software license
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
-          </div>
-        </div>
-      </div>
-      <div class="controls">
-        <a class="next" id="next" title="Next" href="#">Next</a>
-        <a class="previous" id="previous" title="Previous" href="#">Previous</a>
-        <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
-        <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>
+  {% include "solr-slides.html" %}
 {% endblock %}
 {% block nav %}
-<ul>
-  <li><a href="index.html">Solr</a></li>
-  <li><a href="downloads.html">Download</a></li>
-  <li><a href="documentation.html">Documentation</a></li>
-  <li><a href="quickstart.html">Tutorial</a></li>
-  <li><a href="https://issues.apache.org/jira/browse/SOLR">Bug Tracker</a></li>
-  <li><a href="discussion.html">Discussion</a></li>
-  <li><a class="last" href="../">Lucene</a></li>
-</ul>
+  {% include "solr-nav.html" %}
 {% 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">
-      <span class="sidenav">{% filter markdown %}{% include "solrnav.mdtext" %}{% endfilter %}
-        <div class="status">
-          <div id="svn">
-            <h1>Latest SVN</h1>
-            <div class="status-item">
-            {% for e in svn.list %}
-            <a class="svn" href="http://svn.apache.org/viewvc?revision={{ e.revision }};view=revision">r{{ e.revision }}</a>
-            {{ e.message|safe|truncatewords_html:20 }} ({{
-            e.projects|safe }}) &mdash;
-            <a href="http://people.apache.org/committer-index.html#{{ e.author }}">{{ e.author }}</a>
-          {% endfor %}</div></div>
-          <div id="jira">
-            <h1>Latest JIRA</h1>
-            <div class="status-item">{% for e in jira.list %}
-            <a class="bug" href="{{ e.url }}">{{ e.title|safe }}</a><br/>
-            {{ e.content|safe|truncatewords_html:20 }}
-          {% endfor %}</div></div>
-          <div id="dev-mail">
-            <h1>Latest Dev</h1>
-            <div class="status-item">{% for e in dev.list %}
-            <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-            <hr>
-            {% endfor %}</div>
-          </div>
-          <div id="solr-user-mail">
-            <h1>Latest Solr User</h1>
-            <div class="status-item">{% for e in solruser.list %}
-            <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
-            <hr>
-            {% endfor %}</div>
-          </div>
-        </div>
-      </span>
-    </div>
+    {include "solr-sidebar.html" %}
 {% endblock %}
 {% block privacy %}<a href="../privacy.html">Privacy Policy</a>{% endblock %}
 {% endextends %}
\ No newline at end of file