Author: nbelaevski
Date: 2008-07-14 21:09:18 -0400 (Mon, 14 Jul 2008)
New Revision: 9593
Added:
trunk/samples/darkX/
trunk/samples/glassX/
Modified:
trunk/samples/darkX/pom.xml
trunk/samples/glassX/pom.xml
trunk/samples/pom.xml
trunk/samples/richfaces-demo/pom.xml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
Log:
darkX & glassX skins moved to main area
Copied: trunk/samples/darkX (from rev 9592, trunk/sandbox/samples/darkX)
Modified: trunk/samples/darkX/pom.xml
===================================================================
--- trunk/sandbox/samples/darkX/pom.xml 2008-07-15 01:00:36 UTC (rev 9592)
+++ trunk/samples/darkX/pom.xml 2008-07-15 01:09:18 UTC (rev 9593)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.skins</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>darkX</artifactId>
<name>darkX</name>
<build>
Copied: trunk/samples/glassX (from rev 9592, trunk/sandbox/samples/glassX)
Modified: trunk/samples/glassX/pom.xml
===================================================================
--- trunk/sandbox/samples/glassX/pom.xml 2008-07-15 01:00:36 UTC (rev 9592)
+++ trunk/samples/glassX/pom.xml 2008-07-15 01:09:18 UTC (rev 9593)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.skins</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>glassX</artifactId>
<name>glassX</name>
<version>3.2.2-SNAPSHOT</version>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-07-15 01:00:36 UTC (rev 9592)
+++ trunk/samples/pom.xml 2008-07-15 01:09:18 UTC (rev 9593)
@@ -487,6 +487,8 @@
<modules>
<module>skins</module>
<module>laguna</module>
+ <module>glassX</module>
+ <module>darkX</module>
<module>richfaces-demo</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2008-07-15 01:00:36 UTC (rev 9592)
+++ trunk/samples/richfaces-demo/pom.xml 2008-07-15 01:09:18 UTC (rev 9593)
@@ -200,6 +200,16 @@
<version>3.2.2-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>glassX</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>darkX</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>3.2.2-SNAPSHOT</version>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2008-07-15
01:00:36 UTC (rev 9592)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2008-07-15
01:09:18 UTC (rev 9593)
@@ -49,6 +49,18 @@
</td>
<td>
<h:outputLink
value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
+ Glass-X
+ <f:param value="glassX" name="s"/>
+ </h:outputLink>
+ </td>
+ <td>
+ <h:outputLink
value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
+ Dark-X
+ <f:param value="darkX" name="s"/>
+ </h:outputLink>
+ </td>
+ <td>
+ <h:outputLink
value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
Classic
<f:param value="classic" name="s"/>
</h:outputLink>
@@ -74,6 +86,18 @@
</td>
<td>
<h:outputLink
value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
+ Glass-X
+ <f:param value="glassX" name="s"/>
+ </h:outputLink>
+ </td>
+ <td>
+ <h:outputLink
value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
+ Dark-X
+ <f:param value="darkX" name="s"/>
+ </h:outputLink>
+ </td>
+ <td>
+ <h:outputLink
value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
BlueSky
<f:param value="blueSky" name="s"/>
</h:outputLink>