You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2012/02/20 01:49:03 UTC
svn commit: r1291105 - in /incubator/ooo/ooo-site/trunk: content/
content/api/ lib/ templates/ templates/api/
Author: wave
Date: Mon Feb 20 00:49:03 2012
New Revision: 1291105
URL: http://svn.apache.org/viewvc?rev=1291105&view=rev
Log:
Switching to use SSI for brand (banner), footer, and navigation. mdtext remains in templates to help pick the proper SSI and for other reasons. Note now ready for native language specific navigation and branding.
Added:
incubator/ooo/ooo-site/trunk/content/.htaccess (with props)
incubator/ooo/ooo-site/trunk/content/api/leftnav.mdtext
- copied, changed from r1290841, incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext
incubator/ooo/ooo-site/trunk/content/brand.mdtext
- copied, changed from r1290841, incubator/ooo/ooo-site/trunk/templates/brand.mdtext
incubator/ooo/ooo-site/trunk/content/footer.mdtext (with props)
incubator/ooo/ooo-site/trunk/content/topnav.mdtext
- copied, changed from r1290841, incubator/ooo/ooo-site/trunk/templates/topnav.mdtext
incubator/ooo/ooo-site/trunk/templates/brand.html (with props)
incubator/ooo/ooo-site/trunk/templates/footer.html (with props)
incubator/ooo/ooo-site/trunk/templates/footer.mdtext (with props)
incubator/ooo/ooo-site/trunk/templates/navigator.html (with props)
Modified:
incubator/ooo/ooo-site/trunk/lib/path.pm
incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext
incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext
incubator/ooo/ooo-site/trunk/templates/brand.mdtext
incubator/ooo/ooo-site/trunk/templates/skeleton.html
incubator/ooo/ooo-site/trunk/templates/topnav.mdtext
Added: incubator/ooo/ooo-site/trunk/content/.htaccess
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/.htaccess?rev=1291105&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/.htaccess (added)
+++ incubator/ooo/ooo-site/trunk/content/.htaccess Mon Feb 20 00:49:03 2012
@@ -0,0 +1,2 @@
+Options +Includes +MultiViews
+AddOutputFilter INCLUDES .html
Propchange: incubator/ooo/ooo-site/trunk/content/.htaccess
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/ooo/ooo-site/trunk/content/api/leftnav.mdtext (from r1290841, incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext)
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/api/leftnav.mdtext?p2=incubator/ooo/ooo-site/trunk/content/api/leftnav.mdtext&p1=incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext&r1=1290841&r2=1291105&rev=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/content/api/leftnav.mdtext Mon Feb 20 00:49:03 2012
@@ -1,3 +1,5 @@
+divid: leftnava
+
# Developer's Guide
- [Content Table](http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide)
Copied: incubator/ooo/ooo-site/trunk/content/brand.mdtext (from r1290841, incubator/ooo/ooo-site/trunk/templates/brand.mdtext)
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/brand.mdtext?p2=incubator/ooo/ooo-site/trunk/content/brand.mdtext&p1=incubator/ooo/ooo-site/trunk/templates/brand.mdtext&r1=1290841&r2=1291105&rev=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/brand.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/content/brand.mdtext Mon Feb 20 00:49:03 2012
@@ -4,3 +4,4 @@ name: Apache OpenOffice (incubating)
tagline: (incubating) | The Free and Open Productivity Suite
logo: ooo-logo.png
domain: www.openoffice.org
+divid: bannera
Added: incubator/ooo/ooo-site/trunk/content/footer.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/footer.mdtext?rev=1291105&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/footer.mdtext (added)
+++ incubator/ooo/ooo-site/trunk/content/footer.mdtext Mon Feb 20 00:49:03 2012
@@ -0,0 +1 @@
+divid: footera
Propchange: incubator/ooo/ooo-site/trunk/content/footer.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/ooo/ooo-site/trunk/content/topnav.mdtext (from r1290841, incubator/ooo/ooo-site/trunk/templates/topnav.mdtext)
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/topnav.mdtext?p2=incubator/ooo/ooo-site/trunk/content/topnav.mdtext&p1=incubator/ooo/ooo-site/trunk/templates/topnav.mdtext&r1=1290841&r2=1291105&rev=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/topnav.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/content/topnav.mdtext Mon Feb 20 00:49:03 2012
@@ -1,3 +1,5 @@
+divid: topnava
+
- [Product][m0]
- [Download][m1]
- [Support][m2]
Modified: incubator/ooo/ooo-site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/path.pm?rev=1291105&r1=1291104&r2=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/path.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/path.pm Mon Feb 20 00:49:03 2012
@@ -3,6 +3,11 @@ package path;
# taken from django's url.py
our @patterns = (
+ [qr!brand.mdtext$!, single_narrative => { template => "brand.html" }],
+ [qr!footer.mdtext$!, single_narrative => { template => "footer.html" }],
+ [qr!topnav.mdtext$!, single_narrative => { template => "navigator.html" }],
+ [qr!leftnav.mdtext$!, single_narrative => { template => "navigator.html" }],
+ [qr!rightnav.mdtext$!, single_narrative => { template => "navigator.html" }],
[qr!\.mdtext$!, single_narrative => { template => "single_narrative.html" }],
[qr!\.html$!, html_page => { template => "html_page.html" }],
[qr!\.htm$!, html_page => { template => "html_page.html" }],
Modified: incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext?rev=1291105&r1=1291104&r2=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext Mon Feb 20 00:49:03 2012
@@ -1,3 +1,4 @@
+ssipath: /brand.html
home: home
search: search
name: Apache OpenOffice (incubating)
Modified: incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext?rev=1291105&r1=1291104&r2=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/templates/api/leftnav.mdtext Mon Feb 20 00:49:03 2012
@@ -1,26 +1 @@
-# Developer's Guide
-
- - [Content Table](http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide)
- - [IDL reference](/api/docs/common/ref/com/sun/star/module-ix.html)
-
-# API
-
- - [Module structure](/api/modules.html)
-
-# SDK
-
- - [Examples](/api/SDK/example_collection.html)
- - [Java UNO Reference](/api/docs/java/ref/overview-summary.html)
- - [C++ UNO Reference](/api/docs/cpp/ref/names/index.html)
- - [Download](/download/sdk/)
-
-# Tips 'n' Tricks
-
- - [FAQ](/api/faq.html)
- - [Internal OO Spots](/api/TipsAndTricks/internal.html)
- - [External Resources](/api/TipsAndTricks/external.html)
-
-# Miscellaneous
-
- - [Developer Projects](http://wiki.services.openoffice.org/wiki/API/To-Dos)
- - [Mailing List Rules](/api/listrules.html)
+ssipath: /api/leftnav.html
Added: incubator/ooo/ooo-site/trunk/templates/brand.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/brand.html?rev=1291105&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/brand.html (added)
+++ incubator/ooo/ooo-site/trunk/templates/brand.html Mon Feb 20 00:49:03 2012
@@ -0,0 +1,20 @@
+ <div id="{{ headers.divid }}">
+ <div id="bannerleft"><img id="ooo-logo" alt="{{ headers.name }}" src="/images/{{ headers.logo }}"/></div>
+ <div id="bannerright">
+ <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+ <div style="relative; margin: 14px 0 0 0; height: 24px;">
+ <form id="cse-search-box-header" action="http://www.google.com/search" method="get">
+ <div>
+ <input type="hidden" name="domains" value="{{ headers.domain }}"/>
+ <input type="hidden" name="sitesearch" value="{{ headers.domain }}"/>
+ </div>
+ <div class="topsrchbox">
+ <input name="resultsPerPage" value="40" type="hidden"/>
+ <input name="q" id="query" alt="search" type="text"/>
+ <input name="Button" value="{{ headers.search }}" type="submit" class="topsrchbutton"/>
+ </div>
+ </form>
+ </div>
+ </div>
+ <div id="bannercenter"><br/>{{ headers.tagline }}</div>
+ </div>
Propchange: incubator/ooo/ooo-site/trunk/templates/brand.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/ooo-site/trunk/templates/brand.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/brand.mdtext?rev=1291105&r1=1291104&r2=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/brand.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/templates/brand.mdtext Mon Feb 20 00:49:03 2012
@@ -1,3 +1,4 @@
+ssipath: /brand.html
home: home
search: search
name: Apache OpenOffice (incubating)
Added: incubator/ooo/ooo-site/trunk/templates/footer.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/footer.html?rev=1291105&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/footer.html (added)
+++ incubator/ooo/ooo-site/trunk/templates/footer.html Mon Feb 20 00:49:03 2012
@@ -0,0 +1,19 @@
+ <div id="{{ headers.divid }}">
+ <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
+ <div id="copyrighta">
+ <p align="center">
+ <a href="/license.html">Copyright & License</a> | <a href="/contact_us.html">Contact Us</a>
+ </p>
+ <p>
+ Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+ OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
+ Other names appearing on the site may be trademarks of their respective owners.
+ </p>
+ <p>
+ Apache OpenOffice is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+ Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+ decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+ not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+ yet to be fully endorsed by the ASF.</p>
+ </div>
+ </div>
Propchange: incubator/ooo/ooo-site/trunk/templates/footer.html
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ooo/ooo-site/trunk/templates/footer.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/footer.mdtext?rev=1291105&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/footer.mdtext (added)
+++ incubator/ooo/ooo-site/trunk/templates/footer.mdtext Mon Feb 20 00:49:03 2012
@@ -0,0 +1 @@
+ssipath: /footer.html
Propchange: incubator/ooo/ooo-site/trunk/templates/footer.mdtext
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ooo/ooo-site/trunk/templates/navigator.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/navigator.html?rev=1291105&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/navigator.html (added)
+++ incubator/ooo/ooo-site/trunk/templates/navigator.html Mon Feb 20 00:49:03 2012
@@ -0,0 +1 @@
+<div id="{{ headers.divid }}">{% block content %}{{ content|markdown }}{% endblock %}</div>
Propchange: incubator/ooo/ooo-site/trunk/templates/navigator.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1291105&r1=1291104&r2=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Mon Feb 20 00:49:03 2012
@@ -10,58 +10,21 @@
</head>
<body>
- <div id="bannera">
- <div id="bannerleft"><img id="ooo-logo" alt="{{ brand.headers.name }}" src="/images/{{ brand.headers.logo }}"/></div>
- <div id="bannerright">
- <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
- <div style="relative; margin: 14px 0 0 0; height: 24px;">
- <form id="cse-search-box-header" action="http://www.google.com/search" method="get">
- <div>
- <input type="hidden" name="domains" value="{{ brand.headers.domain }}"/>
- <input type="hidden" name="sitesearch" value="{{ brand.headers.domain }}"/>
- </div>
- <div class="topsrchbox">
- <input name="resultsPerPage" value="40" type="hidden"/>
- <input name="q" id="query" alt="search" type="text"/>
- <input name="Button" value="{{ brand.headers.search }}" type="submit" class="topsrchbutton"/>
- </div>
- </form>
- </div>
- </div>
- <div id="bannercenter"><br/>{{ brand.headers.tagline }}</div>
- </div>
+<!--#include virtual="{{ brand.headers.ssipath }}" -->
<div id="topbara">
- {% if topnav.content %}<div id="topnava">{% block topnav %}{{ topnav.content|markdown }}{% endblock %}</div>{% endif %}
+ {% if topnav.headers %}<!--#include virtual="{{ topnav.headers.ssipath }}" -->{% endif %}
<div id="breadcrumbsa">{% block breaddcrumbs %}{% autoescape off %}{{ breadcrumbs }}{% endautoescape %}{% endblock %}</div>
</div>
<div id="clear"></div>
- {% if leftnav.content %}<div id="leftnav">{% block leftnav %}{{ leftnav.content|markdown }}{% endblock %}</div>{% endif %}
- {% if rightnav.content %}<div id="rightnav">{% block rightnav %}{{ rightnav.content|markdown }}{% endblock %}</div>{% endif %}
+ {% if leftnav.headers %}<!--#include virtual="{{ leftnav.headers.ssipath }}" -->{% endif %}
+ {% if rightnav.headers %}<!--#include virtual="{{ rightnav.headers.ssipath }}" -->{% endif %}
<div id="content">
{% block legacy %}{% if brand.headers.legacy %}<div class="legacy">{{ brand.headers.legacy }}</div>{% endif %}{% endblock %}
{% block title %}{% if headers.title %}<h1 class="title">{{ headers.title }}</h1>{% endif %}{% endblock %}
{% block content %}{{ content|markdown }}{% endblock %}
</div>
- <div id="footera">
- <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
- <div id="copyrighta">
- <p align="center">
- <a href="/license.html">Copyright & License</a> | <a href="/contact_us.html">Contact Us</a>
- </p>
- <p>
- Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
- OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
- Other names appearing on the site may be trademarks of their respective owners.
- </p>
- <p>
- Apache OpenOffice is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
- Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
- decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is
- not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
- yet to be fully endorsed by the ASF.</p>
- </div>
- </div>
+<!--#include virtual="{{ footer.headers.ssipath }}" -->
</body>
</html>
Modified: incubator/ooo/ooo-site/trunk/templates/topnav.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/topnav.mdtext?rev=1291105&r1=1291104&r2=1291105&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/topnav.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/templates/topnav.mdtext Mon Feb 20 00:49:03 2012
@@ -1,16 +1 @@
-- [Product][m0]
-- [Download][m1]
-- [Support][m2]
-- [Extend][m3]
-- [Develop][m4]
-- [Focus Areas][m5]
-- [Native Language][m6]
-
-
-[m0]: /product/index.html "OpenOffice.org product description"
-[m1]: /download/index.html "Download OpenOffice.org"
-[m2]: /support/index.html "Find Support for OpenOffice.org"
-[m3]: /extensions/index.html "Find Extensions and Templates"
-[m4]: http://incubator.apache.org/openofficeorg/get-involved.html "Get involved in Apache OpenOffice (incubating)"
-[m5]: /projects/accepted.html "OpenOffice.org development focus areas"
-[m6]: /projects/native-lang.html "OpenOffice.org in your Native Language"
+ssipath: /topnav.html