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/06 13:15:46 UTC
svn commit: r1394999 - in /incubator/flex/site/trunk:
content/flex/again/index.fhtml lib/path.pm templates/flex.html
templates/flex_footer.html templates/flex_header.html
templates/flex_page.html
Author: erikdebruin
Date: Sat Oct 6 11:15:45 2012
New Revision: 1394999
URL: http://svn.apache.org/viewvc?rev=1394999&view=rev
Log:
Notifying users about the 'extra' downloads the Installer does to make the SDK work.
Added:
incubator/flex/site/trunk/templates/flex_footer.html
incubator/flex/site/trunk/templates/flex_header.html
Removed:
incubator/flex/site/trunk/templates/flex.html
Modified:
incubator/flex/site/trunk/content/flex/again/index.fhtml
incubator/flex/site/trunk/lib/path.pm
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=1394999&r1=1394998&r2=1394999&view=diff
==============================================================================
--- incubator/flex/site/trunk/content/flex/again/index.fhtml (original)
+++ incubator/flex/site/trunk/content/flex/again/index.fhtml Sat Oct 6 11:15:45 2012
@@ -1,3 +1,19 @@
-Title: Hi there?
+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
\ No newline at end of file
+Hello world again
\ 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=1394999&r1=1394998&r2=1394999&view=diff
==============================================================================
--- incubator/flex/site/trunk/lib/path.pm (original)
+++ incubator/flex/site/trunk/lib/path.pm Sat Oct 6 11:15:45 2012
@@ -7,7 +7,11 @@ 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$!, single_narrative => { template => "flex_page.html" }],
+ [qr!\.fhtml$!, single_narrative => {
+ header => "flex_header.html",
+ template => "flex_page.html",
+ footer => "flex_footer.html"
+ }],
) ;
# for specifying interdependencies between files
Added: incubator/flex/site/trunk/templates/flex_footer.html
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex_footer.html?rev=1394999&view=auto
==============================================================================
--- incubator/flex/site/trunk/templates/flex_footer.html (added)
+++ incubator/flex/site/trunk/templates/flex_footer.html Sat Oct 6 11:15:45 2012
@@ -0,0 +1,7 @@
+<!-- start footer -->
+
+Hello footer
+
+</body>
+</html>
+<!-- end footer -->
Added: incubator/flex/site/trunk/templates/flex_header.html
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/templates/flex_header.html?rev=1394999&view=auto
==============================================================================
--- incubator/flex/site/trunk/templates/flex_header.html (added)
+++ incubator/flex/site/trunk/templates/flex_header.html Sat Oct 6 11:15:45 2012
@@ -0,0 +1,19 @@
+<!-- start header -->
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Apache Flex SDK</title>
+
+ <link href="/flex/css/flex_again.css" rel="stylesheet" type="text/css">
+
+</head>
+
+<body>
+
+ <h1>{% block title %}{{ headers.title }}{% endblock %}</h1>
+
+<!-- end header -->
\ 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=1394999&r1=1394998&r2=1394999&view=diff
==============================================================================
--- incubator/flex/site/trunk/templates/flex_page.html (original)
+++ incubator/flex/site/trunk/templates/flex_page.html Sat Oct 6 11:15:45 2012
@@ -1 +1,7 @@
-{% extends "flex.html" %}
\ No newline at end of file
+<!-- start content -->
+
+ <div id="flex-content">
+ {% block content %}{{ content|markdown }}{% endblock %}
+ </div>
+
+<!-- end content -->
\ No newline at end of file