You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2012/09/16 19:52:40 UTC
svn commit: r1385329 - in /incubator/flex/site/trunk: content/flex/again/
content/flex/again/index.fhtml content/flex/css/flex_again.css lib/path.pm
templates/flex.html templates/flex_page.html
Author: erikdebruin
Date: Sun Sep 16 17:52:40 2012
New Revision: 1385329
URL: http://svn.apache.org/viewvc?rev=1385329&view=rev
Log:
Laying foundation for implementing new site design.
Added:
incubator/flex/site/trunk/content/flex/again/
incubator/flex/site/trunk/content/flex/again/index.fhtml
incubator/flex/site/trunk/content/flex/css/flex_again.css
- copied, changed from r1385318, incubator/flex/site/trunk/content/flex/css/flex.css
incubator/flex/site/trunk/templates/flex.html
- copied, changed from r1385318, incubator/flex/site/trunk/templates/skeleton.html
incubator/flex/site/trunk/templates/flex_page.html
- copied, changed from r1385318, incubator/flex/site/trunk/templates/html_page.html
Modified:
incubator/flex/site/trunk/lib/path.pm
Added: incubator/flex/site/trunk/content/flex/again/index.fhtml
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/content/flex/again/index.fhtml?rev=1385329&view=auto
==============================================================================
--- incubator/flex/site/trunk/content/flex/again/index.fhtml (added)
+++ incubator/flex/site/trunk/content/flex/again/index.fhtml Sun Sep 16 17:52:40 2012
@@ -0,0 +1,3 @@
+Title: Hi there?
+
+Hello world
\ No newline at end of file
Copied: incubator/flex/site/trunk/content/flex/css/flex_again.css (from r1385318, incubator/flex/site/trunk/content/flex/css/flex.css)
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/content/flex/css/flex_again.css?p2=incubator/flex/site/trunk/content/flex/css/flex_again.css&p1=incubator/flex/site/trunk/content/flex/css/flex.css&r1=1385318&r2=1385329&rev=1385329&view=diff
==============================================================================
--- incubator/flex/site/trunk/content/flex/css/flex.css (original)
+++ incubator/flex/site/trunk/content/flex/css/flex_again.css Sun Sep 16 17:52:40 2012
@@ -14,379 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-body {
- color: white;
- font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
- font-size: 10pt;
- margin: 0;
-}
-#bannera {
- height: 105px;
- padding: 0 0 0 8px;
- color: black;
- font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
- font-size:12pt;
- vertical-align: middle;
-}
-
-#bannerright {
- text-align: right;
- float: right;
- padding: 4pt 20pt 4pt 16pt;
- width: 220px;
-}
-
-#bannercenter {
- padding: 31pt 2pt 14pt 2pt;
- float: center;
- color: #107EC0;
-}
-
-#bannerleft {
- text-align: left;
- float: left;
-}
-
-a {
- color: #107EC0;
-}
-
-a:visited {
- color: #107EC0;
-}
-
-a:hover {
- color: #107EC0;
- text-decoration:underline;
-}
-
-a img { border: none; }
-
-h1,h2,h3,h4,h5,h6 {
- color: #193240;
- text-transform:uppercase;
-}
-
-#clear {
- overflow: auto;
- clear: both;
-}
-
-#content {
- margin: 0 32px 20px 32px;
- padding: 12px 8px 32px 8px;
- color: #333;
- overflow: auto;
-}
-
-#content h1,h2,h3,h4,h5,h6 {
- font-weight: normal;
- text-transform:none;
- margin: 10px 0 15px;
- padding: 5px 0;
-}
-
-#content h1 {
- font-size: 1.4em;
- padding: 15px;
- border-top: 1px solid #a3afb6;
-}
-
-#content h2 {
- font-size: 1.2em;
- 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;
- margin-bottom: 0;
-}
-
-#content li {
- margin-bottom: 0.5em;
-}
-
-table {
- border-collapse:collapse;
- margin: auto;
-}
-
-th {
- height: 40px;
- background: #f5f8fa;
- border: 1px solid #a3afb6;
- vertical-align: middle;
- font-size: 0.9em;
-}
-
-td {
- vertical-align: top;
- border: 1px solid #a3afb6;
- padding: 0.4em 0.5em 0.4em 0.5em;
- font-size: 0.9em;
-}
-
-.w140 {
- width: 140px;
-}
-
-.w160 {
- width: 160px;
-}
-
-.w180 {
- width: 180px;
-}
-
-.w200 {
- width: 200px;
-}
-
-.w220 {
- width: 220px;
-}
-
-.codehilite {
- background-color: #F0F000;
- padding: 0.01em 1em;
- border-radius: 10px;
-}
-
-#topbara{
- border-top: 1px solid #c6cbdd;
- border-bottom: 1px solid #c6cbdd;
- height: 24pt;
- background-color: #f5f8fa;
- margin: 0 0 0 0;
- padding: 0 0 0 0;
- color: black;
- font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
- font-size:14pt;
- vertical-align: middle;
- clear: both;
-}
-
-#breadcrumbsa {
- margin: 4px 0px 4px 0px;
- padding: 4px 8px 3px 20px;
- background-color: #f5f8fa;
- color: #333;
- font-size: 14px;
- float: left;
-}
-
-#breadcrumbsa a {
- margin: 0;
- padding: 2px;
- background-color: #f5f8fa;
- text-decoration:none;
-}
-
-#breadcrumbsa a:hover {
- color: #107EC0;
- background-color: #c6cbdd;
- text-decoration:underline;
-}
-
-#topnava {
- margin: 4px 0px 4px 0px;
- padding: 4px 20px 3px 8px;
- color: #333;
- font-size: 14px;
- text-align: right;
- float: right;
-}
-
-#topnava ul {
- list-style-type:none;
- margin:0;
- padding:0;
-}
-
-#topnava li {
- padding: 0 6px 0 8px;
- border-left: 1px solid #c6cbdd;
- display:inline;
-}
-
-#topnava a {
- margin: 0;
- padding: 2px;
- background-color: #f5f8fa;
- text-decoration:none;
-}
-
-#topnava a:hover {
- color: #107EC0;
- background-color: #c6cbdd;
- text-decoration:underline;
-}
-
-#leftnav {
- border: 1px solid #e6ebed;
- border-left: none;
- -moz-border-radius: 0 0 10px 0;
- border-radius: 0 0 10px 0;
- color: #003;
- float: left;
- padding: 15px 15px 5px 20px;
- width: 150px;
- background: none repeat scroll 0 0 #f5f8fa;
- margin: 0 12px 20px 0;
-}
-
-#leftnav img {
- padding-bottom: 15px;
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
-
-#leftnav h1 {
- color: #000;
- font-size: 1em;
- padding: 0;
- margin-top: 0.8em;
- margin-bottom: 0;
- border-bottom: 1px solid #a3afb6;
-}
-
-#leftnav ul {
- margin: 0 0;
- padding: 0;
- list-style: none;
-}
-
-#leftnav li {
- border-bottom: 1px solid #e6ebed;
- margin: 0.2em 0;
- padding: 0;
-}
-
-#leftnav li a {
- margin: 0;
- text-decoration:none;
-}
-
-#leftnav li a:hover {
- color: #107EC0;
- background-color: #c6cbdd;
- text-decoration:underline;
-}
-
-#rightnav {
- border: 1px solid #e6ebed;
- border-left: none;
- -moz-border-radius: 0 0 0 10px;
- border-radius: 0 0 0 10px;
- color: #003;
- float: right;
- padding: 15px 20px 5px 15px;
- width: 150px;
- background: none repeat scroll 0 0 #f5f8fa;
- margin: 0 0 20px 12px;
-}
-
-#rightnav img {
- padding-bottom: 15px;
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
-
-#rightnav h1 {
- color: #000;
- font-size: 1em;
- padding: 0;
- margin-top: 0.8em;
- margin-bottom: 0;
- border-bottom: 1px solid #a3afb6;
-}
-
-#rightnav ul {
- margin: 0 0;
- padding: 0;
- list-style: none;
-}
-
-#rightnav li {
- border-bottom: 1px solid #e6ebed;
- margin: 0.2em 0;
- padding: 0;
-}
-
-#rightnav li a {
- margin: 0;
- text-decoration:none;
-}
-
-#rightnav li a:hover {
- color: #107EC0;
- background-color: #c6cbdd;
- text-decoration:underline;
-}
-
-#footera {
- margin: 20px 0px 0px 0px;
- padding: 8px 0px 12px 0px;
- border-top: 2px solid #ccc;
- color:#666;
- font-size: 8pt;
- padding: 0 8px;
- text-align: left;
- overflow: auto;
- clear: both;
- line-height: 10pt;
-}
-
-#copyrighta {
-}
-
-#copyrighta p {
- padding-left: 20px;
- line-height: 10pt;
- padding-bottom: 5px;
-}
-
-#copyrighta a {
- color: #107EC0;
- text-decoration:underline;
-}
-
-#copyrighta a:hover {
- background-color: #e6ebed;
-}
-
-#poweredbya {
- float: right;
- text-align: right;
- width: 210px;
- height: 100px;
-}
-
-#asf-logo {
- width: 180px;
- padding-top: 8px;
-}
-
-#flex-logo {
- height: 100px;
- padding-top: 4px;
- padding-left: 8px;
-}
-
-/* definition lists */
-dd {}
-dl {}
-dt {
- display: inline;
- float: left;
-}
+h1 { color: red; }
\ No newline at end of file
Modified: incubator/flex/site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/lib/path.pm?rev=1385329&r1=1385328&r2=1385329&view=diff
==============================================================================
--- incubator/flex/site/trunk/lib/path.pm (original)
+++ incubator/flex/site/trunk/lib/path.pm Sun Sep 16 17:52:40 2012
@@ -7,6 +7,7 @@ our @patterns = (
[qr!\.html$!, html_page => { template => "html_page.html" }],
[qr!\.htm$!, html_page => { template => "html_page.html" }],
[qr!\.chtml$!, html_page => { template => "no_template.html" }],
+ [qr!\.fhtml$!, flex_page => { template => "flex_page.html" }],
) ;
# for specifying interdependencies between files
Copied: incubator/flex/site/trunk/templates/flex.html (from r1385318, incubator/flex/site/trunk/templates/skeleton.html)
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex.html?p2=incubator/flex/site/trunk/templates/flex.html&p1=incubator/flex/site/trunk/templates/skeleton.html&r1=1385318&r2=1385329&rev=1385329&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/skeleton.html (original)
+++ incubator/flex/site/trunk/templates/flex.html Sun Sep 16 17:52:40 2012
@@ -1,50 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
<html>
<head>
-<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
-{% if header %}
-{% autoescape off %}{{ header }}{% endautoescape %}{% else %}
-<title>{% block title %}{{ headers.title }}{% endblock %}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{% endif %}
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title></title>
+
+ <link href="/flex/css/flex_again.css" rel="stylesheet" type="text/css">
+
</head>
<body>
- <div id="bannera">
- <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/flex/images/flex.png"/></div>
- <div id="bannerright">
- <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/flex/images/apache-incubator-logo.png"/></a>
- </div>
- <div id="bannercenter"> </div>
- </div>
- <div id="topbara">
- {% if topnav.content %}<div id="topnava">{% block topnav %}{{ topnav.content|markdown }}{% endblock %}</div>{% endif %}
- <div id="breadcrumbsa">{% block breaddcrumbs %}{% autoescape off %}{{ breadcrumbs }}{% endautoescape %}{% endblock %}</div>
- </div>
- <div id="clear"></div>
- {% 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 title %}{% if headers.title %}<h1 class="title">{{ headers.title }}</h1>{% endif %}{% endblock %}
- {% block content %}{{ content|markdown }}{% endblock %}
- </div>
-
- <div id="footera">
- <div id="poweredbya"><p><img src="/flex/images/feather-small.gif"/></p></div>
- <div id="copyrighta">
- <p>
- Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
- Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
- decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is
- not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
- yet to be fully endorsed by the ASF.</p>
- <p>
- <a href="/flex/license.html">Copyright & License</a>
- <br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
- Other names appearing on the site may be trademarks of their respective owners.
- </p>
+
+ <h1>{% block title %}{{ headers.title }}{% endblock %}</h1>
+
+ <div id="flex-content">
+ {% block content %}{{ content|markdown }}{% endblock %}
</div>
- </div>
</body>
</html>
Copied: incubator/flex/site/trunk/templates/flex_page.html (from r1385318, incubator/flex/site/trunk/templates/html_page.html)
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex_page.html?p2=incubator/flex/site/trunk/templates/flex_page.html&p1=incubator/flex/site/trunk/templates/html_page.html&r1=1385318&r2=1385329&rev=1385329&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/html_page.html (original)
+++ incubator/flex/site/trunk/templates/flex_page.html Sun Sep 16 17:52:40 2012
@@ -1,3 +1 @@
-{% extends "skeleton.html" %}
- {% block content %}{% autoescape off %}{{ content }}{% endautoescape %}{% endblock %}
-{$ endextends $}
+{% extends "flex.html" %}
\ No newline at end of file