Author: ilya_shaikovsky
Date: 2011-02-24 07:29:56 -0500 (Thu, 24 Feb 2011)
New Revision: 21913
Modified:
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml
Log:
http://jira.jboss.org/browse/RF-10582
Modified:
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
===================================================================
---
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2011-02-24
12:01:51 UTC (rev 21912)
+++
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2011-02-24
12:29:56 UTC (rev 21913)
@@ -10,9 +10,22 @@
private static final long serialVersionUID = 6822187362271025752L;
private static final String BASE_SAMPLES_DIR = "/richfaces/";
-
+
private List<SampleDescriptor> samples;
+ private boolean containsNewSamples() {
+ for (SampleDescriptor sample : samples) {
+ if (sample.isNewItem()){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isNewItems() {
+ return (isNewItem() || containsNewSamples());
+ }
+
public SampleDescriptor getSampleById(String id) {
for (SampleDescriptor sample : getSamples()) {
if (sample.getId().equals(id)) {
Modified:
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java
===================================================================
---
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2011-02-24
12:01:51 UTC (rev 21912)
+++
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2011-02-24
12:29:56 UTC (rev 21913)
@@ -11,6 +11,19 @@
private List<DemoDescriptor> demos;
+ private boolean containsNewDemos() {
+ for (DemoDescriptor demo : demos) {
+ if (demo.isNewItems()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isNewItems() {
+ return isNewItem() || containsNewDemos();
+ }
+
@XmlElementWrapper(name = "demos")
@XmlElement(name = "demo")
public List<DemoDescriptor> getDemos() {
Modified:
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
---
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-02-24
12:01:51 UTC (rev 21912)
+++
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-02-24
12:29:56 UTC (rev 21913)
@@ -172,10 +172,10 @@
</demo>
</demos>
</group>
- <group>
+ <group new="true">
<name>Validation</name>
<demos>
- <demo new="true">
+ <demo>
<id>clientValidation</id>
<name>Client Side Validation</name>
<samples>
@@ -189,7 +189,7 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>graphValidator</id>
<name>rich:graphValidator</name>
<samples>
@@ -199,7 +199,7 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>message</id>
<name>rich:message</name>
<samples>
@@ -209,7 +209,7 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>messages</id>
<name>rich:messages</name>
<samples>
@@ -464,7 +464,7 @@
<group>
<name>Menus</name>
<demos>
- <demo new="true">
+ <demo>
<id>panelMenu</id>
<name>rich:panelMenu</name>
<samples>
@@ -474,7 +474,7 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>toolBar</id>
<name>rich:toolBar</name>
<samples>
@@ -488,7 +488,7 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>dropDownMenu</id>
<name>rich:dropDownMenu</name>
<samples>
@@ -521,19 +521,19 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>calendar</id>
<name>rich:calendar</name>
<samples>
- <sample new="true">
+ <sample>
<id>calendar</id>
<name>Simple Calendar</name>
</sample>
- <sample new="true">
+ <sample>
<id>clientStylingDisablement</id>
<name>Client Side Styling/Disablement</name>
</sample>
- <sample new="true">
+ <sample>
<id>dataModel</id>
<name>Data Model Support</name>
</sample>
@@ -589,7 +589,7 @@
</sample>
</samples>
</demo>
- <demo new="true">
+ <demo>
<id>fileUpload</id>
<name>rich:fileUpload</name>
<samples>
@@ -605,7 +605,7 @@
<name>Drag and Drop</name>
<demos>
<demo new="true">
- <id>dragDrop</id>
+ <id>dragDrop</id>
<name>Drag and Drop</name>
<samples>
<sample>
Modified:
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml
===================================================================
---
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-02-24
12:01:51 UTC (rev 21912)
+++
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-02-24
12:29:56 UTC (rev 21913)
@@ -12,7 +12,7 @@
</style>
<h:form id="form">
<h:panelGrid columns="2" columnClasses="cols,cols"
width="400">
- <rich:panelMenu style="width:200px" mode="ajax"
groupMode="ajax"
+ <rich:panelMenu style="width:200px" itemMode="ajax"
groupMode="ajax"
groupExpandedLeftIcon="triangleUp"
groupCollapsedLeftIcon="triangleDown"
topGroupExpandedRightIcon="chevronUp"
Modified:
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml
===================================================================
---
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-02-24
12:01:51 UTC (rev 21912)
+++
branches/4.0.0.CR1/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2011-02-24
12:29:56 UTC (rev 21913)
@@ -7,10 +7,13 @@
xmlns:c="http://java.sun.com/jsp/jstl/core">
<rich:panelMenu activeItem="#{demoNavigator.currentDemo.id}">
<c:forEach items="#{demoNavigator.groups}" var="gr">
- <rich:panelMenuGroup label="#{gr.name}">
+ <rich:panelMenuGroup label="#{gr.name}"
+ rightExpandedIcon="#{gr.newItems ? '/images/icons/new-ic.gif' :
null}"
+ rightCollapsedIcon="#{gr.newItems ? '/images/icons/new-ic.gif' :
null}">
<c:forEach items="#{gr.demos}" var="d">
- <rich:panelMenuItem label="#{d.name}" action="#{d.id}"
rightIcon="none"
+ <rich:panelMenuItem label="#{d.name}" action="#{d.id}"
mode="client" name="#{d.id}"
+ rightIcon="#{(d.newItems || gr.newItem) ?
'/images/icons/new-small-ic.gif' : null}"
onclick="document.location='#{facesContext.externalContext.requestContextPath}/richfaces/component-sample.jsf?demo=#{d.id}&skin=#{skinBean.skin}'">
</rich:panelMenuItem>
</c:forEach>