Return-Path: 
 <commits-return-11436-apmail-lucene-commits-archive=www.apache.org@lucene.apache.org>
X-Original-To: apmail-lucene-commits-archive@www.apache.org
Delivered-To: apmail-lucene-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B80B493F4
	for <apmail-lucene-commits-archive@www.apache.org>;
 Sat,  4 Feb 2012 21:28:20 +0000 (UTC)
Received: (qmail 98231 invoked by uid 500); 4 Feb 2012 21:28:19 -0000
Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:commits@lucene.apache.org>
List-Id: <commits.lucene.apache.org>
Reply-To: dev@lucene.apache.org
Delivered-To: mailing list commits@lucene.apache.org
Received: (qmail 98224 invoked by uid 99); 4 Feb 2012 21:28:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Feb 2012 21:28:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Feb 2012 21:28:16 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 264C1238897D;
	Sat,  4 Feb 2012 21:27:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1240612 - in /lucene/cms/trunk: content/mainnews.mdtext
 templates/body.html templates/jcc-simple.html templates/jcc.html
 templates/main.html templates/mainnews.mdtext templates/simple.html
Date: Sat, 04 Feb 2012 21:27:54 -0000
To: commits@lucene.apache.org
From: gsingers@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120204212755.264C1238897D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gsingers
Date: Sat Feb  4 21:27:54 2012
New Revision: 1240612

URL: http://svn.apache.org/viewvc?rev=1240612&view=rev
Log:
LUCENE-2748: keep on truckin

Added:
    lucene/cms/trunk/content/mainnews.mdtext
      - copied unchanged from r1240611, lucene/cms/trunk/templates/mainnews.mdtext
Removed:
    lucene/cms/trunk/templates/mainnews.mdtext
Modified:
    lucene/cms/trunk/templates/body.html
    lucene/cms/trunk/templates/jcc-simple.html
    lucene/cms/trunk/templates/jcc.html
    lucene/cms/trunk/templates/main.html
    lucene/cms/trunk/templates/simple.html

Modified: lucene/cms/trunk/templates/body.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/body.html?rev=1240612&r1=1240611&r2=1240612&view=diff
==============================================================================
--- lucene/cms/trunk/templates/body.html (original)
+++ lucene/cms/trunk/templates/body.html Sat Feb  4 21:27:54 2012
@@ -88,7 +88,7 @@
 
       <div>{% block content %}{{ content|markdown }}{% endblock %}</div>
       {% block news %}
-        <div>{% filter markdown %}{% include "mainnews.mdtext" %}{% endfilter %}</div>
+        <div>{% filter markdown %}{% include "../content/mainnews.mdtext" %}{% endfilter %}</div>
       {% endblock news %}
 
       {% block asfboiler %}

