[richfaces-svn-commits] JBoss Rich Faces SVN: r4778 - in branches/3.1.x/samples/richfaces-demo/src/main: resources/org/richfaces/demo/common and 4 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Dec 12 10:23:31 EST 2007
Author: ilya_shaikovsky
Date: 2007-12-12 10:23:31 -0500 (Wed, 12 Dec 2007)
New Revision: 4778
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/control.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
Log:
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java 2007-12-12 14:55:25 UTC (rev 4777)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/Environment.java 2007-12-12 15:23:31 UTC (rev 4778)
@@ -3,9 +3,12 @@
import java.util.HashMap;
import java.util.Map;
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
+
public class Environment {
private Map params = new HashMap();
-
+ private String version;
public Map getParams() {
return params;
}
@@ -14,4 +17,8 @@
this.params = params;
}
+ public String getVersion() {
+ String shortVersion = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{a4j.version}", String.class).getValue(FacesContext.getCurrentInstance().getELContext()).toString();
+ return shortVersion.substring(0, shortVersion.indexOf("$Date"));
+ }
}
Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-12-12 14:55:25 UTC (rev 4777)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-12-12 15:23:31 UTC (rev 4778)
@@ -67,11 +67,8 @@
log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/log.jsf
page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, RichFacesComponentsLibrary.html#page, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/page.jsf
portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, RichFacesComponentsLibrary.html#portlet, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf
-<<<<<<< .working
effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
contextMenu= richMenu, Context Menu, /images/ico_dropDownMenu.gif, /images/cn_contextMenu.gif, RichFacesComponentsLibrary.html\#contextMenu, jbossrichfaces/freezone/docs/tlddoc/rich/contextMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIContextMenu.html, /richfaces/contextMenu.jsf
componentControl= richMisc, Component Control, /images/ico_common.gif, /images/cn_componentControl.gif, RichFacesComponentsLibrary.html\#componentControl, jbossrichfaces/freezone/docs/tlddoc/rich/componentControl.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomponentControl.html, /richfaces/componentControl.jsf
-orderingList= richSelect, Ordering List, /images/ico_DataTable.gif, /images/cn_orderingList.gif, RichFacesComponentsLibrary.html\#orderingList, jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIorderingList.html, /richfaces/orderingList.jsf
-listShuttle= richSelect, List Shuttle, /images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#listShuttle, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html, /richfaces/listShuttle.jsf=======
-effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
->>>>>>> .merge-right.r4766
+orderingList= richSelect, Ordering List, /images/ico_DataTable.gif, /images/cn_orderingList.gif, RichFacesComponentsLibrary.html\#orderingList, jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIorderingList.html, /richfaces/orderingList.jsf
+listShuttle= richSelect, List Shuttle, /images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#listShuttle, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html, /richfaces/listShuttle.jsf
\ No newline at end of file
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/control.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/control.xhtml 2007-12-12 14:55:25 UTC (rev 4777)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/control.xhtml 2007-12-12 15:23:31 UTC (rev 4778)
@@ -17,11 +17,10 @@
The component attached to links and just calls "show" and "hide" functions on Modal Panel.
</p>
<div class="sample-container">
- <ui:include src="/richfaces/componentControl/examples/mpusage.xhtml" />
- <rich:spacer height="20"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/componentControl/examples/mpusage.xhtml"/>
- </ui:include>
+ <ui:include src="/richfaces/componentControl/examples/mpusage.xhtml" />
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/componentControl/examples/mpusage.xhtml"/>
+ </ui:include>
</div>
<p>
<b>Main component attributes:</b>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-12 14:55:25 UTC (rev 4777)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-12 15:23:31 UTC (rev 4778)
@@ -40,12 +40,7 @@
<rich:column>
<h:outputText value="#{items.label}"></h:outputText>
</rich:column>
+ <a4j:support event="onlistchanged" reRender="toolBar"/>
</rich:listShuttle>
-
- <div style="width:462px">
- <a4j:commandButton styleClass="rich-list-shuttle-button"
- style="float:right;padding:2px;border:1px solid #BED6F8"
- value="Update Toolbar" reRender="toolBar" />
- </div>
</h:form>
</ui:composition>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-12-12 14:55:25 UTC (rev 4777)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-12-12 15:23:31 UTC (rev 4778)
@@ -114,12 +114,14 @@
<f:param value="DEFAULT" name="s"/>
</h:outputLink>
</td>
+ <ui:remove>
<td>
<h:outputLink value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
Null
<f:param value="NULL" name="s"/>
</h:outputLink>
</td>
+ </ui:remove>
<td class="control">
<rich:toggleControl for="skin_chooser" value="« less" />
</td>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-12-12 14:55:25 UTC (rev 4777)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2007-12-12 15:23:31 UTC (rev 4778)
@@ -47,8 +47,8 @@
<ui:insert name="body">Body</ui:insert>
<!-- tabpanel end -->
<rich:spacer style="height:10px;" />
- <rich:separator style="height:1px" />
- <div style="float:right" class="footer-text">${a4j.version}</div>
+ <rich:separator style="height:1px" />
+ <div style="float:right;" class="footer-text">#{environment.version}</div>
<div style="float:none">
<a href="http://jboss.com/index.html?module=bb&op=viewtopic&t=104575"
style="color:#000; display:block" class="footer-text">RichFaces. Most Important Links</a>
More information about the richfaces-svn-commits
mailing list