svn commit: r1395017 - in /incubator/flex/site/trunk: content/flex/again/index.fhtml templates/flex_page.html

[er...@apache.org]

Author: erikdebruin
Date: Sat Oct  6 12:09:40 2012
New Revision: 1395017

URL: http://svn.apache.org/viewvc?rev=1395017&view=rev
Log:
Working on the new Flex project site.

Modified:
    incubator/flex/site/trunk/content/flex/again/index.fhtml
    incubator/flex/site/trunk/templates/flex_page.html

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=1395017&r1=1395016&r2=1395017&view=diff
==============================================================================
--- incubator/flex/site/trunk/content/flex/again/index.fhtml (original)
+++ incubator/flex/site/trunk/content/flex/again/index.fhtml Sat Oct  6 12:09:40 2012
@@ -1,20 +1,4 @@
-Title:     Hi there?
-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.
-Hello: world again
+Title:  Hi there?
+UseNav: about
 
 Blah blah
\ 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=1395017&r1=1395016&r2=1395017&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/flex_page.html (original)
+++ incubator/flex/site/trunk/templates/flex_page.html Sat Oct  6 12:09:40 2012
@@ -2,13 +2,23 @@
 <!-- start content -->
 
     <div id="flex-content">
-        <!-- this is a placeholder 'content' that will hold the contents of 
-             the variable 'content' after it has been filtered through the 
-             'markdown' filter -->
+        <!-- The headers 'object' contains properties who's values are defined
+             at the top of the 'fhtml' page ([name]: value). -->
          {% block notice %}{{ headers.notice }}{% endblock %}
+
+         <!-- conditional based on headers 'property' value -->
+         {% if UseNav == "about" %}Whoa!{% endif %}
+         
+         <!-- The various 'flex_xxx' variables are automatically parsed by the
+              CMS from files in the 'templates' directory (i.e. flex_insert.mdtext
+              will be parsed into the 'flex_insert' variable). -->
          {% if flex_insert %}
             {% autoescape off %}{{ flex_insert|markdown }}{% endautoescape %}
          {% endif %}
+
+         <!-- This is a placeholder 'content' that will hold the contents of 
+              the variable 'content' after it has been filtered through the 
+              'markdown' filter. -->
          {% block content %}{{ content|markdown }}{% endblock %}
     </div>