Return-Path: 
 <ooo-commits-return-544-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3D7B78DDD
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Tue,  9 Aug 2011 00:19:31 +0000 (UTC)
Received: (qmail 61013 invoked by uid 500); 9 Aug 2011 00:19:31 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 60950 invoked by uid 500); 9 Aug 2011 00:19:30 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 60943 invoked by uid 99); 9 Aug 2011 00:19:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2011 00:19:30 +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; Tue, 09 Aug 2011 00:19:27 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4532223889D5;
	Tue,  9 Aug 2011 00:19:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1155166 - in /incubator/ooo/site/trunk/templates:
 html_page.html scriptstyle.html skeleton.html
Date: Tue, 09 Aug 2011 00:19:07 -0000
To: ooo-commits@incubator.apache.org
From: wave@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110809001907.4532223889D5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wave
Date: Tue Aug  9 00:19:06 2011
New Revision: 1155166

URL: http://svn.apache.org/viewvc?rev=1155166&view=rev
Log:
Updated skeleton.html to allow alternative javascript and css insertion in the header. Minor titling change. Added html_page.html template which extends skeleton.html.

Added:
    incubator/ooo/site/trunk/templates/html_page.html   (with props)
    incubator/ooo/site/trunk/templates/scriptstyle.html   (with props)
Modified:
    incubator/ooo/site/trunk/templates/skeleton.html

Added: incubator/ooo/site/trunk/templates/html_page.html
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/html_page.html?rev=1155166&view=auto
==============================================================================
--- incubator/ooo/site/trunk/templates/html_page.html (added)
+++ incubator/ooo/site/trunk/templates/html_page.html Tue Aug  9 00:19:06 2011
@@ -0,0 +1,3 @@
+{% extends "skeleton.html" %}
+  {% block content %}{% autoescape off %}{{ content }}{% endautoescape %}{% endblock %}
+{$ endextends $}

Propchange: incubator/ooo/site/trunk/templates/html_page.html
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/ooo/site/trunk/templates/scriptstyle.html
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/scriptstyle.html?rev=1155166&view=auto
==============================================================================
--- incubator/ooo/site/trunk/templates/scriptstyle.html (added)
+++ incubator/ooo/site/trunk/templates/scriptstyle.html Tue Aug  9 00:19:06 2011
@@ -0,0 +1 @@
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">

Propchange: incubator/ooo/site/trunk/templates/scriptstyle.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/skeleton.html?rev=1155166&r1=1155165&r2=1155166&view=diff
==============================================================================
--- incubator/ooo/site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/site/trunk/templates/skeleton.html Tue Aug  9 00:19:06 2011
@@ -17,27 +17,31 @@
     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="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+-->
   <title>{% block title %}{{ headers.title }}{% endblock %}</title>
+  
+{% autoescape off %}{% if scriptstyle %}{{ scriptstyle }}{% else %}{% include "scriptstyle.html"%}{% endif %}{% endautoescape %}
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-	 src="/openofficeorg/images/ooo-logo.png"/>&nbsp;|&nbsp;
+    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)" 
+	 src="/openofficeorg/images/ooo-logo.png"/>
+   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity Suite</span>
   </div>
   
+  {% if sidenav %}
   <div id="navigation">
-  {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
+    {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
     <a alt="Apache Incubator" href="http://incubator.apache.org">
       <img id="asf-logo" alt="Apache Incubator" 
     src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
   </div>
+  {% endif %}
 
   <div id="content">
-    <h1 class="title">{% block title %}{{ headers.title }}{% endblock %}</h1>
+    {% block title %}{% if headers.title %}<h1>{{ headers.title }}</h1>{% endif %}{% endblock %}
     {% block content %}{{ content|markdown }}{% endblock %}
   </div>