[richfaces-svn-commits] JBoss Rich Faces SVN: r12047 - in trunk/samples/richfaces-demo/src/main: webapp/css and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Dec 29 10:00:43 EST 2008
Author: ilya_shaikovsky
Date: 2008-12-29 10:00:43 -0500 (Mon, 29 Dec 2008)
New Revision: 12047
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
trunk/samples/richfaces-demo/src/main/webapp/css/common.css
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-4910
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 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-12-29 15:00:43 UTC (rev 12047)
@@ -125,6 +125,67 @@
return ret;
}
+ private boolean checkNewComponents(List<ComponentDescriptor> groups){
+ for (ComponentDescriptor component : groups) {
+ if (component.isNewComponent()) return true;
+ }
+ return false;
+ }
+
+ public boolean isValidatorsHasNew() {
+ return checkNewComponents(getFilteredComponents("richValidators"));
+ }
+
+ public boolean isSelectHasNew() {
+ return checkNewComponents(getFilteredComponents("richSelect"));
+ }
+
+ public boolean isRichDragDropHasNew() {
+ return checkNewComponents(getFilteredComponents("richDragDrop"));
+ }
+
+ public boolean isRichDataIteratorsHasNew() {
+ return checkNewComponents(getFilteredComponents("richDataIterators"));
+ }
+
+ public boolean isRichMenuHasNew() {
+ return checkNewComponents(getFilteredComponents("richMenu"));
+ }
+
+ public boolean isRichTreeHasNew() {
+ return checkNewComponents(getFilteredComponents("richTree"));
+ }
+
+ public boolean isRichInputsHasNew() {
+ return checkNewComponents(getFilteredComponents("richInputs"));
+ }
+
+ public boolean isRichOutputsHasNew() {
+ return checkNewComponents(getFilteredComponents("richOutputs"));
+ }
+
+ public boolean isAjaxSupportHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxSupport"));
+ }
+
+ public boolean isAjaxResourcesHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxResources"));
+ }
+
+ public boolean isAjaxOutputHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxOutput"));
+ }
+
+ public boolean isAjaxMiscHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxMisc"));
+ }
+
+ public boolean isRichMiscHasNew() {
+ return checkNewComponents(getFilteredComponents("richMisc"));
+ }
+
+ // ************************************************************************************
+
public List getValidatorsComponents() {
return getFilteredComponents("richValidators");
}
@@ -176,7 +237,7 @@
public List getRichMisc() {
return getFilteredComponents("richMisc");
}
-
+// ************************************************************************************
public List getComponents() {
Iterator it = components_().iterator();
ComponentDescriptor cur = getCurrentComponent();
Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2008-12-29 15:00:43 UTC (rev 12047)
@@ -194,7 +194,7 @@
.panel_menu div.rich-panelbar-header, .panel_menu div.rich-panelbar-header-act{
background-color: #E4EAEF;
background-image:none;
- padding:3px 20px 3px 20px;
+ padding:3px 10px 3px 20px;
border-top: 1px solid white;
border-bottom: 1px solid white;
color: black;
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-29 15:00:43 UTC (rev 12047)
@@ -6,10 +6,10 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<table border="0" cellpadding="0" cellspacing="1">
- <tbody>
+ <tbody>
<a4j:repeat var="component" value="#{components}">
<tr class="#{component.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component.current?'active':'unactive'}'">
- <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /></td>
+ <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-5px; left:10px;" alt="" width="10" height="10"/></td>
<td class="text #{component.newComponent?'bold':''}" width="100%">
<h:outputLink style="display:block;height:20px" value="#{component.contextRelativeDemoLocation}">
<span style="display:block;padding-top:3px;text-decoration : none; color : #000000;">
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-12-29 15:00:43 UTC (rev 12047)
@@ -6,68 +6,172 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<rich:panel styleClass="panel_menu" bodyClass="rich-laguna-panel-no-header">
-<rich:panelBar style="width: auto;" selectedPanel="#{componentNavigator.currentComponent.group}" height="650px" contentStyle="background:none;">
- <rich:panelBarItem id="ajaxSupport" label="Ajax Support">
+<rich:panelBar style="width: auto;" selectedPanel="#{componentNavigator.currentComponent.group}" height="690px" contentStyle="background:none;">
+ <rich:panelBarItem id="ajaxSupport">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Support" />
+ <ui:param name="isNew" value="#{componentNavigator.ajaxSupportHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxSupport}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="ajaxResources" label="Resources/Beans Handling">
+ <rich:panelBarItem id="ajaxResources">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Resources/Beans Handling"/>
+ <ui:param name="isNew" value="#{componentNavigator.ajaxResourcesHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxResources}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richValidators" label="Ajax Validators">
+ <rich:panelBarItem id="richValidators">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Validators"/>
+ <ui:param name="isNew" value="#{componentNavigator.validatorsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.validatorsComponents}" />
- </ui:include>
+ </ui:include>
</rich:panelBarItem>
- <rich:panelBarItem styleClass="panel_menu_bar" id="ajaxOutput" label="Ajax Output">
+ <rich:panelBarItem styleClass="panel_menu_bar" id="ajaxOutput">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Output"/>
+ <ui:param name="isNew" value="#{componentNavigator.ajaxOutputHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxOutput}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="ajaxMisc" label="Ajax Miscellaneous">
+ <rich:panelBarItem id="ajaxMisc">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Miscellaneous"/>
+ <ui:param name="isNew" value="#{componentNavigator.ajaxMiscHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxMisc}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richDataIterators" label="Data Iteration">
+ <rich:panelBarItem id="richDataIterators">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Data Iteration"/>
+ <ui:param name="isNew" value="#{componentNavigator.richDataIteratorsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richDataIterators}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richDragDrop" label="Drag-Drop Support">
+ <rich:panelBarItem id="richDragDrop">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Drag-Drop Support"/>
+ <ui:param name="isNew" value="#{componentNavigator.richDragDropHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richDragDropComponents}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richMenu" label="Rich Menu">
+ <rich:panelBarItem id="richMenu">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Menu"/>
+ <ui:param name="isNew" value="#{componentNavigator.richMenuHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richMenu}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richTree" label="Rich Trees">
+ <rich:panelBarItem id="richTree">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Trees"/>
+ <ui:param name="isNew" value="#{componentNavigator.richTreeHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richTree}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richOutputs" label="Rich Output">
+ <rich:panelBarItem id="richOutputs">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value= "Rich Output"/>
+ <ui:param name="isNew" value="#{componentNavigator.richOutputsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richOutputs}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richInputs" label="Rich Input">
+ <rich:panelBarItem id="richInputs">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value= "Rich Input"/>
+ <ui:param name="isNew" value="#{componentNavigator.richInputsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richInputs}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richSelect" label="Rich Selects">
+ <rich:panelBarItem id="richSelect">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Selects"/>
+ <ui:param name="isNew" value="#{componentNavigator.selectHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.selectComponents}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richMisc" label="Rich Miscellaneous">
+ <rich:panelBarItem id="richMisc">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Miscellaneous"/>
+ <ui:param name="isNew" value="#{componentNavigator.richMiscHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richMisc}" />
</ui:include>
More information about the richfaces-svn-commits
mailing list