openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject svn commit: r1421359 - in /openwebbeans/cms-site/trunk: content/download.mdtext content/index.html content/resources/css/main.css lib/path.pm templates/footer.html templates/header.html templates/standard.html
Date Thu, 13 Dec 2012 16:20:34 GMT
Author: jlmonteiro
Date: Thu Dec 13 16:20:31 2012
New Revision: 1421359

URL: http://svn.apache.org/viewvc?rev=1421359&view=rev
Log:
Refactoring to extract a footer and an header, add the feather in every pages

Added:
    openwebbeans/cms-site/trunk/content/download.mdtext
    openwebbeans/cms-site/trunk/content/resources/css/main.css
    openwebbeans/cms-site/trunk/templates/footer.html
    openwebbeans/cms-site/trunk/templates/header.html
Modified:
    openwebbeans/cms-site/trunk/content/index.html
    openwebbeans/cms-site/trunk/lib/path.pm
    openwebbeans/cms-site/trunk/templates/standard.html

Added: openwebbeans/cms-site/trunk/content/download.mdtext
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/download.mdtext?rev=1421359&view=auto
==============================================================================
--- openwebbeans/cms-site/trunk/content/download.mdtext (added)
+++ openwebbeans/cms-site/trunk/content/download.mdtext Thu Dec 13 16:20:31 2012
@@ -0,0 +1,19 @@
+Title: Source
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, 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.
+
+# Todo ...
\ No newline at end of file

Modified: openwebbeans/cms-site/trunk/content/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/index.html?rev=1421359&r1=1421358&r2=1421359&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/content/index.html (original)
+++ openwebbeans/cms-site/trunk/content/index.html Thu Dec 13 16:20:31 2012
@@ -15,6 +15,7 @@
         }
     </style>
     <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css"
rel="stylesheet">
+    <link href="resources/css/main.css" rel="stylesheet">
 
 </head>
 
@@ -28,14 +29,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </a>
-                <a class="brand" href="http://www.apache.org"><img src="resources/images/feather-small.png"
height="25px" alt="asf_feather_small"/></a>
                 <a class="brand" href="index.html"><img src="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="index.html">Home</a></li>
                         <li><a href="documentation.html">Documentation</a></li>
                         <li><a href="source.html">Source</a></li>
-                        <!-- <li><a href="download.html">Download</a></li>
-->
+                        <li><a href="download.html">Download</a></li>
                         <li><a href="community.html">Community</a></li>
                         <!-- <li><a href="support.html">Support</a></li>
 -->
                         <li><a href="news.html">News</a></li>
@@ -95,6 +95,9 @@
         <hr>
 
         <footer>
+            <div class="pull-right">
+                <a class="brand" href="http://www.apache.org"><img src="resources/images/feather-small.png"
height="25px" alt="asf_feather_small"/></a>
+            </div>
             <p>Copyright &copy; 20011-2012 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0.</p>
             <p>Apache and the Apache feather logo are trademarks of The Apache Software
Foundation.</p>
         </footer>

Added: openwebbeans/cms-site/trunk/content/resources/css/main.css
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/resources/css/main.css?rev=1421359&view=auto
==============================================================================
--- openwebbeans/cms-site/trunk/content/resources/css/main.css (added)
+++ openwebbeans/cms-site/trunk/content/resources/css/main.css Thu Dec 13 16:20:31 2012
@@ -0,0 +1,22 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+* .
+* http://www.apache.org/licenses/LICENSE-2.0
+* .
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, 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.
+*/
+
+blockquote p {
+    font-size: 14px;
+}
\ 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=1421359&r1=1421358&r2=1421359&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/lib/path.pm (original)
+++ openwebbeans/cms-site/trunk/lib/path.pm Thu Dec 13 16:20:31 2012
@@ -3,16 +3,17 @@ package path;
 # taken from django's url.py
 
 our @patterns = (
-	# [qr!\.mdtext$!, single_narrative => { template => "standard_markdown.html" }],
-
-	[qr!\.md(text)?$!, basic => { template => "standard.html" }],
+	[qr!\.md(text)?$!, basic => {
+	    header => "header.html",
+	    footer => "footer.html",
+	    template => "standard.html"
+	}],
 
 	[qr!/sitemap\.html$!, sitemap => { headers => { title => "Sitemap" }} ],
 
 ) ;
 
 # for specifying interdependencies between files
