You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by jl...@apache.org on 2013/04/22 16:31:25 UTC
svn commit: r1470545 - in /openwebbeans/cms-site/trunk:
content/misc/contact.mdtext content/misc/legal.mdtext lib/path.pm
templates/header.html
Author: jlmonteiro
Date: Mon Apr 22 14:31:25 2013
New Revision: 1470545
URL: http://svn.apache.org/r1470545
Log:
Adding missing stuff as required by http://www.apache.org/foundation/marks/pmcs
Added:
openwebbeans/cms-site/trunk/content/misc/legal.mdtext
Modified:
openwebbeans/cms-site/trunk/content/misc/contact.mdtext
openwebbeans/cms-site/trunk/lib/path.pm
openwebbeans/cms-site/trunk/templates/header.html
Modified: openwebbeans/cms-site/trunk/content/misc/contact.mdtext
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/misc/contact.mdtext?rev=1470545&r1=1470544&r2=1470545&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/content/misc/contact.mdtext (original)
+++ openwebbeans/cms-site/trunk/content/misc/contact.mdtext Mon Apr 22 14:31:25 2013
@@ -11,7 +11,8 @@ Only security issues should be sent to t
## General Apache Issues
-The OpenWebBeans Project is an effort of the <a href="http://www.apache.org">Apache Software Foundation</a>. The address for general ASF correspondence and licensing questions is:
+The OpenWebBeans Project is an effort of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+The address for general ASF correspondence and licensing questions is:
<a href="mailto:apache.AT.apache.DOT.org">apache.AT.apache.DOT.org</a>
Added: openwebbeans/cms-site/trunk/content/misc/legal.mdtext
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/misc/legal.mdtext?rev=1470545&view=auto
==============================================================================
--- openwebbeans/cms-site/trunk/content/misc/legal.mdtext (added)
+++ openwebbeans/cms-site/trunk/content/misc/legal.mdtext Mon Apr 22 14:31:25 2013
@@ -0,0 +1,30 @@
+Title: Legal
+
+
+## Legal Stuff They Make Us Say
+All material on this website is Copyright © 2013, The Apache Software Foundation
+
+Sun, Sun Microsystems, Solaris, Java and JavaServer Pages are trademarks or registered trademarks of Oracle Corporation.
+UNIX is a registered trademark in the United States and other countries, exclusively licensed through 'The Open Group'.
+Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corporation.
+Linux is a registered trademark of Linus Torvalds.
+All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners.
+
+
+## The Apache License
+All software produced by The Apache Software Foundation or any of its projects or subjects is licensed according to the terms of
+<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0 (current)</a>.
+
+
+## Trademarks
+"Apache OpenWebBeans" and "OpenWebBeans" are trademarks of the Apache Software Foundation.
+Use of these trademarks is subject to the terms of section 6 of
+<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0 (current)</a>.
+
+If you create a product that uses Apache OpenWebBeans software or provides additional functionality to that software then:
+
+- When referring to Apache OpenWebBeans software, please use the full name of "Apache OpenWebBeans" for at least the first reference on any web page, help file or similar.
+Subsequent references may refer to "OpenWebBeans".
+- You may not use the OpenWebBeans logo without the permission of the Apache OpenWebBeans PMC.
+- If you use the words "OpenWebBeans" or "Apache" in your product name then you must call your product "... for Apache OpenWebBeans".
+No other form of product name that includes "OpenWebBeans" or "Apache" is permitted.
\ No newline at end of file
Modified: openwebbeans/cms-site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/lib/path.pm?rev=1470545&r1=1470544&r2=1470545&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/lib/path.pm (original)
+++ openwebbeans/cms-site/trunk/lib/path.pm Mon Apr 22 14:31:25 2013
@@ -6,13 +6,11 @@ use ASF::Value::Blogs;
# taken from django's url.py
our @patterns = (
- [qr!^/index\.html$!, news_page =>
- {
- header => "header.html",
- footer => "footer.html",
+ [qr!^/index\.html$!, news_page => {
+ header => "header.html",
+ footer => "footer.html",
blog => ASF::Value::Blogs->new(blog => "owb", limit=> 3),
- },
- ],
+ }],
[qr!\.md(text)?$!, basic => {
header => "header.html",
Modified: openwebbeans/cms-site/trunk/templates/header.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/templates/header.html?rev=1470545&r1=1470544&r2=1470545&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/templates/header.html (original)
+++ openwebbeans/cms-site/trunk/templates/header.html Mon Apr 22 14:31:25 2013
@@ -1,5 +1,7 @@
<!DOCTYPE html>
-<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<html lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<title>Apache OpenWebBeans</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -21,32 +23,51 @@
<body>
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="index.html"><img src="{{base}}resources/images/logo_dbg-small.png" height="25px" alt="owb_logo_small"/></a>
- <div class="nav-collapse">
- <ul class="nav">
- <li class="active"><a href="{{base}}index.html">Home</a></li>
- <li><a href="{{base}}documentation.html">Documentation</a></li>
- <li><a href="{{base}}source.html">Source</a></li>
- <li><a href="{{base}}download.html">Download</a></li>
- <li><a href="{{base}}community.html">Community</a></li>
- <!-- <li><a href="{{base}}news.html">News</a></li> -->
- </ul>
- </div><!--/.nav-collapse -->
- <form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right" >
- <input value="openwebbeans.apache.org" name="sitesearch" type="hidden"/>
- <input class="search-query" name="q" id="query" type="text" />
- </form>
- <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=search-form"></script>
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="index.html"><img src="{{base}}resources/images/logo_dbg-small.png" height="25px"
+ alt="owb_logo_small"/></a>
+
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="{{base}}index.html">Home</a></li>
+ <li><a href="{{base}}documentation.html">Documentation</a></li>
+ <li><a href="{{base}}source.html">Source</a></li>
+ <li><a href="{{base}}download.html">Download</a></li>
+ <li><a href="{{base}}community.html">Community</a></li>
+ <!-- <li><a href="{{base}}news.html">News</a></li> -->
+ <li class="dropdown">
+ <a class="dropdown-toggle"
+ data-toggle="dropdown"
+ href="#">
+ Misc
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li><a href="http://www.apache.org">Apache Home</a></li>
+ <li><a href="{{base}}misc/contact.html">Contact</a></li>
+ <li><a href="{{base}}misc/legal.html">Legal</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <!-- <li class="divider"/> -->
+ </ul>
+ </li>
+ </ul>
</div>
+ <!--/.nav-collapse -->
+ <form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right">
+ <input value="openwebbeans.apache.org" name="sitesearch" type="hidden"/>
+ <input class="search-query" name="q" id="query" type="text"/>
+ </form>
+ <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=search-form"></script>
</div>
</div>
+</div>
- <div class="container">
+<div class="container">