incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
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 GMT
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>
 



Mime
View raw message