-
 our %dependencies = (
     "/sitemap.html" => [ grep s!^content!!, glob "content/*.mdtext" ],
 );

Added: openwebbeans/cms-site/trunk/templates/footer.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/templates/footer.html?rev=1421359&view=auto
==============================================================================
--- openwebbeans/cms-site/trunk/templates/footer.html (added)
+++ openwebbeans/cms-site/trunk/templates/footer.html Thu Dec 13 16:20:31 2012
@@ -0,0 +1,31 @@
+        <hr>
+
+        <footer>
+            <div class="pull-right">
+                <a class="brand" href="http://www.apache.org"><img src="resources/images/feather-small.png"
height="25px" alt="asf_feather_small"/></a>
+            </div>
+            <p>Copyright &copy; 20011-2012 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0.</p>
+            <p>Apache and the Apache feather logo are trademarks of The Apache Software
Foundation.</p>
+        </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="{{base}}/resources/js/jquery.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-transition.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-alert.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-modal.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-dropdown.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-scrollspy.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-tab.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-tooltip.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-popover.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-button.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-collapse.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-carousel.js"></script>
+    <script src="{{base}}/resources/js/bootstrap-typeahead.js"></script>
+
+</body></html>
+

Added: openwebbeans/cms-site/trunk/templates/header.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/templates/header.html?rev=1421359&view=auto
==============================================================================
--- openwebbeans/cms-site/trunk/templates/header.html (added)
+++ openwebbeans/cms-site/trunk/templates/header.html Thu Dec 13 16:20:31 2012
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<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">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="{{base}}resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css"
rel="stylesheet">
+    <link href="{{base}}resources/css/main.css" rel="stylesheet">
+
+</head>
+
+<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="support.html">Support</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>
+        </div>
+    </div>
+
+    <div class="container">

Modified: openwebbeans/cms-site/trunk/templates/standard.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/templates/standard.html?rev=1421359&r1=1421358&r2=1421359&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/templates/standard.html (original)
+++ openwebbeans/cms-site/trunk/templates/standard.html Thu Dec 13 16:20:31 2012
@@ -1,86 +1,9 @@
-<!DOCTYPE html>
-<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">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="{{base}}resources/css/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-        body {
-            padding-top: 60px;
-            padding-bottom: 40px;
-        }
-    </style>
-    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css"
rel="stylesheet">
-
-</head>
-
-<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="http://www.apache.org"><img src="resources/images/feather-small.png"
height="25px" alt="asf_feather_small"/></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><a href="{{base}}index.html">Home</a></li>
-                        <li class="active"><a href="{{base}}documentation.html">Documentation</a></li>
-                        <li><a href="{{base}}source.html">Source</a></li>
-                        <!-- <li><a href="download.html">Download</a></li>
-->
-                        <li><a href="{{base}}community.html">Community</a></li>
-                        <!-- <li><a href="support.html">Support</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>
-        </div>
-    </div>
-
-    <div class="container">
+{% include header %}
 
         <div id="OwbContent_{% block title %}{% endblock %}" class="wiki-content">
 {% block content %}{{ content|markdown }}{% endblock %}
         </div>
 
-        <hr>
-
-        <footer>
-            <p>Copyright &copy; 20011-2012 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0.</p>
-            <p>Apache and the Apache feather logo are trademarks of The Apache Software
Foundation.</p>
-        </footer>
-
-    </div> <!-- /container -->
-
-    <!-- Javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="{{base}}/resources/js/jquery.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-transition.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-alert.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-modal.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-dropdown.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-scrollspy.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-tab.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-tooltip.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-popover.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-button.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-collapse.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-carousel.js"></script>
-    <script src="{{base}}/resources/js/bootstrap-typeahead.js"></script>
+{% include footer %}
 
-</body></html>
 



Mime
View raw message