[richfaces-svn-commits] JBoss Rich Faces SVN: r2161 - in trunk/samples/richfaces-demo/src/main: webapp and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: ishabalov
Date: 2007-08-08 17:18:27 -0400 (Wed, 08 Aug 2007)
New Revision: 2161

Modified:
   trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
   trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
   trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml
Log:
Removed blank image in welcome page

Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java	2007-08-08 20:30:09 UTC (rev 2160)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java	2007-08-08 21:18:27 UTC (rev 2161)
@@ -20,7 +20,11 @@
 	private ComponentDescriptor currentComponent;
 	private List componentGroups = null;
 	private Object activeTab;
-		
+	
+	public boolean getHasCurrentComponent() {
+		return currentComponent!=null;
+	}
+	
 	public Object getActiveTab() {
 		return activeTab;
 	}

Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml	2007-08-08 20:30:09 UTC (rev 2160)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml	2007-08-08 21:18:27 UTC (rev 2161)
@@ -33,7 +33,7 @@
 </table>
 
 <h:graphicImage value="#{componentNavigator.currentComponent.captionImage}" 
-	rendered="#{componentNavigator.currentComponent.captionImage!=''}" height="40" alt="" border="0" styleClass="component_name"/>
+	rendered="#{componentNavigator.hasCurrentComponent}" height="40" alt="" border="0" styleClass="component_name"/>
 
 <table cellpadding="0" cellspacing="0" border="0" class="content_container" width="100%">
 <tbody>

Modified: trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml	2007-08-08 20:30:09 UTC (rev 2160)
+++ trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml	2007-08-08 21:18:27 UTC (rev 2161)
@@ -6,8 +6,8 @@
 <ui:composition template="/templates/main.xhtml">
 	<ui:define name="title">RichFaces - Open Source Rich JSF Components</ui:define>
 	<ui:define name="body">
-		<p>Welcome to the <h:outputLink value="#" target="_blank">
-			<strong>Rich Faces 3.0</strong>
+		<p>Welcome to the <h:outputLink value="http://labs.jboss.com/jbossrichfaces" target="_blank">
+			<strong>Rich Faces 3.1</strong>
 		</h:outputLink> demo!</p>
 		<h4>About RichFaces</h4>
 		<p>RichFaces is a rich component library for JavaServer Faces