incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1227057 - in /incubator/ooo/ooo-site/trunk: content/css/ooo.css lib/view.pm templates/api/brand.mdtext templates/brand.mdtext templates/skeleton.html
Date Wed, 04 Jan 2012 07:06:27 GMT
Author: wave
Date: Wed Jan  4 07:06:26 2012
New Revision: 1227057

URL: http://svn.apache.org/viewvc?rev=1227057&view=rev
Log:
Brand configuration. Override key page elements at the first level. Different logos. Legacy
statement.

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

Modified: incubator/ooo/ooo-site/trunk/content/css/ooo.css
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/css/ooo.css?rev=1227057&r1=1227056&r2=1227057&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/css/ooo.css (original)
+++ incubator/ooo/ooo-site/trunk/content/css/ooo.css Wed Jan  4 07:06:26 2012
@@ -98,6 +98,12 @@ h1,h2,h3,h4,h5,h6 {
   margin-top: 2em;
 }
 
+.legacy {
+  font-size: 1.2em;
+  color: #C44B01;
+  margin: 0 0 0.5em 0;
+}  
+
 #content h3,h4,h5,h6 {
   border-bottom: none;
   font-size: 1em;

Modified: incubator/ooo/ooo-site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/view.pm?rev=1227057&r1=1227056&r2=1227057&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/view.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/view.pm Wed Jan  4 07:06:26 2012
@@ -69,6 +69,8 @@ sub single_narrative {
 	$args{scriptstyle} = $styleargs{content};
     }
 
+    $args{breadcrumbs} =~ s/home/$args{brand}{headers}{home}/;
+
     return Template($template)->render(\%args), html => \%args;
 }
 
@@ -121,6 +123,8 @@ sub html_page {
         @args{qw/header bodytag content/} = ($1, $2, $3);
     }
 
+    $args{breadcrumbs} =~ s/home/$args{brand}{headers}{home}/;
+
     return Template($template)->render(\%args), html => \%args;
 }
 

Added: 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=1227057&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext (added)
+++ incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext Wed Jan  4 07:06:26 2012
@@ -0,0 +1,7 @@
+home:		home
+search:		search
+name: 		Apache OpenOffice (incubating)
+tagline: 	(incubating) | The Free and Open Productivity Suite
+logo: 		ooo-logo.png
+domain:		www.openoffice.org
+legacy:		Content for OpenOffice.org version 3.3.
\ No newline at end of file

Propchange: incubator/ooo/ooo-site/trunk/templates/api/brand.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/ooo/ooo-site/trunk/templates/brand.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/brand.mdtext?rev=1227057&view=auto
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/brand.mdtext (added)
+++ incubator/ooo/ooo-site/trunk/templates/brand.mdtext Wed Jan  4 07:06:26 2012
@@ -0,0 +1,6 @@
+home:		home
+search:		search
+name: 		Apache OpenOffice (incubating)
+tagline: 	(incubating) | The Free and Open Productivity Suite
+logo: 		ooo-logo.png
+domain:		www.openoffice.org

Propchange: incubator/ooo/ooo-site/trunk/templates/brand.mdtext
------------------------------------------------------------------------------
    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=1227057&r1=1227056&r2=1227057&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Wed Jan  4 07:06:26 2012
@@ -11,24 +11,24 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="ooo-logo" alt="Apache OpenOffice.org (Incubating)"
src="/images/ooo-logo.png"/></div>
+    <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="ooo-site.apache.org"/>
-	    <input type="hidden" name="sitesearch" value="ooo-site.apache.org"/>
+	    <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="Search" type="submit" class="topsrchbutton"/>
+	    <input name="Button" value="{{ brand.headers.search }}" type="submit" class="topsrchbutton"/>
 	  </div>
 	</form>
       </div>
     </div>
-    <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and
Open Productivity Suite</div>
+    <div id="bannercenter"><br/>{{ brand.headers.tagline }}</div>
   </div>
   <div id="topbara">
     {% if topnav.content %}<div id="topnava">{% block topnav %}{{ topnav.content|markdown
}}{% endblock %}</div>{% endif %}
@@ -38,6 +38,7 @@
   {% 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 %}
   <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>



Mime
View raw message