Modified: lucene/cms/trunk/templates/jcc-simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/jcc-simple.html?rev=1240612&r1=1240611&r2=1240612&view=diff
==============================================================================
--- lucene/cms/trunk/templates/jcc-simple.html (original)
+++ lucene/cms/trunk/templates/jcc-simple.html Sat Feb  4 21:27:54 2012
@@ -1,4 +1,43 @@
-{% extends "jcc.html" %}
+<!-- jcc.html -->
+{#
+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">
+{% endblock %}
+{% block javascript %}
+<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>
+{% endblock %}
+{% block metakeys %}<meta name="keywords"
+        content="apache, pylucene, jcc, lucene, apache pylucene, apache jcc,
+  apache lucene, search, python search, information retrieval, spell checking, faceting, inverted index, open source"/>
+{% endblock %}
+{% endextends %}
+
+{% extends "body.html" %}
+{% block logo %}
+<a href="index.html"><img border="0" src="../../images/lucene_logo_green_300.png" alt="Lucene Logo"/></a>
+{% endblock %}
+{% block nav %}
+<ul>
+  <li><a href="index.html">JCC</a></li>
+  <li><a href="https://issues.apache.org/jira/browse/PYLUCENE">Issue Tracker</a></li>
+  <li><a href="../mailing-lists.html">Discussion</a></li>
+  <li><a href="../index.html">PyLucene</a></li>
+  <li><a class="last" href="../../index.html">Lucene</a></li>
+</ul>
+{% endblock %}
 {% block news %}
 {% endblock %}
+
+{% block sidebar %}
+    <div id="sidebar">
+      {% filter markdown %}{% include "jccnav.mdtext" %}{% endfilter %}
+    </div>
+{% endblock %}
 {% endextends %}

Modified: lucene/cms/trunk/templates/jcc.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/jcc.html?rev=1240612&r1=1240611&r2=1240612&view=diff
==============================================================================
--- lucene/cms/trunk/templates/jcc.html (original)
+++ lucene/cms/trunk/templates/jcc.html Sat Feb  4 21:27:54 2012
@@ -1,55 +1,39 @@
-{% extends "main.html" %}
-{% block head %}
-<head>
-  <!--
-      jcc.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 PyLucene - {% 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
+#}
+<!-- jcc.html -->
+{% extends "head.html" %}
+{% block css %}
+    <link href="../css/global.css" rel="stylesheet" type="text/css">
+{% endblock %}
+{% block javascript %}
+<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>
+{% endblock %}
+{% block metakeys %}<meta name="keywords"
         content="apache, pylucene, jcc, lucene, apache pylucene, apache jcc,
   apache lucene, search, python 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" src="../../images/lucene_logo_green_300.png" alt="Lucene Logo"/></a>
-{% endblock %}
-{% block slides %}
+<a href="index.html"><img border="0" src="../../images/lucene_logo_green_300.png" alt="Lucene Logo"/></a>
 {% endblock %}
 {% block nav %}
 <ul>
   <li><a href="index.html">JCC</a></li>
-  <li><a href="https://issues.apache.org/jira/browse/PYLUCENE">Bug Tracker</a></li>
+  <li><a href="https://issues.apache.org/jira/browse/PYLUCENE">Issue Tracker</a></li>
   <li><a href="../mailing-lists.html">Discussion</a></li>
   <li><a href="../index.html">PyLucene</a></li>
   <li><a class="last" href="../../index.html">Lucene</a></li>
 </ul>
 {% endblock %}
+
 {% block news %}
 {% endblock %}
 
@@ -58,4 +42,5 @@
       {% filter markdown %}{% include "jccnav.mdtext" %}{% endfilter %}
     </div>
 {% endblock %}
-{% block privacy %}<a href="../../privacy.html">Privacy Policy</a>{% endblock %}
+
+{% endextends %}
\ 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=1240612&r1=1240611&r2=1240612&view=diff
==============================================================================
--- lucene/cms/trunk/templates/main.html (original)
+++ lucene/cms/trunk/templates/main.html Sat Feb  4 21:27:54 2012
@@ -18,8 +18,9 @@
         search, information retrieval, spell checking, faceting, inverted index, open source"/>
 {% endblock %}
 {% endextends %}
+
 {% extends "body.html" %}
 {% block news %}
-<div>{% filter markdown %}{% include "mainnews.mdtext" %}{% endfilter %}</div>
+<div>{% filter markdown %}{% include "../content/mainnews.mdtext" %}{% endfilter %}</div>
 {% endblock %}
 {% endextends %}

Modified: lucene/cms/trunk/templates/simple.html
URL: http://svn.apache.org/viewvc/lucene/cms/trunk/templates/simple.html?rev=1240612&r1=1240611&r2=1240612&view=diff
==============================================================================
--- lucene/cms/trunk/templates/simple.html (original)
+++ lucene/cms/trunk/templates/simple.html Sat Feb  4 21:27:54 2012
@@ -2,11 +2,10 @@
  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
 #}
-<!-- main.html -->
+<!-- simple.html -->
 {% 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 javascript %}
 <script type="text/javascript" src="./scripts/prototype.js"></script>