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/03/20 23:29:22 UTC

svn commit: r1303176 - in /incubator/ooo/ooo-site/trunk: content/doctype.mdtext lib/path.pm lib/view.pm templates/api/ssi.mdtext templates/brand.html templates/doctype.html templates/skeleton.html templates/ssi.mdtext

Author: wave
Date: Tue Mar 20 22:29:22 2012
New Revision: 1303176

URL: http://svn.apache.org/viewvc?rev=1303176&view=rev
Log:
Fixing a character entity bug in breadcrumbs, making doctype into an ssi. Lets see how we do with the simple html5 doctype. Since it is an ssi it can be different for each first level folder.

Added:
    incubator/ooo/ooo-site/trunk/content/doctype.mdtext   (with props)
    incubator/ooo/ooo-site/trunk/templates/doctype.html   (with props)
Modified:
    incubator/ooo/ooo-site/trunk/lib/path.pm
    incubator/ooo/ooo-site/trunk/lib/view.pm
    incubator/ooo/ooo-site/trunk/templates/api/ssi.mdtext
    incubator/ooo/ooo-site/trunk/templates/brand.html
    incubator/ooo/ooo-site/trunk/templates/skeleton.html
    incubator/ooo/ooo-site/trunk/templates/ssi.mdtext

Added: incubator/ooo/ooo-site/trunk/content/doctype.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/doctype.mdtext?rev=1303176&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/doctype.mdtext (added)
+++ incubator/ooo/ooo-site/trunk/content/doctype.mdtext Tue Mar 20 22:29:22 2012
@@ -0,0 +1 @@
+doctype: html
\ No newline at end of file

Propchange: incubator/ooo/ooo-site/trunk/content/doctype.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/ooo-site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/path.pm?rev=1303176&r1=1303175&r2=1303176&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/path.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/path.pm Tue Mar 20 22:29:22 2012
@@ -3,6 +3,7 @@ package path;
 # taken from django's url.py
 
 our @patterns = (
+	[qr!doctype.mdtext$!, single_narrative => { template => "doctype.html" }],
 	[qr!brand.mdtext$!, single_narrative => { template => "brand.html" }],
 	[qr!footer.mdtext$!, single_narrative => { template => "footer.html" }],
 	[qr!topnav.mdtext$!, single_narrative => { template => "navigator.html" }],

Modified: incubator/ooo/ooo-site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/view.pm?rev=1303176&r1=1303175&r2=1303176&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/view.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/view.pm Tue Mar 20 22:29:22 2012
@@ -178,7 +178,7 @@ sub breadcrumbs {
         $_ ||= "home";
         push @rv, qq(<a href="$relpath">$_</a>);
     }
-    return join "&nbsp;&raquo&nbsp;", @rv;
+    return join "&nbsp;&raquo;&nbsp;", @rv;
 }
 
 sub templatesfolder {

Modified: incubator/ooo/ooo-site/trunk/templates/api/ssi.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/api/ssi.mdtext?rev=1303176&r1=1303175&r2=1303176&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/api/ssi.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/templates/api/ssi.mdtext Tue Mar 20 22:29:22 2012
@@ -1,3 +1,4 @@
+doctype: /doctype.html
 brand:	/brand.html
 footer:	/footer.html
 topnav:	/topnav.html

Modified: incubator/ooo/ooo-site/trunk/templates/brand.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/brand.html?rev=1303176&r1=1303175&r2=1303176&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/brand.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/brand.html Tue Mar 20 22:29:22 2012
@@ -16,5 +16,5 @@
 	</form>
       </div>
     </div>
-    {% block tagline %}{% if headers.tagline %}<div class="bannercenter"><br/>{{ headers.tagline }}</div>{% endif %}{% endblock %}
+    {% block tagline %}{% if headers.tagline %}<div id="bannercenter"><br/>{{ headers.tagline }}</div>{% endif %}{% endblock %}
   </div>

Added: incubator/ooo/ooo-site/trunk/templates/doctype.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/doctype.html?rev=1303176&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/doctype.html (added)
+++ incubator/ooo/ooo-site/trunk/templates/doctype.html Tue Mar 20 22:29:22 2012
@@ -0,0 +1 @@
+<!DOCTYPE {{ headers.doctype }}>

Propchange: incubator/ooo/ooo-site/trunk/templates/doctype.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=1303176&r1=1303175&r2=1303176&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Tue Mar 20 22:29:22 2012
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--#include virtual="{{ ssi.headers.doctype }}" -->
 <html>
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
@@ -8,7 +8,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 {% endif %}
 </head>
-
 <body>
 <!--#include virtual="{{ ssi.headers.brand }}" -->
   <div id="topbara">

Modified: incubator/ooo/ooo-site/trunk/templates/ssi.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/ssi.mdtext?rev=1303176&r1=1303175&r2=1303176&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/ssi.mdtext (original)
+++ incubator/ooo/ooo-site/trunk/templates/ssi.mdtext Tue Mar 20 22:29:22 2012
@@ -1,3 +1,4 @@
+doctype: /doctype.html
 brand:	/brand.html
 footer:	/footer.html
 topnav:	/topnav.html