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/10/25 19:44:38 UTC
svn commit: r1402229 - in /incubator/flex/site/trunk:
content/flex/again/assets/images/flex.png content/flex/again/index.fhtml
templates/flex_about.mdtext templates/flex_header.html
templates/flex_page.html
Author: erikdebruin
Date: Thu Oct 25 17:44:37 2012
New Revision: 1402229
URL: http://svn.apache.org/viewvc?rev=1402229&view=rev
Log:
Some work on the new ('again') website.
Added:
incubator/flex/site/trunk/content/flex/again/assets/images/flex.png (with props)
Modified:
incubator/flex/site/trunk/content/flex/again/index.fhtml
incubator/flex/site/trunk/templates/flex_about.mdtext
incubator/flex/site/trunk/templates/flex_header.html
incubator/flex/site/trunk/templates/flex_page.html
Added: incubator/flex/site/trunk/content/flex/again/assets/images/flex.png
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/content/flex/again/assets/images/flex.png?rev=1402229&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/flex/site/trunk/content/flex/again/assets/images/flex.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: 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=1402229&r1=1402228&r2=1402229&view=diff
==============================================================================
--- incubator/flex/site/trunk/content/flex/again/index.fhtml (original)
+++ incubator/flex/site/trunk/content/flex/again/index.fhtml Thu Oct 25 17:44:37 2012
@@ -1,4 +1,4 @@
IsAbout: Indicate that this page is an 'About' page
Title: Supported Platforms
-Desktop | Mobile | TV | Killed the buildbot?
\ No newline at end of file
+Desktop | Mobile | TV
\ No newline at end of file
Modified: incubator/flex/site/trunk/templates/flex_about.mdtext
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex_about.mdtext?rev=1402229&r1=1402228&r2=1402229&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/flex_about.mdtext (original)
+++ incubator/flex/site/trunk/templates/flex_about.mdtext Thu Oct 25 17:44:37 2012
@@ -1,7 +1,23 @@
-<div>
- <a href="./index.html">Supported Platforms</a> -
- <a href="./about_news.html">News</a> -
- <a href="./about_features.html">Features</a> -
- <a href="./about_showcase.html">Showcase</a> -
- <a href="./about_resources.html">Resources</a>
-</div>
\ No newline at end of file
+<div id="contentHead">
+ <img src="./assets/images/flex.png" alt="" height="285" width="270" style="float: left;">
+
+ ONE CODEBASE<br />
+ MULTIPLE DEVICES<br />
+ The Apache Flex is a highly productive open source framework for building and maintaining expressive web applications that deploy consistently on all major browsers, desktops and and operating systems.<br />
+
+ <br /><br /><br /><br /><br /><br /><br /><br />
+
+ <div id="subNav" class="sub nav">
+ <ul>
+ <li><a href="./index.html">Supported Platforms</a></li>
+ <li><img class="orangeDot" src="./assets/images/orangedot.png" alt="" height="5" width="5" /></li>
+ <li><a href="./about_news.html">News</a></li>
+ <li><img class="orangeDot" src="./assets/images/orangedot.png" alt="" height="5" width="5" /></li>
+ <li><a href="./about_features.html">Features</a></li>
+ <li><img class="orangeDot" src="./assets/images/orangedot.png" alt="" height="5" width="5" /></li>
+ <li><a href="./about_showcase.html">Showcase</a></li>
+ <li><img class="orangeDot" src="./assets/images/orangedot.png" alt="" height="5" width="5" /></li>
+ <li><a href="./about_resources.html">Resources</a>
+ </ul>
+ </div><!-- subNav -->
+</div><!-- contentHead -->
Modified: incubator/flex/site/trunk/templates/flex_header.html
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex_header.html?rev=1402229&r1=1402228&r2=1402229&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/flex_header.html (original)
+++ incubator/flex/site/trunk/templates/flex_header.html Thu Oct 25 17:44:37 2012
@@ -15,6 +15,10 @@
padding: 0;
}
+ body {
+ font-family: 'Open Sans', sans-serif;
+ }
+
.orangeDot {
margin-left: 10px;
margin-right: 10px;
@@ -27,21 +31,24 @@
width: 960px;
}
- #mainNav {
- display: table-cell;
- font-family: 'Open Sans', sans-serif;
+ .main {
font-weight: 600;
+ }
+
+ .nav {
+ display: table-cell;
vertical-align: middle;
}
- #mainNav li {
+ .nav li {
display: inline-block;
list-style-type: none;
text-align: center;
vertical-align: middle;
}
- #mainNav li a {
+ .nav li a {
+ color: black;
text-decoration: none;
}
@@ -55,10 +62,10 @@
width: 960px;
}
- #footerNav {
- position: absolute;
+ .sub {
+ /**/
}
-
+
</style>
</head>
@@ -66,7 +73,7 @@
<body>
<div id="allContainer">
- <div id="mainNav">
+ <div id="mainNav" class="main nav">
<ul>
<li><a href="./index.html"><img src="./assets/images/logo.png" alt="Apache Flex Logo" height="66" width="147" /></a></li>
<li><a href="./index.html">ABOUT</a></li>
@@ -81,4 +88,4 @@
</ul>
</div>
- <div id="mainContent">
\ No newline at end of file
+ <div id="mainContent">
\ No newline at end of file
Modified: incubator/flex/site/trunk/templates/flex_page.html
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex_page.html?rev=1402229&r1=1402228&r2=1402229&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/flex_page.html (original)
+++ incubator/flex/site/trunk/templates/flex_page.html Thu Oct 25 17:44:37 2012
@@ -1,26 +1,24 @@
{% include header %}
-<div id="flex-content">
- {% block pagetypes %}
+{% block pagetypes %}
- <!-- About -->
- {% if headers.isabout %}
- {% autoescape off %}{{ flex_about }}{% endautoescape %}
- {% endif %}
+ <!-- About -->
+ {% if headers.isabout %}
+ {% autoescape off %}{{ flex_about }}{% endautoescape %}
+ {% endif %}
- <!-- Get Started -->
- {% if headers.isgetstarted %}
- {% autoescape off %}{{ flex_get_started }}{% endautoescape %}
- {% endif %}
-
- <!-- Community -->
- {% if headers.iscommunity %}
- {% autoescape off %}{{ flex_community }}{% endautoescape %}
- {% endif %}
-
- {% block content %}{{ content|markdown }}{% endblock %}
+ <!-- Get Started -->
+ {% if headers.isgetstarted %}
+ {% autoescape off %}{{ flex_get_started }}{% endautoescape %}
+ {% endif %}
+
+ <!-- Community -->
+ {% if headers.iscommunity %}
+ {% autoescape off %}{{ flex_community }}{% endautoescape %}
+ {% endif %}
+
+ {% block content %}{{ content|markdown }}{% endblock %}
- {% endblock %}
-</div>
+{% endblock %}
{% include footer %}
\ No newline at end of file