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/23 05:40:09 UTC
svn commit: r883245 - in /incubator/pivot/site/trunk: build.xml demos
etc/demo.xsl etc/project.xml etc/project.xsl
Author: tvolkert
Date: Mon Nov 23 04:40:09 2009
New Revision: 883245
URL: http://svn.apache.org/viewvc?rev=883245&view=rev
Log:
Site updates
Added:
incubator/pivot/site/trunk/demos (with props)
incubator/pivot/site/trunk/etc/demo.xsl (with props)
Modified:
incubator/pivot/site/trunk/build.xml
incubator/pivot/site/trunk/etc/project.xml
incubator/pivot/site/trunk/etc/project.xsl
Modified: incubator/pivot/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/build.xml?rev=883245&r1=883244&r2=883245&view=diff
==============================================================================
--- incubator/pivot/site/trunk/build.xml (original)
+++ incubator/pivot/site/trunk/build.xml Mon Nov 23 04:40:09 2009
@@ -32,7 +32,7 @@
<param name="release" expression="${version}"/>
</xslt>
- <!-- Transform all other pages using template.xsl -->
+ <!-- Transform standard pages using template.xsl -->
<xslt basedir="src"
destdir="${folder.bin}"
extension=".html"
@@ -42,6 +42,17 @@
<param name="release" expression="${version}"/>
</xslt>
+ <!-- Transform demos pages using demo.xsl -->
+ <xslt basedir="demos"
+ destdir="${folder.bin}/${version}/demos"
+ extension=".html"
+ style="etc/demo.xsl"
+ includes="**/*.xml"
+ excludes="index.xml">
+ <param name="release" expression="${version}"/>
+ <param name="base" expression="../../"/>
+ </xslt>
+
<!-- Copy static resource files -->
<copy todir="${folder.bin}">
<fileset dir="src" excludes="**/*.xml"/>
Added: incubator/pivot/site/trunk/demos
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/demos?rev=883245&view=auto
==============================================================================
--- incubator/pivot/site/trunk/demos (added)
+++ incubator/pivot/site/trunk/demos Mon Nov 23 04:40:09 2009
@@ -0,0 +1 @@
+link ../../trunk/demos/www
\ No newline at end of file
Propchange: incubator/pivot/site/trunk/demos
------------------------------------------------------------------------------
svn:special = *
Added: incubator/pivot/site/trunk/etc/demo.xsl
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/etc/demo.xsl?rev=883245&view=auto
==============================================================================
--- incubator/pivot/site/trunk/etc/demo.xsl (added)
+++ incubator/pivot/site/trunk/etc/demo.xsl Mon Nov 23 04:40:09 2009
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:include href="project.xsl"/>
+
+ <xsl:variable name="jar-core">
+ <xsl:value-of select="'../lib/pivot-core-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.jar'"/>
+ </xsl:variable>
+
+ <xsl:variable name="jar-wtk">
+ <xsl:value-of select="'../lib/pivot-wtk-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.jar'"/>
+ </xsl:variable>
+
+ <xsl:variable name="jar-wtk-terra">
+ <xsl:value-of select="'../lib/pivot-wtk-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.terra.jar'"/>
+ </xsl:variable>
+
+ <xsl:variable name="jar-web">
+ <xsl:value-of select="'../lib/pivot-web-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.jar'"/>
+ </xsl:variable>
+
+ <xsl:variable name="jar-demos">
+ <xsl:value-of select="'../lib/pivot-demos-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.jar'"/>
+ </xsl:variable>
+
+ <xsl:variable name="jar-tutorials">
+ <xsl:value-of select="'../lib/pivot-tutorials-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.jar'"/>
+ </xsl:variable>
+
+ <xsl:variable name="jar-tools">
+ <xsl:value-of select="'../lib/pivot-tools-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="'.jar'"/>
+ </xsl:variable>
+
+ <xsl:template match="body">
+ <div id="contentBase" class="group">
+ <h1><xsl:value-of select="//document/properties/title"/></h1>
+
+ <xsl:comment>GROUP NAVIGATION</xsl:comment>
+ <ul class="naviLeft">
+ <li><a href="getting-started.html">Getting Started</a></li>
+ </ul>
+
+ <xsl:comment>CONTENT</xsl:comment>
+ <div class="content">
+ <xsl:apply-templates/>
+ </div>
+ </div>
+ </xsl:template>
+
+ <xsl:template match="demo">
+ <script src="http://java.com/js/deployJava.js"></script>
+ <script type="text/javascript">
+ var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet"};
+
+ <xsl:for-each select="attributes/*">
+ attributes.<xsl:value-of select="name(.)"/> = '<xsl:value-of select="."/>';
+ </xsl:for-each>
+
+ var libraries = [];
+ <xsl:for-each select="libraries/library">
+ <xsl:choose>
+ <xsl:when test=".='core'">
+ libraries.push('<xsl:value-of select="$jar-core"/>');
+ </xsl:when>
+ <xsl:when test=".='wtk'">
+ libraries.push('<xsl:value-of select="$jar-wtk"/>');
+ libraries.push('<xsl:value-of select="$jar-wtk-terra"/>');
+ </xsl:when>
+ <xsl:when test=".='web'">
+ libraries.push('<xsl:value-of select="$jar-web"/>');
+ </xsl:when>
+ <xsl:when test=".='demos'">
+ libraries.push('<xsl:value-of select="$jar-demos"/>');
+ </xsl:when>
+ <xsl:when test=".='tutorials'">
+ libraries.push('<xsl:value-of select="$jar-tutorials"/>');
+ </xsl:when>
+ <xsl:when test=".='tools'">
+ libraries.push('<xsl:value-of select="$jar-tools"/>');
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ attributes.archive = libraries.join(",");
+
+ var parameters = {
+ codebase_lookup:false,
+ java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
+ };
+
+ <xsl:for-each select="parameters/*">
+ <xsl:variable name="parameter">
+ <xsl:choose>
+ <xsl:when test="name(.)='class-name'">
+ <xsl:value-of select="'application_class_name'"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="name(.)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ parameters.<xsl:value-of select="$parameter"/> = '<xsl:value-of select="."/>';
+ </xsl:for-each>
+
+ deployJava.runApplet(attributes, parameters, "1.6");
+ </script>
+ </xsl:template>
+</xsl:stylesheet>
Propchange: incubator/pivot/site/trunk/etc/demo.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/pivot/site/trunk/etc/demo.xsl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/pivot/site/trunk/etc/project.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/etc/project.xml?rev=883245&r1=883244&r2=883245&view=diff
==============================================================================
--- incubator/pivot/site/trunk/etc/project.xml (original)
+++ incubator/pivot/site/trunk/etc/project.xml Mon Nov 23 04:40:09 2009
@@ -21,7 +21,7 @@
<global>
<item name="Demos" href="~release/demos/"/>
- <item name="Download" href="download.cgi#1.4"/>
+ <item name="Download" href="~download"/>
<item name="Documentation" href="documentation.html"/>
<item name="Get Involved" href="get-involved.html"/>
<item name="About" href="about.html"/>
@@ -29,22 +29,9 @@
<groups>
<group id="demos" name="Demos">
- <item name="Kitchen Sink" href="~release/demos/kitchen_sink.html"/>
+ <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="Component Explorer" href="~release/tutorials/component-explorer.html"/>
<item name="More Demos" href="~release/demos/"/>
</group>
Modified: incubator/pivot/site/trunk/etc/project.xsl
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/etc/project.xsl?rev=883245&r1=883244&r2=883245&view=diff
==============================================================================
--- incubator/pivot/site/trunk/etc/project.xsl (original)
+++ incubator/pivot/site/trunk/etc/project.xsl Mon Nov 23 04:40:09 2009
@@ -24,6 +24,7 @@
<!-- Defined parameters (overrideable) -->
<xsl:param name="release"/>
+ <xsl:param name="base"/>
<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'"/>
@@ -59,7 +60,9 @@
</xsl:choose>
<xsl:value-of select="$project/title"/>
</title>
- <link href="styles/pivot.css" rel="stylesheet" type="text/css"/>
+ <link href="{$base}styles/pivot.css" rel="stylesheet" type="text/css"/>
+
+ <xsl:apply-templates select="head"/>
<!-- Google Analytics Code -->
<script type="text/javascript">
@@ -79,12 +82,12 @@
<div id="main">
<div id="header">
<div class="{$logoClass}">
- <a href="index.html">
- <img src="images/logo.png" alt="Apache Pivot" title="Apache Pivot Homepage"/>
+ <a href="{$base}index.html">
+ <img src="{$base}images/logo.png" alt="Apache Pivot" title="Apache Pivot Homepage"/>
</a>
</div>
<div class="tagline">
- <img src="images/tagline.png" alt="Rich Internet Applications (RIA) in Java (tm)"/>
+ <img src="{$base}images/tagline.png" alt="Rich Internet Applications (RIA) in Java (tm)"/>
</div>
<xsl:comment>MAIN NAVIGATION</xsl:comment>
@@ -112,6 +115,10 @@
</html>
</xsl:template>
+ <xsl:template match="head">
+ <xsl:apply-templates/>
+ </xsl:template>
+
<!-- Process an item group -->
<xsl:template match="group">
<li>
@@ -140,12 +147,17 @@
<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:value-of select="$base"/>
+ <xsl:value-of select="$release"/>
+ <xsl:value-of select="substring(@href,9)"/>
</xsl:when>
<xsl:when test="@href='~download'">
- <xsl:value-of select="'download.cgi#'"/><xsl:value-of select="$release"/>
+ <xsl:value-of select="$base"/>
+ <xsl:value-of select="'download.cgi#'"/>
+ <xsl:value-of select="$release"/>
</xsl:when>
<xsl:otherwise>
+ <xsl:value-of select="$base"/>
<xsl:value-of select="@href"/>
</xsl:otherwise>
</xsl:choose>