JBoss Rich Faces SVN: r4514 - in branches/3.1.x/test-applications/facelets/src/main: java/componentControl and 11 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ayanul
Date: 2007-12-05 15:18:32 -0500 (Wed, 05 Dec 2007)
New Revision: 4514
Added:
branches/3.1.x/test-applications/facelets/src/main/java/componentControl/
branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java
branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java
branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml
Log:
update componentControl, ModalPanel
Added: branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java (rev 0)
+++ branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java 2007-12-05 20:18:32 UTC (rev 4514)
@@ -0,0 +1,17 @@
+package componentControl;
+
+public class ComponentControl {
+ private boolean calendarPopup;
+
+ public ComponentControl() {
+ calendarPopup = false;
+ }
+
+ public boolean isCalendarPopup() {
+ return calendarPopup;
+ }
+
+ public void setCalendarPopup(boolean calendarPopup) {
+ this.calendarPopup = calendarPopup;
+ }
+}
Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-05 20:18:32 UTC (rev 4514)
@@ -7,13 +7,13 @@
private boolean keepVisualState;
private String left;
private String top;
- private String rendered;
+ private boolean rendered;
private boolean required;
private String requiredMessage;
private int shadowDepth;
private int shadowOpacity;
private boolean showWhenRendered;
- private int zindex;
+ private String zindex;
private int minHeight;
private int minWidth;
@@ -25,15 +25,25 @@
public ModalPanel() {
- minHeight = 100;
- minWidth = 100;
- height = 300;
- width = 300;
+ this.minHeight = 100;
+ this.minWidth = 100;
+ this.height = 300;
+ this.width = 300;
- moveable=true;
- resizeable=true;
-
-
+ this.moveable=true;
+ this.resizeable=true;
+ this.autosized = false;
+ this.immediate = false;
+ this.keepVisualState = false;
+ this.left = "100";
+ this.top = "100";
+ this.rendered = true;
+ this.required = true;
+ this.requiredMessage = "requiredMessage";
+ this.shadowDepth = 3;
+ this.shadowOpacity = 3;
+ this.zindex = "3";
+ this.showWhenRendered = false;
}
public int getHeight() {
@@ -169,11 +179,11 @@
this.top = top;
}
- public String getRendered() {
+ public boolean getRendered() {
return rendered;
}
- public void setRendered(String rendered) {
+ public void setRendered(boolean rendered) {
this.rendered = rendered;
}
@@ -217,11 +227,11 @@
this.showWhenRendered = showWhenRendered;
}
- public int getZindex() {
+ public String getZindex() {
return zindex;
}
- public void setZindex(int zindex) {
+ public void setZindex(String zindex) {
this.zindex = zindex;
}
}
Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-12-05 20:18:32 UTC (rev 4514)
@@ -48,7 +48,7 @@
map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false}));
map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true}));
map.add("Tree", add("/Tree/Tree", new boolean [] {true, false}));
- map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true}));
+ map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, false}));
map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false}));
map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false}));
map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, true}));
@@ -56,6 +56,7 @@
map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {true, false}));
map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false}));
map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true}));
+ map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false}));
}
public String getSrc() {
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -18,7 +18,7 @@
showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}"
currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic"
buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}"
- buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}"
+ buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}"
bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedClient}"
focus="popupModeID" mode="client" required="#{calendarBean.required}" requiredMessage="Required Message"
timeZone="#{calendarBean.tmZone}">
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -2,47 +2,89 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets">
<h:form>
<rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)">
- <h:outputLink id="hideButton1ID" onclick="return false;" value="Close" ><f:verbatim>Close 1</f:verbatim></h:outputLink>
- <f:verbatim><br/></f:verbatim>
- <h:outputLink id="hideButton2ID" onclick="return false;" value="Close" ><f:verbatim>Close 2</f:verbatim></h:outputLink>
+ <h:outputLink id="hideButton1ID" onclick="return false;" value="Close">
+ <f:verbatim>Close 1</f:verbatim>
+ </h:outputLink>
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+ <h:outputLink id="hideButton2ID" onclick="return false;" value="Close">
+ <f:verbatim>Close 2</f:verbatim>
+ </h:outputLink>
</rich:modalPanel>
- <h:commandButton id="showButtonID" value="show" >
+ <h:commandButton id="showButtonID" onclick="return false;" value="show ModalPanel">
<rich:componentControl for="ccModalPanelID" event="onclick" operation="show" params="show:'componentControl work(show)'" />
</h:commandButton>
- <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" params="hide:'componentControl work(hide)'" />
+
+ <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide"
+ params="hide:'componentControl work(hide)'" />
- <f:verbatim><br/><br/></f:verbatim>
-
- <rich:panelMenu id="ccPanelMenuID" mode="client">
- <rich:panelMenuGroup label="group1">
- <rich:panelMenuGroup label="group1 1">
- <rich:panelMenuItem label="Item 1 1"></rich:panelMenuItem>
- <rich:panelMenuItem label="Item 1 2"></rich:panelMenuItem>
+ <ui:remove>
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
+ <rich:panelMenu id="ccPanelMenuID" mode="client">
+ <rich:panelMenuGroup label="group1">
+ <rich:panelMenuGroup label="group1 1">
+ <rich:panelMenuItem label="Item 1 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1 2"></rich:panelMenuItem>
+ </rich:panelMenuGroup>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
- </rich:panelMenuGroup>
- </rich:panelMenu>
+ </rich:panelMenu>
+
+ <rich:componentControl attachTo="testPMID" for="ccPanelMenuID" event="onclick" operation="doCollapse" />
+
+ <a href="#" id="testPMID" onclick="return false;">Click text</a>
+ </ui:remove>
- <rich:componentControl attachTo="testPMID" for="ccPanelMenuID" event="onclick" operation="doCollapse"/>
-
- <a href="#" id="testPMID" onclick="return false;">Click text</a>
- <f:verbatim><br/><br/></f:verbatim>
-
- <rich:componentControl attachTo="testCID" for="cc" event="onclick" operation="doExpand" params="show:'componentControl work(show)'"/>
- <rich:calendar popup="true" id="cc"/>
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
-
- <a href="#" id="testCID">Click text</a>
- <f:verbatim><br/><br/></f:verbatim>
- <a onclick="$('componentControlSubviewID:_id0:cc').component.doExpand()" href="#">Show</a>
-
- <rich:panelMenu id="ccPanelMenu">
- <h:outputText value="click text" />
+ <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" />
+ <h:panelGrid columns="2">
+ <h:outputText value="popup calendar" />
+ <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" />
+ </h:panelGrid>
+
+ <f:verbatim>
+ <br />
+ <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a>
+ <br />
+ <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a>
+ <br />
+ <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a>
+ <br />
+ <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a>
+ <br />
+ <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a>
+ <br />
+ <a href="#" id="doTodayCalendarID">Calendar (today)</a>
+ </f:verbatim>
+
+ <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" />
+ <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" />
+ <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" />
+ <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" />
+ <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" />
+ <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" />
+
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
+ <rich:panelMenu id="ccContextMenuPanelMenuID">
+ <h:outputText value="click text" />
</rich:panelMenu>
-
- <rich:contextMenu id="ccContextMenu" submitMode="ajax">
+
+ <rich:contextMenu id="ccContextMenuID" submitMode="ajax">
<rich:menuItem icon="/pics/header.png" value="tab1" reRender="cmInfoID">
<f:param name="cmdParam" value="menu" />
</rich:menuItem>
@@ -57,6 +99,6 @@
<f:param name="cmdParam" value="c" />
</rich:menuItem>
</rich:contextMenu>
- <rich:componentControl event="oncontextmenu" attachTo="ccPanelMenu" for="ccContextMenu" operation="doShow"/>
+ <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="doShow" />
</h:form>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -186,7 +186,7 @@
<f:verbatim>dragSupport</f:verbatim>
</h:panelGrid>
- <a4j:status startText="...request..." stopText="stop" />
+ <a4j:status id="adf" startText="...request..." stopText="stop" />
<a4j:outputPanel ajaxRendered="true">
<h:messages />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -5,8 +5,8 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:rich="http://richfaces.org/rich"
xmlns:a4j="http://richfaces.org/a4j">
- <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick=""
- ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')"
+ <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="print('onclickInputID', 'onclick work!')"
+ ondblclick="print('ondblclickInputID', 'ondblclick work!')"
onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')"
onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')"
onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')"
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -13,6 +13,7 @@
listsHeight="#{listShuttle.listsHeight}" sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}"
targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}">
+
<h:column width="100px">
<f:facet name="header">
<h:outputText value="Number" />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -21,5 +21,17 @@
</rich:modalPanel>
<a onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a>
+
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+
<h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('MPid');" />
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+ <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div>
+
</f:subview>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -6,6 +6,53 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property">
<h:panelGrid columns="2">
+ <h:outputText value="shadowDepth" />
+ <h:inputText value="#{modalPanel.shadowDepth}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="shadowOpacity" />
+ <h:inputText value="#{modalPanel.shadowOpacity}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="keepVisualState" />
+ <h:selectBooleanCheckbox value="#{modalPanel.keepVisualState}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="left" />
+ <h:inputText value="#{modalPanel.left}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="top" />
+ <h:inputText value="#{modalPanel.top}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox value="#{modalPanel.rendered}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="showWhenRendered" />
+ <h:selectBooleanCheckbox value="#{modalPanel.showWhenRendered}" >
+ <a4j:support event="onchange" action="suport();"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="zindex" />
+ <h:selectOneRadio value="#{modalPanel.zindex}">
+ <f:selectItem itemLabel="1" itemValue="1" />
+ <f:selectItem itemLabel="3" itemValue="3" />
+ <a4j:support event="onchange" action="suport();"></a4j:support>
+ </h:selectOneRadio>
+
+ <h:outputText value="autosized" />
+ <h:selectBooleanCheckbox value="#{modalPanel.autosized}" >
+ <a4j:support event="onchange" action="suport();"></a4j:support>
+ </h:selectBooleanCheckbox>
+
<h:outputText value="Width:" />
<h:inputText value="#{modalPanel.width}">
<a4j:support event="onchange" reRender="MPid"></a4j:support>
@@ -35,6 +82,21 @@
<h:selectBooleanCheckbox value="#{modalPanel.moveable}">
<a4j:support event="onclick" reRender="MPid"></a4j:support>
</h:selectBooleanCheckbox>
+
+ <h:outputText value="immediate" />
+ <h:selectBooleanCheckbox value="#{modalPanel.immediate}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="required" />
+ <h:selectBooleanCheckbox value="#{modalPanel.required}" >
+ <a4j:support event="onchange" action="suport();"></a4j:support>
+ </h:selectBooleanCheckbox>
+
+ <h:outputText value="requiredMessage" />
+ <h:inputText value="#{modalPanel.requiredMessage}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
</h:panelGrid>
</rich:simpleTogglePanel>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -6,7 +6,7 @@
mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')"
ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')"
onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')"
- onLoadMap="print('onLoadMapInputID', 'onLoadMap work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')"
+ onmousedown="print('onmousedownInputID', 'onmousedown work!')"
onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')"
onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/>
Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml (rev 0)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>componentControl</managed-bean-name>
+ <managed-bean-class>componentControl.ComponentControl</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -46,7 +46,7 @@
/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,
/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,
/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,
- /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml</param-value>
+ /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-12-05 18:56:15 UTC (rev 4513)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-12-05 20:18:32 UTC (rev 4514)
@@ -30,6 +30,7 @@
<h:outputText value="Select component:" />
<h:selectOneMenu value="#{richBean.src}" onchange="submit();">
<f:selectItem itemValue="Blank" itemLabel="Blank" />
+ <f:selectItem itemValue="ComponentControl" itemLabel="ComponentControl" />
<f:selectItem itemValue="OrderingList" itemLabel="OrderingList" />
<f:selectItem itemValue="ListShuttle" itemLabel="ListShuttle" />
<f:selectItem itemValue="ContextMenu" itemLabel="ContextMenu" />
18 years, 5 months
JBoss Rich Faces SVN: r4513 - in branches/3.1.x/ui/orderingList/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-05 13:56:15 -0500 (Wed, 05 Dec 2007)
New Revision: 4513
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
Ordering list: caption fixed.
Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-05 18:14:33 UTC (rev 4512)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-05 18:56:15 UTC (rev 4513)
@@ -450,4 +450,15 @@
return string;
}
}
+
+ public String getCaptionDisplay(FacesContext context, UIComponent component) {
+ Object caption = component.getAttributes().get(OrderingComponentControlsHelper.ATTRIBUTE_CAPTION_LABEL);
+ UIComponent facet = component.getFacet(OrderingComponentControlsHelper.FACET_CAPTION);
+
+ if ((null != caption && !"".equals(caption)) ||
+ (null != facet && facet.isRendered())) {
+ return "";
+ }
+ return "display: none;";
+ }
}
Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-12-05 18:14:33 UTC (rev 4512)
+++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-12-05 18:56:15 UTC (rev 4513)
@@ -34,7 +34,7 @@
<table id="#{clientId}table" cellpadding="0" cellspacing="0" class="rich-ordering-list-body">
<tbody>
- <tr>
+ <tr style="#{this:getCaptionDisplay(context, component)}" >
<td align="left" colspan="2" class="rich-ordering-list-caption">
<f:call name="encodeCaption"/>
</td>
18 years, 5 months
JBoss Rich Faces SVN: r4512 - in branches/3.1.x/ui/listShuttle/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-05 13:14:33 -0500 (Wed, 05 Dec 2007)
New Revision: 4512
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
Log:
List shuttle skinning.
http://jira.jboss.com/jira/browse/RF-1179
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-05 17:38:26 UTC (rev 4511)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-05 18:14:33 UTC (rev 4512)
@@ -5,20 +5,10 @@
<f:verbatim><![CDATA[
-.shuttle_button {
- background: none repeat scroll 0%;
- border: 1px solid;
- cursor: pointer;
- margin-bottom: 3px;
- padding: 1px;
+.rich-shuttle-controls {
+ padding : 15px 8px 15px 0px;
}
-.shuttle_button_layout{padding : 15px 8px 15px 0px;}
-.shuttle_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 1px}
-.shuttle_button_press{background : #4A75B5; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 2px 0px 0px 2px}
-.shuttle_center_button_col_valign{vertical-align : middle}
-.shuttle_right_button_col_valign{vertical-align : middle}
-
.rich-shuttle-list-content {
overflow: auto;
}
@@ -31,35 +21,10 @@
padding : 0px 2px;
}
-.rich-shuttle-internal-header-tab .ol_endcol {
- border-right : 0px;
- white-space: nowrap;
- width:100%;
-}
-
.rich-shuttle-internal-tab {
width:100%;
}
-.rich-shuttle-internal-tab .ol_endcol{border-right : 0px;}
-
-.rich-shuttle-internal-tab tr.ol_select{background : #EAF0F8}
-
-.rich-shuttle-internal-tab tr.ol_active {
- background : #EAF0F8; color : #4A75B5;
-}
-
-.rich-shuttle-internal-tab tr.ol_active td{
- color : #4A75B5;
-}
-
-.ol_control_shown {
- display: block;
-}
-.ol_control_hidden {
- display: none;
-}
-
.body {
-moz-user-select: none;
}
@@ -79,84 +44,12 @@
<u:style name="border" value="0"/>
<u:style name="white-space" value="nowrap"/>
</u:selector>
-<u:selector name=".ol_control_bn_up">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconUp" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_down">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconDown" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_top">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconTop" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_bottom">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconBottom" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_up">
- <u:style name="disabled" value="true"/>
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconUpDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_down">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconDownDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_top">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconTopDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_bottom">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".shuttle_button">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
- </u:style>
- <u:style name="background-color" skin="headerBackgroundColor" />
-</u:selector>
-
-<u:selector name=".shuttle_button_press">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient" />
- </u:style>
- <u:style name="background-color" skin="headerBackgroundColor" />
-</u:selector>
-
-<u:selector name=".rich-shuttle-internal-tab tr.ol_select">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
- </u:style>
- <u:style name="background-color" skin="additionalBackgroundColor" />
-</u:selector>
-
-<u:selector name=".rich-shuttle-internal-tab tr.ol_active">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
- </u:style>
- <u:style name="background-color" skin="additionalBackgroundColor" />
-</u:selector>
-
-
-
-<!-- Ordering List copied -->
-
<f:verbatim><![CDATA[
-.rich-shuttle-control-disabled, .rich-shuttle-control-top, .rich-shuttle-control-bottom, .rich-shuttle-control-up, .rich-shuttle-control-down,
-.rich-shuttle-control-copyall, .rich-shuttle-control-copy, .rich-shuttle-control-remove, .rich-shuttle-control-removeall {
+.rich-shuttle-control-disabled, .rich-shuttle-control-top, .rich-shuttle-control-bottom,
+.rich-shuttle-control-up, .rich-shuttle-control-down, .rich-shuttle-control-copyall,
+.rich-shuttle-control-copy, .rich-shuttle-control-remove, .rich-shuttle-control-removeall {
border : 1px solid;
margin-bottom : 3px;
}
@@ -214,25 +107,6 @@
padding: 3px 3px 3px 0px;
}
-.rich-ordering-list-body {
- border : 0px solid;
-}
-
-.rich-ordering-list-output {
- border : 1px solid;
- margin : 0px 8px 8px 8px;
- background: none repeat scroll 0% 50%;
-}
-
-.rich-ordering-list-content {
- overflow: auto;
-}
-
-.rich-ordering-list-header {
- overflow: hidden;
- height: 18px;
-}
-
.rich-shuttle-source-items {
margin: 0px 8px 8px;
}
@@ -241,15 +115,6 @@
margin: 0px 8px 8px 0px;
}
-.rich-ordering-list-active {
- background : repeat scroll left top;
- width: 100%;
-}
-
-.rich-ordering-list-disabled {
- background : repeat scroll left top;
-}
-
.rich-shuttle-source-row-active, .rich-shuttle-target-row-active {
background : transparent none repeat-x scroll left top;
}
@@ -258,31 +123,19 @@
background : transparent none repeat-x scroll left top;
}
-.rich-ordering-list-table-header-cell {
- background : none top left repeat-x;
- border-style: solid;
- padding : 2px;
-}
-
.rich-shuttle-header-tab-cell-end {
border-right : 0px;
white-space: nowrap;
padding : 2px;
}
-.rich-ordering-list-cell-end {
- border-right : 0px;
- white-space: nowrap;
- padding : 2px;
-}
-
.rich-shuttle-source-cell, .rich-shuttle-target-cell {
padding : 2px;
white-space: nowrap;
}
.rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected * {
- padding : 2px;
+ padding : 2px 0px;
white-space: nowrap;
}
@@ -292,19 +145,6 @@
border-bottom: 1px dotted gray;
}
-.rich-ordering-list-ds {
- -moz-user-select: -moz-none;
-}
-
-.rich-ordering-list-fk {
- width: 1px;
- position: absolute;
- left: -32767px;
-}
-
-.rich-ordering-list-ds input {
- -moz-user-select: text;
-}
]]>
</f:verbatim>
@@ -375,22 +215,6 @@
<u:style name="color" skin="generalTextColor"/>
</u:selector>
- <u:selector name=".rich-ordering-list-table-header-cell">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
- </u:style>
- <u:style name="background-color" skin="headerBackgroundColor" />
- <u:style name="color" skin="headerTextColor" />
- <u:style name="font-family" skin="headerFamilyFont" />
- <u:style name="font-size" skin="headerSizeFont" />
- <u:style name="font-weight" skin="headerWeightFont" />
- <u:style name="border-width" skin="tableBorderWidth" />
- <u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="tableBorderColor" />
- <u:style name="border-right-color" skin="tableBorderColor" />
- <u:style name="border-left-color" skin="panelBorderColor" />
- </u:selector>
-
<u:selector name=".rich-shuttle-header-tab-cell-end">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
@@ -402,11 +226,6 @@
<u:style name="font-weight" skin="headerWeightFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-cell-end">
- <u:style name="font-family" skin="generalFamilyFont" />
- <u:style name="font-size" skin="generalSizeFont" />
- </u:selector>
-
<u:selector name=".rich-shuttle-source-items, .rich-shuttle-target-items">
<u:style name="background-color" skin="generalBackgroundColor" />
<u:style name="border-color" skin="panelBorderColor" />
@@ -415,17 +234,6 @@
<u:style name="overflow" value="auto" />
</u:selector>
- <u:selector name=".rich-ordering-list-output">
- <u:style name="background-color" skin="generalBackgroundColor" />
- <u:style name="border-color" skin="panelBorderColor" />
- </u:selector>
-
- <u:selector name=".rich-ordering-list-cell, .rich-ordering-list-cell *">
- <u:style name="color" skin="generalTextColor"/>
- <u:style name="font-family" skin="generalFamilyFont" />
- <u:style name="font-size" skin="generalSizeFont" />
- </u:selector>
-
<u:selector name=".rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected *">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-family" skin="generalFamilyFont" />
Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-05 17:38:26 UTC (rev 4511)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-05 18:14:33 UTC (rev 4512)
@@ -106,7 +106,7 @@
</div>
</td>
<td>
- <div class="shuttle_button_layout">
+ <div class="rich-shuttle-controls">
<jsp:scriptlet><![CDATA[
encodeShuttleControlsFacets(context, component, sourceSelectionState, targetSelectionState);
]]></jsp:scriptlet>
@@ -164,8 +164,8 @@
</table>
</div>
</td>
- <td class="ol_center_button_col_valign">
- <div class="shuttle_button_layout rich-orderingcontrols">
+ <td>
+ <div class="rich-shuttle-controls">
<jsp:scriptlet><![CDATA[
encodeTLControlsFacets(context, component, targetSelectionState);
]]></jsp:scriptlet>
18 years, 5 months
JBoss Rich Faces SVN: r4511 - branches/3.1.x/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: vkorluzhenko
Date: 2007-12-05 12:38:26 -0500 (Wed, 05 Dec 2007)
New Revision: 4511
Modified:
branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml
Log:
http://jira.jboss.com/jira/browse/RF-1184 - improved description
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml 2007-12-05 17:37:40 UTC (rev 4510)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml 2007-12-05 17:38:26 UTC (rev 4511)
@@ -19,7 +19,6 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <!--listitem>Skinnable <property>ordering list</property> and child items</listitem-->
<listitem>Highly customizable look and feel</listitem>
<listitem>Reordering and sorting possibilities for list items</listitem>
<!--listitem>Customizable component layout (captions, headers, list items and ordering control set)</listitem-->
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml 2007-12-05 17:37:40 UTC (rev 4510)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml 2007-12-05 17:38:26 UTC (rev 4511)
@@ -361,72 +361,72 @@
<thead>
<row>
<entry>Function</entry>
- <entry>Description</entry><!--entry>Element</entry-->
+ <entry>Description</entry>
</row>
</thead>
<tbody>
<!--Sorting API -->
<row>
<entry>doSortAscending()</entry>
- <entry>Sorts items in the list ascending</entry><!--entry>Component</entry-->
+ <entry>Sorts items in the list ascending</entry>
</row>
<row>
<entry>doSortDescending()</entry>
- <entry>Sorts items in the list descending</entry><!--entry>Component</entry-->
+ <entry>Sorts items in the list descending</entry>
</row>
<row>
<entry>doSort()</entry>
- <entry>Inverts current sorting</entry><!--entry>Component</entry-->
+ <entry>Inverts current sorting</entry>
</row>
<!--Controls common API -->
<row>
<entry>doHide()</entry>
- <entry>Hides ordering control</entry><!--entry>Any Ordering control</entry-->
+ <entry>Hides ordering control</entry>
</row>
<row>
<entry>doShow()</entry>
- <entry>Shows ordering control</entry><!--entry>Any Ordering control</entry-->
+ <entry>Shows ordering control</entry>
</row>
<row>
<entry>isShown()</entry>
- <entry>Checks if current control is shown</entry><!--entry>Any Ordering control</entry-->
+ <entry>Checks if current control is shown</entry>
</row>
<row>
<entry>doEnable()</entry>
- <entry>Enables ordering control</entry><!--entry>Any Ordering control</entry-->
+ <entry>Enables ordering control</entry>
</row>
<row>
<entry>doDisable()</entry>
- <entry>Disables ordering control</entry><!--entry>Any Ordering control</entry-->
+ <entry>Disables ordering control</entry>
</row>
<row>
<entry>isEnabled()</entry>
- <entry>Checksif current control is enabled</entry><!--entry>Any Ordering control</entry-->
+ <entry>Checksif current control is enabled</entry>
</row>
<!--List managing API -->
<row>
<entry>moveUp()</entry>
- <entry>Moves up selected item in the list</entry><!--entry>Any Item</entry-->
+ <entry>Moves up selected item in the list</entry>
</row>
<row>
<entry>moveDown()</entry>
- <entry>Moves down selected item in the list</entry><!--entry>Any Item</entry-->
+ <entry>Moves down selected item in the list</entry>
</row>
<row>
<entry>moveTop()</entry>
- <entry>Moves top selected item in the list</entry><!--entry>Any Item</entry-->
+ <entry>Moves top selected item in the list</entry>
</row>
<row>
<entry>moveBottom()</entry>
- <entry>Moves bottom selected item in the list</entry><!--entry>Any Item</entry-->
+ <entry>Moves bottom selected item in the list</entry>
</row>
<row>
<entry>getSelection()</entry>
- <entry>Returns currently selected item</entry><!--entry>Any Item</entry-->
+ <entry>Returns currently selected item</entry>
</row>
<row>
<entry>getItems()</entry>
- <entry>Returns the collection of all items</entry><!--entry>Any Item</entry-->
+ <entry>Returns the collection of all items</entry>
</row>
</tbody>
</tgroup>
18 years, 5 months
JBoss Rich Faces SVN: r4510 - branches/3.1.x/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: vkorluzhenko
Date: 2007-12-05 12:37:40 -0500 (Wed, 05 Dec 2007)
New Revision: 4510
Modified:
branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
Log:
http://jira.jboss.com/jira/browse/RF-1174 - improved description
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml 2007-12-05 17:35:26 UTC (rev 4509)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml 2007-12-05 17:37:40 UTC (rev 4510)
@@ -20,10 +20,10 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Skinnable <property>listShuttle</property> and child items</listitem>
- <listitem>Customizable component layout (captions, headers, list items and control sets)</listitem>
- <listitem>Disabled/enabled ordering controls</listitem>
- <listitem> Built-In Drag-and-Drop support</listitem>
+ <listitem>Highly customizable look and feel</listitem>
+ <listitem>Reordering and sorting possibilities for lists items</listitem>
+ <listitem>Multiple selection of lists items</listitem>
+ <!--listitem> Built-In Drag-and-Drop support</listitem-->
</itemizedlist>
</section>
</section>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-05 17:35:26 UTC (rev 4509)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-05 17:37:40 UTC (rev 4510)
@@ -38,13 +38,14 @@
<para>The <emphasis role="bold">
<property><rich:listShuttle></property>
</emphasis> component consists of the following parts: <itemizedlist>
- <listitem>two <property>item lists</property> (source and target). List consists of items; each item has
- three different representations: common, selected, active</listitem>
- <listitem>optional <property>caption</property>, <property>header</property> (sorted and non-sorted), <property>footer</property> elements</listitem>
- <listitem><property>copy/moving controls set</property>, a set of controls, which performs moving/copying
- items between lists</listitem>
- <listitem><property>optional ordering controls set</property>, a set of controls that performs
- reordering</listitem>
+ <listitem>two <property>item lists</property> (source and target). List consists of
+ items. Each item has three different representations: common, selected, active</listitem>
+ <listitem>optional <property>caption</property>, <property>header</property> (sorted
+ and non-sorted), <property>footer</property> elements</listitem>
+ <listitem><property>copy/moving controls set</property>is a set of controls, which
+ performs moving/copying items between lists</listitem>
+ <listitem><property>optional ordering controls set</property>is a set of controls
+ that performs reordering</listitem>
</itemizedlist>
</para>
<para>The <emphasis role="bold">
@@ -156,34 +157,28 @@
<property>"removeAll_disabled" </property>
</emphasis> facets are used to replaces the default control with facets content. </para>
<!-- attributes -->
- <para> The
- <emphasis><property>"sourceValue"
- </property></emphasis> attribute defines the collection to be shown in source list.</para>
- <para>The
- <emphasis><property>"value"
- </property></emphasis> attribute defines the collection to store the value from target list.</para>
- <para> The
- <emphasis><property>"var"
- </property></emphasis> could be shared between both collections to defined lists on the page.</para>
- <para>Controls rendering is based on the
- <emphasis><property>"controlsType"
- </property></emphasis> attribute. Possible types are <property>button</property> and <property>none</property>.</para> The position of the
- <property>ordering controls set</property> relatively to list should be customized with
- <emphasis><property>"orderControlsVerticalAlign"
- </property></emphasis> attribute. The position of the <property>move/copy controls set</property>
- relatively to lists should be customized with
- <emphasis><property>"moveControlsVerticalAlign"
- </property></emphasis> attribute.
-
- <!-- template -->
-
- <para>The <emphasis role="bold">
+ <para> The <emphasis>
+ <property>"sourceValue" </property>
+ </emphasis> attribute defines the collection to be shown in source list.</para>
+ <para>The <emphasis>
+ <property>"value" </property>
+ </emphasis> attribute defines the collection to store the value from target list.</para>
+ <para> The <emphasis>
+ <property>"var" </property>
+ </emphasis> could be shared between both collections to defined lists on the page.</para>
+ <para>Controls rendering is based on the <emphasis>
+ <property>"controlsType" </property>
+ </emphasis> attribute. Possible types are <property>button</property> and
+ <property>none</property>.</para>
+ <!-- template wiil be done in 3.2.0 -->
+ <!--para>The <emphasis role="bold">
<property><rich:listShuttle></property>
</emphasis> component provides the possibility to be customized using templating. The
customization could be performed by layout definition nested to component.</para>
<para>10 elements could be provided to be defined inside template (all standard controls
- should also possible to use inside): {sourceList}, {targetList}, {CopyControl}, {removeCotrol},
- {copyAllControl}, {removeAllControl}, {topcontrol}, {bottomControl}, {downCotrol}, {upControl}.</para>
+ should also possible to use inside): {sourceList}, {targetList}, {CopyControl},
+ {removeCotrol}, {copyAllControl}, {removeAllControl}, {topcontrol}, {bottomControl},
+ {downCotrol}, {upControl}.</para>
<para>The markup defined in the initial picture could be defined as in the following
example.</para>
<para>
@@ -210,7 +205,7 @@
</h:panelGrid>
</rich:listShuttle>
...
-]]></programlisting>
+]]></programlisting-->
<table>
<title>Keyboard usage for elements selection</title>
<tgroup cols="2">
@@ -224,11 +219,12 @@
<!--Sorting API -->
<row>
<entry>CTRL+click</entry>
- <entry>Described in selection behaviour requirement</entry>
+ <entry>Inverts selection for an item</entry>
</row>
<row>
<entry>SHIFT+click</entry>
- <entry>Described in selection behaviour requirement</entry>
+ <entry>Selects all rows from active one to a clicked row if they differ,
+ else select the actve row. All other selections are cleared</entry>
</row>
<row>
<entry>CTRL+A</entry>
@@ -241,7 +237,7 @@
</row>
<row>
<entry>Up, Down arrows</entry>
- <entry>Change the active element to the next or previous in a list and make
+ <entry>Changes the active element to the next or previous in a list and make
it the only selected. Scroll should follow the selection to keep it
visible</entry>
</row>
@@ -281,9 +277,7 @@
</section>
<section>
<title>JavaScript API</title>
- <para> Controls are accessible for developer on client-side using controls attribute of
- JavaScript component instance. The value of the attribute is an associative array of
- controls keyed by the following strings: <property>top</property>, <property>up</property>, <property>down</property>, <property>bottom</property>.</para>
+
<table>
<title>JavaScript API</title>
<tgroup cols="3">
@@ -291,107 +285,87 @@
<row>
<entry>Function</entry>
<entry>Description</entry>
- <entry>Element</entry>
</row>
</thead>
<tbody>
<!--Sorting API -->
<row>
<entry>doSortAscending()</entry>
- <entry>Sort items in the list ascending</entry>
- <entry>Component</entry>
+ <entry>Sorts items in the list ascending</entry>
</row>
<row>
<entry>doSortDescending()</entry>
- <entry>Sort items in the list descending</entry>
- <entry>Component</entry>
+ <entry>Sorts items in the list descending</entry>
</row>
<row>
<entry>doSort()</entry>
- <entry>Invert current sorting</entry>
- <entry>Component</entry>
+ <entry>Inverts current sorting</entry>
</row>
<!--Controls common API -->
<row>
<entry>doHide()</entry>
- <entry>Hide ordering control</entry>
- <entry>Any Ordering control</entry>
+ <entry>Hides ordering control</entry>
</row>
<row>
<entry>doShow()</entry>
- <entry>Show ordering control</entry>
- <entry>Any Ordering control</entry>
+ <entry>Shows ordering control</entry>
</row>
<row>
<entry>isShown()</entry>
- <entry>Check if current control is shown</entry>
- <entry>Any Ordering control</entry>
+ <entry>Checks if current control is shown</entry>
</row>
<row>
<entry>doEnable()</entry>
- <entry>Enable ordering control</entry>
- <entry>Any Ordering control</entry>
+ <entry>Enables ordering control</entry>
</row>
<row>
<entry>doDisable()</entry>
- <entry>Disable ordering control</entry>
- <entry>Any Ordering control</entry>
+ <entry>Disables ordering control</entry>
</row>
<row>
<entry>isEnabled()</entry>
- <entry>Check if current control is enabled</entry>
- <entry>Any Ordering control</entry>
+ <entry>Checks if current control is enabled</entry>
</row>
<!--List managing API -->
<row>
<entry>moveUp()</entry>
- <entry>Move up selected item in the list</entry>
- <entry>Any Item</entry>
+ <entry>Moves up selected item in the list</entry>
</row>
<row>
<entry>moveDown()</entry>
- <entry>Move down selected item in the list</entry>
- <entry>Any Item</entry>
+ <entry>Moves down selected item in the list</entry>
</row>
<row>
<entry>moveTop()</entry>
- <entry>Move top selected item in the list</entry>
- <entry>Any Item</entry>
+ <entry>Moves top selected item in the list</entry>
</row>
<row>
<entry>moveBottom()</entry>
- <entry>Move bottom selected item in the list</entry>
- <entry>Any Item</entry>
+ <entry>Moves bottom selected item in the list</entry>
</row>
<row>
<entry>copy()</entry>
- <entry>Copy selected item from the source list to the target list</entry>
- <entry>Any Item</entry>
+ <entry>Copies selected item from the source list to the target list</entry>
</row>
<row>
<entry>remove()</entry>
- <entry>Remove selected item from the target list to the source list</entry>
- <entry>Any Item</entry>
+ <entry>Removes selected item from the target list to the source list</entry>
</row>
<row>
<entry>copyAll()</entry>
- <entry>Copy all items from the source list to the target list</entry>
- <entry>Any Item</entry>
+ <entry>Copies all items from the source list to the target list</entry>
</row>
<row>
<entry>removeAll()</entry>
- <entry>Remove all items from the target list to the source list</entry>
- <entry>Any Item</entry>
+ <entry>Removes all items from the target list to the source list</entry>
</row>
<row>
<entry>getSelection()</entry>
- <entry>Return currently selected item</entry>
- <entry>Any Item</entry>
+ <entry>Returns currently selected item</entry>
</row>
<row>
<entry>getItems()</entry>
- <entry>Return the collection of all items</entry>
- <entry>Any Item</entry>
+ <entry>Returns the collection of all items</entry>
</row>
</tbody>
</tgroup>
18 years, 5 months
JBoss Rich Faces SVN: r4509 - in management/design: control and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2007-12-05 12:35:26 -0500 (Wed, 05 Dec 2007)
New Revision: 4509
Added:
management/design/control/
management/design/control/Func Spec Control.doc
management/design/control/control Vision.doc
Log:
spec and vision on control component
Added: management/design/control/Func Spec Control.doc
===================================================================
(Binary files differ)
Property changes on: management/design/control/Func Spec Control.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/control/control Vision.doc
===================================================================
(Binary files differ)
Property changes on: management/design/control/control Vision.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 5 months
JBoss Rich Faces SVN: r4508 - in branches/3.1.x/ui: orderingList/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-05 12:19:27 -0500 (Wed, 05 Dec 2007)
New Revision: 4508
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
Log:
List shuttle skinning. Not finished.
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-05 16:40:19 UTC (rev 4507)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-05 17:19:27 UTC (rev 4508)
@@ -22,6 +22,40 @@
this.controlList = new Array();
this.initControlList(clientId, controlIds);
+
+ this.sourceList.CLASSES = {
+ ROW : {
+ ACTIVE : "rich-shuttle-source-row-active",
+ SELECTED : "rich-shuttle-source-row-selected",
+ ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
+ DISABLED : "rich-shuttle-source-row-disabled",
+ NORMAL : "rich-shuttle-source-row"
+ },
+ CELL : {
+ ACTIVE : "rich-shuttle-source-cell-active",
+ SELECTED : "rich-shuttle-source-cell-selected",
+ ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
+ DISABLED : "rich-shuttle-source-cell-disabled",
+ NORMAL : "rich-shuttle-source-cell"
+ }
+ };
+
+ this.targetList.CLASSES = {
+ ROW : {
+ ACTIVE : "rich-shuttle-target-row-active",
+ SELECTED : "rich-shuttle-target-row-selected",
+ ACTIVE_SELECTED : "rich-shuttle-target-row-selected rich-shuttle-target-row-active",
+ DISABLED : "rich-shuttle-target-row-disabled",
+ NORMAL : "rich-shuttle-target-row"
+ },
+ CELL : {
+ ACTIVE : "rich-shuttle-target-cell-active",
+ SELECTED : "rich-shuttle-target-cell-selected",
+ ACTIVE_SELECTED : "rich-shuttle-target-cell-selected rich-shuttle-target-cell-active",
+ DISABLED : "rich-shuttle-target-cell-disabled",
+ NORMAL : "rich-shuttle-target-cell"
+ }
+ };
},
initControlList : function(clientId, ids) {
@@ -71,25 +105,7 @@
}
}
},
-
- /*addItems : function(component, items) {
- var componentItems = list.shuttleItems;
-
- for (var item in items) {
- var newItem = Object.clone(item);
- collection.push(newItem);
- }
- },
- removeItems : function(component, items) {
- var componentItems = component.shuttleItems;
- var componentSelectedItems = component.selectedItems;
-
- for (var item in items) {
- targetCollection.remove(item);
- }
- }*/
-
moveItems : function(sourceComponent, targetComponent, items) {
if (items.length > 0) {
var length = items.length;
@@ -122,7 +138,7 @@
addItem : function(component, item) {
//var newItem = Object.clone(item);
- Richfaces.SelectItems.doNormal(item._node);
+ Richfaces.SelectItems.doNormal(item._node, component.CLASSES);
component.shuttleTbody.insertBefore(item._node, null);
component.shuttleItems.push(item);
},
@@ -145,20 +161,3 @@
remove: function (e) { this.moveItems(this.targetList, this.sourceList, this.targetList.selectedItems); return false; },
removeAll: function (e) { this.moveItems(this.targetList, this.sourceList, this.targetList.shuttleItems); return false; }
};
-
-Richfaces.SelectItems.CLASSES = {
- ROW : {
- ACTIVE : "rich-shuttle-source-row-active",
- SELECTED : "rich-shuttle-source-row-selected",
- ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
- DISABLED : "rich-shuttle-source-row-disabled",
- NORMAL : "rich-shuttle-source-row"
- },
- CELL : {
- ACTIVE : "rich-shuttle-source-cell-active",
- SELECTED : "rich-shuttle-source-cell-selected",
- ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
- DISABLED : "rich-shuttle-source-cell-disabled",
- NORMAL : "rich-shuttle-source-cell"
- }
-};
\ No newline at end of file
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-05 16:40:19 UTC (rev 4507)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-05 17:19:27 UTC (rev 4508)
@@ -32,6 +32,23 @@
Richfaces.ListBase.CONTROL_SET = ["A", "INPUT", "TEXTAREA", "SELECT", "OPTION", "BUTTON"];
Richfaces.ListBase.prototype = {
+ CLASSES : {
+ ROW : {
+ ACTIVE : "rich-ordering-list-row-active",
+ SELECTED : "rich-ordering-list-row-selected",
+ ACTIVE_SELECTED : "rich-ordering-list-row-selected rich-ordering-list-row-active",
+ DISABLED : "rich-ordering-list-row-disabled",
+ NORMAL : "rich-ordering-list-row"
+ },
+ CELL : {
+ ACTIVE : "rich-ordering-list-cell-active",
+ SELECTED : "rich-ordering-list-cell-selected",
+ ACTIVE_SELECTED : "rich-ordering-list-cell-selected rich-ordering-list-cell-active",
+ DISABLED : "rich-ordering-list-cell-disabled",
+ NORMAL : "rich-ordering-list-cell"
+ }
+ },
+
initialize : function(containerId, contentTableId, headerTableId, focusKeeperId,
onclickControlId) {
this.selectedItems = new Array();
@@ -69,11 +86,11 @@
id = row.id.split(containerId + ":")[1];
this.shuttleItems[i]
= new Richfaces.SelectItem(null, (id || i),
- ((Richfaces.SelectItems.isSelected(row)) ? true : false), row);
- if (Richfaces.SelectItems.isSelected(row)) {
+ ((Richfaces.SelectItems.isSelected(row, this.CLASSES)) ? true : false), row);
+ if (Richfaces.SelectItems.isSelected(row, this.CLASSES)) {
this.selectedItems.push(row);
}
- if (Richfaces.SelectItems.isActive(row)) {
+ if (Richfaces.SelectItems.isActive(row, this.CLASSES)) {
this.activeItem = row;
}
}
@@ -143,7 +160,7 @@
}
- Richfaces.SelectItems.doActive(this.activeItem);
+ Richfaces.SelectItems.doActive(this.activeItem, this.CLASSES);
this.setFocus();
this.saveState();
@@ -169,7 +186,7 @@
this.selectAll();
Event.stop(event);
}
- Richfaces.SelectItems.doActive(this.activeItem);
+ Richfaces.SelectItems.doActive(this.activeItem, this.CLASSES);
this.saveState();
break;
}
@@ -193,8 +210,8 @@
changeActiveItems : function(newItem, item) {
this.resetMarked();
- Richfaces.SelectItems.doSelect(newItem);
- Richfaces.SelectItems.doActive(newItem);
+ Richfaces.SelectItems.doSelect(newItem, this.CLASSES);
+ Richfaces.SelectItems.doActive(newItem, this.CLASSES);
this.activeItem = newItem;
this.selectedItems.push(newItem);
},
@@ -220,10 +237,10 @@
markedItem._selected = true;
this.selectedItems[0] = markedShuttleItem;
}*/
- if (Richfaces.SelectItems.isSelected(activeItem)) {
+ if (Richfaces.SelectItems.isSelected(activeItem, this.CLASSES)) {
Richfaces.SelectItems.doNormal(activeItem);
} else {
- Richfaces.SelectItems.doSelect(activeItem);
+ Richfaces.SelectItems.doSelect(activeItem, this.CLASSES);
this.selectedItems[0] = markedShuttleItem; //TODO: delete
}
//}
@@ -244,20 +261,20 @@
this.selectedItems.push(markedShuttleItem);
}*/
- if (Richfaces.SelectItems.isSelected(activeItem)) {
+ if (Richfaces.SelectItems.isSelected(activeItem, this.CLASSES)) {
this.selectedItems.remove(markedShuttleItem); //TODO :delete
- Richfaces.SelectItems.doNormal(activeItem);
+ Richfaces.SelectItems.doNormal(activeItem, this.CLASSES);
} else {
- Richfaces.SelectItems.doSelect(activeItem);
+ Richfaces.SelectItems.doSelect(activeItem, this.CLASSES);
this.selectedItems.push(markedShuttleItem); //TODO :delete
}
if ((this.activeItem != null) && (this.activeItem.rowIndex != activeItem.rowIndex)) {
//reset activity of an element
- if (Richfaces.SelectItems.isSelected(this.activeItem)) {
- Richfaces.SelectItems.doSelect(this.activeItem);
+ if (Richfaces.SelectItems.isSelected(this.activeItem, this.CLASSES)) {
+ Richfaces.SelectItems.doSelect(this.activeItem, this.CLASSES);
} else {
- Richfaces.SelectItems.doNormal(this.activeItem);
+ Richfaces.SelectItems.doNormal(this.activeItem, this.CLASSES);
}
}
@@ -292,7 +309,7 @@
selectItemRange : function(startIndex, endIndex) {
var rows = this.shuttleTbody.rows;
for (var i = startIndex; i <= endIndex; i++) {
- Richfaces.SelectItems.doSelect(rows[i]);
+ Richfaces.SelectItems.doSelect(rows[i], this.CLASSES);
this.selectedItems.push(rows[i]);
//this.getSelectItemByNode(rows[i])._selected = true;
}
@@ -304,7 +321,7 @@
var rows = this.shuttleTbody.rows;
for (var i = 0; i < rows.length; i++) {
var shuttleItem = rows[i];
- Richfaces.SelectItems.doNormal(shuttleItem);
+ Richfaces.SelectItems.doNormal(shuttleItem, this.CLASSES);
//this.getSelectItemByNode(shuttleItem)._selected = false; //FIXME
}
this.selectedItems.length = 0;
@@ -359,10 +376,10 @@
this.focusKeeper.focused = false;
//this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.normal;
- if (Richfaces.SelectItems.isSelected(this.activeItem)) {
- Richfaces.SelectItems.doSelect(this.activeItem);
+ if (Richfaces.SelectItems.isSelected(this.activeItem, this.CLASSES)) {
+ Richfaces.SelectItems.doSelect(this.activeItem, this.CLASSES);
} else {
- Richfaces.SelectItems.doNormal(this.activeItem);
+ Richfaces.SelectItems.doNormal(this.activeItem, this.CLASSES);
}
},
@@ -395,7 +412,7 @@
state = state.replace(/[as]/g, "");
//TODO optimization
- if (Richfaces.SelectItems.isSelected(item._node)) {
+ if (Richfaces.SelectItems.isSelected(item._node, this.CLASSES)) {
state = state + "s";
}
if (this.activeItem && (this.activeItem.rowIndex == item._node.rowIndex)) {
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-05 16:40:19 UTC (rev 4507)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-05 17:19:27 UTC (rev 4508)
@@ -5,7 +5,7 @@
name: 'Richfaces.OrderingList',
parent: Richfaces.ListBase
},
-
+
initialize: function(containerId, contentTableId, headerTableId, focusKeeperId,
ids, onclickControlId, onorderchanged) {
Richfaces.OrderingList.parentClass.constructor().call(this, containerId, contentTableId, headerTableId, focusKeeperId, onclickControlId);
@@ -144,7 +144,7 @@
this.selectAll();
Event.stop(event);
}
- Richfaces.SelectItems.doActive(this.activeItem);
+ Richfaces.SelectItems.doActive(this.activeItem, this.CLASSES);
this.saveState();
this.controlListManager();
break;
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-12-05 16:40:19 UTC (rev 4507)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-12-05 17:19:27 UTC (rev 4508)
@@ -2,53 +2,37 @@
Richfaces.SelectItems = {
- CLASSES : {
- ROW : {
- ACTIVE : "rich-ordering-list-row-active",
- SELECTED : "rich-ordering-list-row-selected",
- ACTIVE_SELECTED : "rich-ordering-list-row-selected rich-ordering-list-row-active",
- DISABLED : "rich-ordering-list-row-disabled",
- NORMAL : "rich-ordering-list-row"
- },
- CELL : {
- ACTIVE : "rich-ordering-list-cell-active",
- SELECTED : "rich-ordering-list-cell-selected",
- ACTIVE_SELECTED : "rich-ordering-list-cell-selected rich-ordering-list-cell-active",
- DISABLED : "rich-ordering-list-cell-disabled",
- NORMAL : "rich-ordering-list-cell"
+
+ doActive : function(row, classes) {
+ var newRowStyle = classes.ROW.ACTIVE;
+ var newCellStyle = classes.CELL.ACTIVE;
+ if (Element.hasClassName(row, classes.ROW.SELECTED)) {
+ newRowStyle = classes.ROW.ACTIVE_SELECTED;
+ newCellStyle = classes.CELL.ACTIVE_SELECTED;
}
- },
-
- doActive : function(row) {
- var newRowStyle = Richfaces.SelectItems.CLASSES.ROW.ACTIVE;
- var newCellStyle = Richfaces.SelectItems.CLASSES.CELL.ACTIVE;
- if (Element.hasClassName(row, Richfaces.SelectItems.CLASSES.ROW.SELECTED)) {
- newRowStyle = Richfaces.SelectItems.CLASSES.ROW.ACTIVE_SELECTED;
- newCellStyle = Richfaces.SelectItems.CLASSES.CELL.ACTIVE_SELECTED;
- }
Richfaces.SelectItems.doChange(row, newRowStyle, newCellStyle);
},
- doSelect : function(row) {
+ doSelect : function(row, classes) {
Richfaces.SelectItems
.doChange(row,
- Richfaces.SelectItems.CLASSES.ROW.SELECTED,
- Richfaces.SelectItems.CLASSES.CELL.SELECTED);
+ classes.ROW.SELECTED,
+ classes.CELL.SELECTED);
},
- doNormal : function(row) {
+ doNormal : function(row, classes) {
Richfaces.SelectItems
.doChange(row,
- Richfaces.SelectItems.CLASSES.ROW.NORMAL,
- Richfaces.SelectItems.CLASSES.CELL.NORMAL);
+ classes.ROW.NORMAL,
+ classes.CELL.NORMAL);
},
- isSelected : function(row) {
- return Richfaces.SelectItems.compareStates(row, Richfaces.SelectItems.CLASSES.ROW.SELECTED);
+ isSelected : function(row, classes) {
+ return Richfaces.SelectItems.compareStates(row, classes.ROW.SELECTED);
},
- isActive : function(row) {
- return Richfaces.SelectItems.compareStates(row, Richfaces.SelectItems.CLASSES.ROW.ACTIVE);
+ isActive : function(row, classes) {
+ return Richfaces.SelectItems.compareStates(row, classes.ROW.ACTIVE);
},
doChange : function(row, classNameRow, classNameCell) {
18 years, 5 months
JBoss Rich Faces SVN: r4507 - trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-12-05 11:40:19 -0500 (Wed, 05 Dec 2007)
New Revision: 4507
Modified:
trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
Log:
http://jira.jboss.com/jira/browse/RF-1530
Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2007-12-05 16:30:58 UTC (rev 4506)
+++ trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2007-12-05 16:40:19 UTC (rev 4507)
@@ -121,34 +121,37 @@
parentForm.appendChild(fInput);
}
- if (this.panels[clientId].status == "true") {
- if (this.panels[clientId].invokeEvent("collapse",event,"true",fInput)) {
- this.panels[clientId].status="false";
+
+ var thePanel = this.panels.get(clientId);
+ if (thePanel.status == "true") {
+ if (thePanel.invokeEvent("collapse",event,"true",fInput)) {
+ thePanel.status="false";
}
} else {
- if (this.panels[clientId].invokeEvent("expand",event,"false",fInput)) {
- this.panels[clientId].status="true";
+ if (thePanel.invokeEvent("expand",event,"false",fInput)) {
+ thePanel.status="true";
}
}
- fInput.value = this.panels[clientId].status;
+ fInput.value = thePanel.status;
parentForm.submit();
return false;
}
SimpleTogglePanelManager.toggleOnClient = function (event,panelId) {
- this.panels[panelId].toggleToState(event);
+ this.panels.get(panelId).toggleToState(event);
return false;
}
SimpleTogglePanelManager.toggleOnAjax = function(event,panelId) {
var element = $(panelId);
- if (this.panels[panelId].status == "true") {
- return this.panels[panelId].invokeEvent("collapse",event,"true",element);
+ var thePanel = this.panels.get(panelId);
+ if (thePanel.status == "true") {
+ return thePanel.invokeEvent("collapse",event,"true",element);
} else {
- return this.panels[panelId].invokeEvent("expand",event,"false",element);
+ return thePanel.invokeEvent("expand",event,"false",element);
}
}
18 years, 5 months
JBoss Rich Faces SVN: r4506 - branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-12-05 11:30:58 -0500 (Wed, 05 Dec 2007)
New Revision: 4506
Modified:
branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
Log:
http://jira.jboss.com/jira/browse/RF-1530
Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js
===================================================================
--- branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2007-12-05 16:06:43 UTC (rev 4505)
+++ branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/scripts/simpleTogglePanel.js 2007-12-05 16:30:58 UTC (rev 4506)
@@ -78,19 +78,20 @@
parentForm.appendChild(fInput);
}
- if (this.panels[clientId].status==0){
- this.panels[clientId].status=1;
+ var thePanel = this.panels.get(clientId);
+ if (thePanel.status==0){
+ thePanel.status=1;
}
else{
- this.panels[clientId].status=0;
+ thePanel.status=0;
}
- fInput.value = this.panels[clientId].status;
+ fInput.value = thePanel.status;
parentForm.submit();
return false;
}
SimpleTogglePanelManager.toggleOnClient = function (panelId) {
- this.panels[panelId].toggleToState();
+ this.panels.get(panelId).toggleToState();
return false;
}
18 years, 5 months
JBoss Rich Faces SVN: r4505 - in branches/3.1.x/ui: listShuttle/src/main/resources/org/richfaces/renderkit/html/css and 3 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-05 11:06:43 -0500 (Wed, 05 Dec 2007)
New Revision: 4505
Modified:
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
Log:
List shuttle skinning. Not finished.
Modified: branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-05 16:06:43 UTC (rev 4505)
@@ -101,15 +101,23 @@
ListShuttleRowKey listShuttleRowKey = (ListShuttleRowKey) table.getRowKey();
if (listShuttleRowKey != null) {
- if (shuttleRendererTableHolder.isSource() == listShuttleRowKey.isFacadeSource()) {
+ boolean source = shuttleRendererTableHolder.isSource();
+ if (source == listShuttleRowKey.isFacadeSource()) {
ResponseWriter writer = context.getResponseWriter();
String clientId = holder.getTable().getClientId(context);
writer.startElement(HTML.TR_ELEMENT, table);
writer.writeAttribute("id", clientId, null);
- StringBuffer rowClassName = new StringBuffer("ol_normal rich-ordering-list-row");
- StringBuffer cellClassName = new StringBuffer("ol_cell rich-ordering-list-cell");
+ StringBuffer rowClassName = new StringBuffer();
+ StringBuffer cellClassName = new StringBuffer();
+ if (source) {
+ rowClassName.append("rich-shuttle-source-row");
+ cellClassName.append("rich-shuttle-source-cell");
+ } else {
+ rowClassName.append("rich-shuttle-target-row");
+ cellClassName.append("rich-shuttle-target-cell");
+ }
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, table);
SelectionState selectionState = (SelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME);
@@ -117,15 +125,25 @@
boolean active = itemState.isActive();
if (active) {
- rowClassName.append(" rich-ordering-list-row-active");
- cellClassName.append(" rich-ordering-list-cell-active");
+ if (source) {
+ rowClassName.append(" rich-shuttle-source-row-active");
+ cellClassName.append(" rich-shuttle-source-cell-active");
+ } else {
+ rowClassName.append(" rich-shuttle-target-row-active");
+ cellClassName.append(" rich-shuttle-target-cell-active");
+ }
}
boolean selected = itemState.isSelected();
selectionState.addState(selected);
if (selected) {
- rowClassName.append(" rich-ordering-list-row-selected");
- cellClassName.append(" rich-ordering-list-cell-selected");
+ if (source) {
+ rowClassName.append(" rich-shuttle-source-row-selected");
+ cellClassName.append(" rich-shuttle-source-cell-selected");
+ } else {
+ rowClassName.append(" rich-shuttle-target-row-selected");
+ cellClassName.append(" rich-shuttle-target-cell-selected");
+ }
}
writer.writeAttribute("class", rowClassName.toString(), null);
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-05 16:06:43 UTC (rev 4505)
@@ -19,11 +19,7 @@
.shuttle_center_button_col_valign{vertical-align : middle}
.shuttle_right_button_col_valign{vertical-align : middle}
-.rich-shuttle-body {
- /*width: 100%;*/
-}
-
-.ol_list_content {
+.rich-shuttle-list-content {
overflow: auto;
}
@@ -41,35 +37,26 @@
width:100%;
}
-.ol_internal_tab {
- background : repeat scroll left top;
+.rich-shuttle-internal-tab {
width:100%;
}
-.ol_internal_tab .ol_endcol{border-right : 0px;}
+.rich-shuttle-internal-tab .ol_endcol{border-right : 0px;}
-/*.ol_internal_tab td{font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0; border-top : 1px solid #FFFFFF; padding : 2px;}
-*/
+.rich-shuttle-internal-tab tr.ol_select{background : #EAF0F8}
-.ol_internal_tab tr.ol_select{background : #EAF0F8}
-
-.ol_internal_tab tr.ol_active {
+.rich-shuttle-internal-tab tr.ol_active {
background : #EAF0F8; color : #4A75B5;
}
-.ol_internal_tab tr.ol_active td{
+.rich-shuttle-internal-tab tr.ol_active td{
color : #4A75B5;
}
-.ol_internal_tab tr.ol_normal {
-}
-
.ol_control_shown {
- /*visibility: visible;*/
display: block;
}
.ol_control_hidden {
- /*visibility: hidden;*/
display: none;
}
@@ -85,7 +72,7 @@
<u:style name="border-style" value="none" />
</u:selector>
-<u:selector name=".ol_cell, .ol_cell *">
+<u:selector name=".rich-shuttle-source-cell, .rich-shuttle-target-cell, .rich-shuttle-source-cell *, .rich-shuttle-target-cell *">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
@@ -148,14 +135,14 @@
<u:style name="background-color" skin="headerBackgroundColor" />
</u:selector>
-<u:selector name=".ol_internal_tab tr.ol_select">
+<u:selector name=".rich-shuttle-internal-tab tr.ol_select">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
</u:style>
<u:style name="background-color" skin="additionalBackgroundColor" />
</u:selector>
-<u:selector name=".ol_internal_tab tr.ol_active">
+<u:selector name=".rich-shuttle-internal-tab tr.ol_active">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
</u:style>
@@ -176,7 +163,7 @@
.rich-list-shuttle-button, .rich-list-shuttle-button-disabled {
background : top left repeat-x;
- padding : 2px;
+ padding : 2px 0px;
}
.rich-list-shuttle-button {
@@ -261,17 +248,14 @@
.rich-ordering-list-disabled {
background : repeat scroll left top;
- /*width: 100%;*/
}
-.rich-ordering-list-row-active {
+.rich-shuttle-source-row-active, .rich-shuttle-target-row-active {
background : transparent none repeat-x scroll left top;
- /*width: 100%;*/
}
-.rich-ordering-list-row-selected {
+.rich-shuttle-source-row-selected, .rich-shuttle-target-row-selected {
background : transparent none repeat-x scroll left top;
- /*width: 100%;*/
}
.rich-ordering-list-table-header-cell {
@@ -280,7 +264,7 @@
padding : 2px;
}
-.rich-ordering-list-table-header-cell-end {
+.rich-shuttle-header-tab-cell-end {
border-right : 0px;
white-space: nowrap;
padding : 2px;
@@ -292,26 +276,22 @@
padding : 2px;
}
-.rich-ordering-list-cell {
+.rich-shuttle-source-cell, .rich-shuttle-target-cell {
padding : 2px;
white-space: nowrap;
}
-.rich-ordering-list-cell-selected, rich-ordering-list-cell-selected * {
+.rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected * {
padding : 2px;
white-space: nowrap;
}
-.rich-ordering-list-cell-active {
+.rich-shuttle-source-cell-active, .rich-shuttle-target-cell-active {
padding: 1px 2px 1px 2px;
border-top: 1px dotted gray;
border-bottom: 1px dotted gray;
}
-.rich-ordering-list-cell-active * {
-
-}
-
.rich-ordering-list-ds {
-moz-user-select: -moz-none;
}
@@ -411,7 +391,7 @@
<u:style name="border-left-color" skin="panelBorderColor" />
</u:selector>
- <u:selector name=".rich-ordering-list-table-header-cell-end">
+ <u:selector name=".rich-shuttle-header-tab-cell-end">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
</u:style>
@@ -446,13 +426,13 @@
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-cell-selected, .rich-ordering-list-cell-selected *">
+ <u:selector name=".rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected *">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-cell-active, .rich-ordering-list-cell-active *">
+ <u:selector name=".rich-shuttle-source-cell-active, .rich-shuttle-target-cell-active, .rich-shuttle-source-cell-active *, .rich-shuttle-target-cell-active *">
<u:style name="font-size" skin="generalSizeFont" />
<u:style name="font-family" skin="generalFamilyFont" />
</u:selector>
@@ -472,7 +452,7 @@
<u:style name="font-weight" skin="headerWeightFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-row-selected">
+ <u:selector name=".rich-shuttle-source-row-selected, .rich-shuttle-target-row-selected">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
</u:style>
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-05 16:06:43 UTC (rev 4505)
@@ -144,4 +144,21 @@
copyAll: function (e) { this.moveItems(this.sourceList, this.targetList, this.sourceList.shuttleItems); return false; },
remove: function (e) { this.moveItems(this.targetList, this.sourceList, this.targetList.selectedItems); return false; },
removeAll: function (e) { this.moveItems(this.targetList, this.sourceList, this.targetList.shuttleItems); return false; }
+};
+
+Richfaces.SelectItems.CLASSES = {
+ ROW : {
+ ACTIVE : "rich-shuttle-source-row-active",
+ SELECTED : "rich-shuttle-source-row-selected",
+ ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
+ DISABLED : "rich-shuttle-source-row-disabled",
+ NORMAL : "rich-shuttle-source-row"
+ },
+ CELL : {
+ ACTIVE : "rich-shuttle-source-cell-active",
+ SELECTED : "rich-shuttle-source-cell-selected",
+ ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
+ DISABLED : "rich-shuttle-source-cell-disabled",
+ NORMAL : "rich-shuttle-source-cell"
+ }
};
\ No newline at end of file
Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-05 16:06:43 UTC (rev 4505)
@@ -88,8 +88,8 @@
}
]]>
</jsp:scriptlet>
- <div id="#{clientId}contentBox" class="ol_list_content" style="#{contentContainerStyle}">
- <table id="#{clientId}internal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0">
+ <div id="#{clientId}contentBox" class="rich-shuttle-list-content" style="#{contentContainerStyle}">
+ <table id="#{clientId}internal_tab" class="rich-shuttle-internal-tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tbody">
<jsp:scriptlet><![CDATA[
writer.write(encodedSourceRows);
@@ -147,8 +147,8 @@
}
]]>
</jsp:scriptlet>
- <div id="#{clientId}tlContentBox" class="ol_list_content" style="#{trContentContainerStyle}">
- <table id="#{clientId}tlInternal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0">
+ <div id="#{clientId}tlContentBox" class="rich-shuttle-list-content" style="#{trContentContainerStyle}">
+ <table id="#{clientId}tlInternal_tab" class="rich-shuttle-internal-tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tlTbody">
<jsp:scriptlet><![CDATA[
writer.write(encodedTargetRows);
Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-05 16:06:43 UTC (rev 4505)
@@ -354,7 +354,7 @@
writer.startElement(element, column);
if (!headers.hasNext()) {
- skinCellClass = "rich-ordering-list-table-header-cell-end";
+ skinCellClass = skinCellClass + "-end";
}
encodeStyleClass(writer, null, skinCellClass, headerClass, columnHeaderClass);
getUtils().encodeAttribute(context, column, "colspan");
18 years, 5 months