You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/11/20 22:05:09 UTC
svn commit: r882714 - in /incubator/pivot/site/trunk: build.properties
build.xml etc/main.xsl etc/project.xml etc/template.xsl
src/about.template.xml src/documentation.template.xml src/styles/pivot.css
Author: tvolkert
Date: Fri Nov 20 21:05:09 2009
New Revision: 882714
URL: http://svn.apache.org/viewvc?rev=882714&view=rev
Log:
Site updates
Added:
incubator/pivot/site/trunk/build.properties
incubator/pivot/site/trunk/src/about.template.xml
incubator/pivot/site/trunk/src/documentation.template.xml
Modified:
incubator/pivot/site/trunk/build.xml
incubator/pivot/site/trunk/etc/main.xsl
incubator/pivot/site/trunk/etc/project.xml
incubator/pivot/site/trunk/etc/template.xsl
incubator/pivot/site/trunk/src/styles/pivot.css
Added: incubator/pivot/site/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/build.properties?rev=882714&view=auto
==============================================================================
--- incubator/pivot/site/trunk/build.properties (added)
+++ incubator/pivot/site/trunk/build.properties Fri Nov 20 21:05:09 2009
@@ -0,0 +1,15 @@
+# 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.
+version=1.4
Modified: incubator/pivot/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/build.xml?rev=882714&r1=882713&r2=882714&view=diff
==============================================================================
--- incubator/pivot/site/trunk/build.xml (original)
+++ incubator/pivot/site/trunk/build.xml Fri Nov 20 21:05:09 2009
@@ -20,6 +20,8 @@
<!-- Properties that affect the directories that are created as part of the build -->
<property name="folder.bin" value="ant-bin"/>
+ <property file="build.properties"/>
+
<!-- Transform macro -->
<macrodef name="transform">
<attribute name="type"/>
@@ -29,7 +31,7 @@
destdir="${folder.bin}"
style="etc/@{type}.xsl"
includes="**/*.@{type}.xml">
- <param name="relative-path" expression="."/>
+ <param name="release" expression="${version}"/>
<globmapper from="*.@{type}.xml" to="*.html"/>
</xslt>
</sequential>
Modified: incubator/pivot/site/trunk/etc/main.xsl
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/etc/main.xsl?rev=882714&r1=882713&r2=882714&view=diff
==============================================================================
--- incubator/pivot/site/trunk/etc/main.xsl (original)
+++ incubator/pivot/site/trunk/etc/main.xsl Fri Nov 20 21:05:09 2009
@@ -26,7 +26,10 @@
indent="yes"/>
<!-- Defined parameters (overrideable) -->
- <xsl:param name="relative-path" select="'.'"/>
+ <xsl:param name="release"/>
+ <xsl:param name="wiki" select="'http://cwiki.apache.org/PIVOT'"/>
+ <xsl:param name="asf" select="'http://www.apache.org'"/>
+ <xsl:param name="jira" select="'http://issues.apache.org/jira/browse/PIVOT'"/>
<!-- Process an entire document into an HTML page -->
<xsl:template match="document">
@@ -72,7 +75,9 @@
</div>
<div id="footer" class="group">
- <div class="footerLogo">Copyright (c) 1999-2010, The Apache Software Foundation.</div>
+ <div class="footerLogo">
+ Copyright (c) 1999-2010,<br/>The Apache Software Foundation.
+ </div>
<div class="footerLinks">
<ul class="footerMenuGr">
@@ -90,7 +95,7 @@
<li>
<strong><xsl:value-of select="@name"/></strong>
<ul>
- <xsl:apply-templates select="item"/>
+ <xsl:apply-templates select="item[not(@footer='no')]"/>
</ul>
</li>
</xsl:template>
@@ -99,11 +104,20 @@
<xsl:template match="item">
<xsl:variable name="href">
<xsl:choose>
- <xsl:when test="starts-with(@href, 'http://')">
- <xsl:value-of select="@href"/>
+ <xsl:when test="starts-with(@href, '~wiki')">
+ <xsl:value-of select="$wiki"/><xsl:value-of select="substring(@href,6)"/>
+ </xsl:when>
+ <xsl:when test="starts-with(@href, '~asf')">
+ <xsl:value-of select="$asf"/><xsl:value-of select="substring(@href,5)"/>
+ </xsl:when>
+ <xsl:when test="starts-with(@href, '~jira')">
+ <xsl:value-of select="$jira"/><xsl:value-of select="substring(@href,6)"/>
+ </xsl:when>
+ <xsl:when test="starts-with(@href, '~release')">
+ <xsl:value-of select="$release"/><xsl:value-of select="substring(@href,9)"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$relative-path"/><xsl:value-of select="@href"/>
+ <xsl:value-of select="@href"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
Modified: incubator/pivot/site/trunk/etc/project.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/etc/project.xml?rev=882714&r1=882713&r2=882714&view=diff
==============================================================================
--- incubator/pivot/site/trunk/etc/project.xml (original)
+++ incubator/pivot/site/trunk/etc/project.xml Fri Nov 20 21:05:09 2009
@@ -16,44 +16,61 @@
limitations under the License.
-->
-<project name="The Apache Pivot Project" href="http://pivot.apache.org/">
-
+<project href="http://pivot.apache.org/">
<title>Apache Pivot</title>
<global>
- <item name="Demos" href="/1.4/demos/"/>
- <item name="Download" href="/download.cgi#1.4"/>
- <item name="Documentation" href="/documentation.html"/>
- <item name="Get Involved" href="/get-involved.html"/>
- <item name="About" href="/about.html"/>
+ <item name="Demos" href="~release/demos/"/>
+ <item name="Download" href="download.cgi#1.4"/>
+ <item name="Documentation" href="documentation.html"/>
+ <item name="Get Involved" href="get-involved.html"/>
+ <item name="About" href="about.html"/>
</global>
<groups>
<group id="demos" name="Demos">
- <item name="Kitchen Sink" href="/1.4/demos/kitchen_sink.html"/>
- <item name="Charting" href="http://ixnay.biz/charts.html"/>
- <item name="Component Explorer" href=""/>
- <item name="More Demos" href="/1.4/demos/"/>
+ <item name="Kitchen Sink" href="~release/demos/kitchen_sink.html"/>
+ <item name="Charting" href="http://ixnay.biz/charts.html"/>
+ <item name="Component Explorer" href="~release/tutorials/component_explorer.html"/>
+ <item name="Stock Tracker" href="~release/demos/stock_tracker.html" footer="no"/>
+ <item name="iTunes Search" href="~release/demos/itunes_search.html" footer="no"/>
+ <item name="JSON Viewer" href="~release/demos/json_viewer.html" footer="no"/>
+ <item name="Scripting" href="~release/demos/scripting.html" footer="no"/>
+ <item name="File Drag & Drop" href="~release/demos/file_drag_drop.html" footer="no"/>
+ <item name="Table Row Editor" href="~release/demos/table_row_editor.html" footer="no"/>
+ <item name="Animated Clock" href="~release/demos/animated_clock.html" footer="no"/>
+ <item name="Large Data Sets" href="~release/demos/large_data.html" footer="no"/>
+ <item name="RSS Feed" href="~release/demos/rss_feed.html" footer="no"/>
+ <item name="DOM Interaction" href="~release/demos/dom_interaction.html" footer="no"/>
+ <item name="Decorators" href="~release/demos/decorators.html" footer="no"/>
+ <item name="Fixed Column Table" href="~release/demos/fixed_column_table.html" footer="no"/>
+ <item name="Multiple Selection" href="~release/demos/multiselect.html" footer="no"/>
+ <item name="More Demos" href="~release/demos/"/>
</group>
<group id="documentation" name="Documentation">
- <item name="Tutorial" href="/1.4/tutorials/"/>
- <item name="FAQ" href=""/>
- <item name="Javadoc (1.4)" href="/1.4/docs/api/"/>
+ <item name="Tutorial" href="~release/tutorials/"/>
+ <item name="FAQ" href="~wiki/frequently-asked-questions-faq.html"/>
+ <item name="Javadoc (1.4)" href="~release/docs/api/"/>
</group>
<group id="get-involved" name="Get Involved">
- <item name="SVN Repositories" href="/svn.html"/>
- <item name="Mailing Lists" href="/lists.html"/>
- <item name="Wiki" href="http://cwiki.apache.org/PIVOT/"/>
+ <item name="SVN Repositories" href="svn.html"/>
+ <item name="Mailing Lists" href="lists.html"/>
+ <item name="Bug Database" href="~jira/"/>
+ <item name="Wiki" href="~wiki/"/>
+ </group>
+
+ <group id="related" name="Related">
+ <item name="JFreeChart Provider" href="http://code.google.com/p/pivot-jfree/"/>
</group>
<group id="about" name="About">
- <item name="Who We Are" href="/who-we-are.html"/>
- <item name="Contact" href="/contact.html"/>
- <item name="Legal/License" href="/legal.html"/>
- <item name="Sponshorship" href="http://www.apache.org/foundation/sponsorship.html"/>
- <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+ <item name="Who We Are" href="who-we-are.html"/>
+ <item name="Contact" href="contact.html"/>
+ <item name="Legal/License" href="legal.html"/>
+ <item name="Sponshorship" href="~asf/foundation/sponsorship.html"/>
+ <item name="Thanks" href="~asf/foundation/thanks.html"/>
</group>
</groups>
</project>
Modified: incubator/pivot/site/trunk/etc/template.xsl
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/etc/template.xsl?rev=882714&r1=882713&r2=882714&view=diff
==============================================================================
--- incubator/pivot/site/trunk/etc/template.xsl (original)
+++ incubator/pivot/site/trunk/etc/template.xsl Fri Nov 20 21:05:09 2009
@@ -26,7 +26,10 @@
indent="yes"/>
<!-- Defined parameters (overrideable) -->
- <xsl:param name="relative-path" select="'.'"/>
+ <xsl:param name="release"/>
+ <xsl:param name="wiki" select="'http://cwiki.apache.org/PIVOT'"/>
+ <xsl:param name="asf" select="'http://www.apache.org'"/>
+ <xsl:param name="jira" select="'http://issues.apache.org/jira/browse/PIVOT'"/>
<!-- Process an entire document into an HTML page -->
<xsl:template match="document">
@@ -89,7 +92,9 @@
</div>
<div id="footer" class="group">
- <div class="footerLogo">Copyright (c) 1999-2010, The Apache Software Foundation.</div>
+ <div class="footerLogo">
+ Copyright (c) 1999-2010,<br/>The Apache Software Foundation.
+ </div>
<div class="footerLinks">
<ul class="footerMenuGr">
@@ -107,7 +112,7 @@
<li>
<strong><xsl:value-of select="@name"/></strong>
<ul>
- <xsl:apply-templates select="item"/>
+ <xsl:apply-templates select="item[not(@footer='no')]"/>
</ul>
</li>
</xsl:template>
@@ -116,11 +121,20 @@
<xsl:template match="item">
<xsl:variable name="href">
<xsl:choose>
- <xsl:when test="starts-with(@href, 'http://')">
- <xsl:value-of select="@href"/>
+ <xsl:when test="starts-with(@href, '~wiki')">
+ <xsl:value-of select="$wiki"/><xsl:value-of select="substring(@href,6)"/>
+ </xsl:when>
+ <xsl:when test="starts-with(@href, '~asf')">
+ <xsl:value-of select="$asf"/><xsl:value-of select="substring(@href,5)"/>
+ </xsl:when>
+ <xsl:when test="starts-with(@href, '~jira')">
+ <xsl:value-of select="$jira"/><xsl:value-of select="substring(@href,6)"/>
+ </xsl:when>
+ <xsl:when test="starts-with(@href, '~release')">
+ <xsl:value-of select="$release"/><xsl:value-of select="substring(@href,9)"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$relative-path"/><xsl:value-of select="@href"/>
+ <xsl:value-of select="@href"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
Added: incubator/pivot/site/trunk/src/about.template.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/src/about.template.xml?rev=882714&view=auto
==============================================================================
--- incubator/pivot/site/trunk/src/about.template.xml (added)
+++ incubator/pivot/site/trunk/src/about.template.xml Fri Nov 20 21:05:09 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<document group="about">
+
+ <properties>
+ <title>About</title>
+ </properties>
+
+ <body>
+
+ TODO
+
+ </body>
+</document>
Added: incubator/pivot/site/trunk/src/documentation.template.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/src/documentation.template.xml?rev=882714&view=auto
==============================================================================
--- incubator/pivot/site/trunk/src/documentation.template.xml (added)
+++ incubator/pivot/site/trunk/src/documentation.template.xml Fri Nov 20 21:05:09 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<document group="documentation">
+
+ <properties>
+ <title>Documentation</title>
+ </properties>
+
+ <body>
+
+ TODO
+
+ </body>
+</document>
Modified: incubator/pivot/site/trunk/src/styles/pivot.css
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/src/styles/pivot.css?rev=882714&r1=882713&r2=882714&view=diff
==============================================================================
--- incubator/pivot/site/trunk/src/styles/pivot.css (original)
+++ incubator/pivot/site/trunk/src/styles/pivot.css Fri Nov 20 21:05:09 2009
@@ -69,7 +69,7 @@
margin-top: 20px;
padding-bottom: 10px;
background: #032036 url(bg_footer.gif) repeat-x left top;
- color: #354d5e;
+ color: #4b6c84;
font-size: 85%;
}
@@ -380,12 +380,12 @@
/* Footer elements */
#footer a {
- color: #354d5e;
+ color: #4b6c84;
text-decoration: none;
}
#footer a:hover {
- color: #687986;
+ color: #8ba1b3;
}
.footerLogo {