JBoss Rich Faces SVN: r4389 - branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/component and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-11-30 09:31:50 -0500 (Fri, 30 Nov 2007)
New Revision: 4389
Modified:
branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java
branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
Log:
http://jira.jboss.com/jira/browse/RF-1290
Modified: branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-11-30 13:12:07 UTC (rev 4388)
+++ branches/3.1.x/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-11-30 14:31:50 UTC (rev 4389)
@@ -29,8 +29,16 @@
<superclass>com.sun.facelets.tag.jsf.ComponentHandler</superclass>
</taghandler>
- &ui_component_attributes;
+ &ui_component_attributes;
+ <property>
+ <name>disabled</name>
+ <classname>boolean</classname>
+ <description>
+ Attribute 'disabled' provides possibility to make the whole menu disabled if its value equals to "true".
+ </description>
+ <defaultvalue>false</defaultvalue>
+ </property>
<property>
<name>event</name>
<classname>java.lang.String</classname>
Modified: branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java 2007-11-30 13:12:07 UTC (rev 4388)
+++ branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java 2007-11-30 14:31:50 UTC (rev 4389)
@@ -38,5 +38,9 @@
public abstract void setSubmitMode(String submitMode);
public abstract String getSubmitMode();
+
+ public abstract boolean isDisabled();
+
+ public abstract void setDisabled(boolean disabled);
}
Modified: branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-11-30 13:12:07 UTC (rev 4388)
+++ branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2007-11-30 14:31:50 UTC (rev 4389)
@@ -21,6 +21,8 @@
package org.richfaces.renderkit.html;
+import java.io.IOException;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -97,4 +99,10 @@
return buffer.toString();
}
+ public void encodeChildren(FacesContext context, UIComponent component)
+ throws IOException {
+ if (!((org.richfaces.component.UIDropDownMenu)component).isDisabled())
+ super.encodeChildren(context, component);
+ }
+
}
Modified: branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-11-30 13:12:07 UTC (rev 4388)
+++ branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-11-30 14:31:50 UTC (rev 4389)
@@ -1,53 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://ajax4jsf.org/cdk/ui"
- xmlns:u=" http://ajax4jsf.org/cdk/u"
- xmlns:x=" http://ajax4jsf.org/cdk/x"
- baseclass="org.richfaces.renderkit.html.DropDownMenuRendererBase"
- class="org.richfaces.renderkit.html.DropDownMenuRenderer"
- component="org.richfaces.component.UIDropDownMenu"
- >
- <h:styles>css/dropdownmenu.xcss</h:styles>
-
- <h:scripts>
- new org.ajax4jsf.javascript.PrototypeScript(),
- new org.ajax4jsf.javascript.AjaxScript(),
- scripts/menu.js
- </h:scripts>
-
- <f:clientid var="clientId"/>
- <jsp:scriptlet>
- <![CDATA[if (!((org.richfaces.component.UIDropDownMenu)component).getSubmitMode().equalsIgnoreCase("none")) org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
- </jsp:scriptlet>
- <div id="#{clientId}"
- style="#{component.attributes['style']};"
- class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
- onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
- onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
-
- <jsp:scriptlet>
- <![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">
- <u:insertFacet name="label" />
- </span>
- <jsp:scriptlet>
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ baseclass="org.richfaces.renderkit.html.DropDownMenuRendererBase"
+ class="org.richfaces.renderkit.html.DropDownMenuRenderer"
+ component="org.richfaces.component.UIDropDownMenu">
+ <h:styles>css/dropdownmenu.xcss</h:styles>
+
+ <f:clientid var="clientId" />
+ <jsp:scriptlet>
+ <![CDATA[ org.richfaces.component.UIDropDownMenu menu = (org.richfaces.component.UIDropDownMenu) component;
+ if (!menu.getSubmitMode().equalsIgnoreCase("none"))
+ org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);
+
+ if (!menu.isDisabled()) {]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}" style=""
+ class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+ onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
+ onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
+ <jsp:scriptlet>
+ <![CDATA[ } else { ]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}" style=""
+ class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
+ <jsp:scriptlet>
+ <![CDATA[ } if (menu.isDisabled() &&
+ (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
+ </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
+ name="labelDisabled" /> </span> <jsp:scriptlet>
+ <![CDATA[} else if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
+ </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
+ name="label" /> </span> <jsp:scriptlet>
<![CDATA[} else {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
- <jsp:scriptlet>
+ </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <jsp:scriptlet>
<![CDATA[}]]>
- </jsp:scriptlet>
-
- <div style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index:100;">
- <vcp:body>
- <f:call name="renderChildren" />
- </vcp:body>
- </div>
-
- </div>
-
+ </jsp:scriptlet>
+
+ <div
+ style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index: 100;">
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body></div>
+
+ <jsp:scriptlet>
+ <![CDATA[if (!((org.richfaces.component.UIDropDownMenu) component).isDisabled()) {]]>
+ </jsp:scriptlet>
+ </div>
+ <jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ </div>
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
</f:root>
\ No newline at end of file
Modified: branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-11-30 13:12:07 UTC (rev 4388)
+++ branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-11-30 14:31:50 UTC (rev 4389)
@@ -89,4 +89,8 @@
<u:style name="color" skin="generalTextColor" />
</u:selector>
+<u:selector name=".dr-ddmenu-label-disabled" >
+ <u:style name="color" skin="tabDisabledTextColor"/>
+</u:selector>
+
</f:template>
Modified: trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-11-30 13:12:07 UTC (rev 4388)
+++ trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-11-30 14:31:50 UTC (rev 4389)
@@ -1,77 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://ajax4jsf.org/cdk/ui"
- xmlns:u=" http://ajax4jsf.org/cdk/u"
- xmlns:x=" http://ajax4jsf.org/cdk/x"
- baseclass="org.richfaces.renderkit.html.DropDownMenuRendererBase"
- class="org.richfaces.renderkit.html.DropDownMenuRenderer"
- component="org.richfaces.component.UIDropDownMenu"
- >
- <h:styles>css/dropdownmenu.xcss</h:styles>
-
- <f:clientid var="clientId"/>
- <jsp:scriptlet>
- <![CDATA[if (!((org.richfaces.component.UIDropDownMenu)component).getSubmitMode().equalsIgnoreCase("none")) org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ baseclass="org.richfaces.renderkit.html.DropDownMenuRendererBase"
+ class="org.richfaces.renderkit.html.DropDownMenuRenderer"
+ component="org.richfaces.component.UIDropDownMenu">
+ <h:styles>css/dropdownmenu.xcss</h:styles>
+
+ <f:clientid var="clientId" />
+ <jsp:scriptlet>
+ <![CDATA[ org.richfaces.component.UIDropDownMenu menu = (org.richfaces.component.UIDropDownMenu) component;
+ if (!menu.getSubmitMode().equalsIgnoreCase("none"))
+ org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);
+
+ if (!menu.isDisabled()) {]]>
</jsp:scriptlet>
- <jsp:scriptlet>
- <![CDATA[if (!((org.richfaces.component.UIDropDownMenu)component).isDisabled()) {]]>
- </jsp:scriptlet>
- <div id="#{clientId}"
- style="#{component.attributes['style']};"
- class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
- onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
- onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
+ <div id="#{clientId}" style=""
+ class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+ onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
+ onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
<jsp:scriptlet>
- <![CDATA[} else {]]>
+ <![CDATA[ } else { ]]>
</jsp:scriptlet>
- <div id="#{clientId}"
- style="#{component.attributes['style']};"
- class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label-disabled rich-ddmenu-label-unselect"
- onmouseover="#{component.attributes['onmouseover']}"
- onmouseout="#{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
- <jsp:scriptlet>
- <![CDATA[}]]>
- </jsp:scriptlet>
- <jsp:scriptlet>
- <![CDATA[if (((org.richfaces.component.UIDropDownMenu)component).isDisabled() &&
- (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">
- <u:insertFacet name="labelDisabled" />
- </span>
- <jsp:scriptlet>
+ <div id="#{clientId}" style=""
+ class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
+ <jsp:scriptlet>
+ <![CDATA[ } if (menu.isDisabled() &&
+ (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
+ </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
+ name="labelDisabled" /> </span> <jsp:scriptlet>
<![CDATA[} else if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">
- <u:insertFacet name="label" />
- </span>
- <jsp:scriptlet>
+ </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
+ name="label" /> </span> <jsp:scriptlet>
<![CDATA[} else {]]>
- </jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
- <jsp:scriptlet>
+ </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <jsp:scriptlet>
<![CDATA[}]]>
- </jsp:scriptlet>
-
- <div style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index:100;">
- <vcp:body>
- <f:call name="renderChildren" />
- </vcp:body>
- </div>
-
- <jsp:scriptlet>
- <![CDATA[if (!((org.richfaces.component.UIDropDownMenu)component).isDisabled()) {]]>
+ </jsp:scriptlet>
+
+ <div
+ style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index: 100;">
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body></div>
+
+ <jsp:scriptlet>
+ <![CDATA[if (!((org.richfaces.component.UIDropDownMenu) component).isDisabled()) {]]>
</jsp:scriptlet>
- </div>
+ </div>
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- </div>
+ </div>
<jsp:scriptlet>
<![CDATA[}]]>
- </jsp:scriptlet>
+ </jsp:scriptlet>
</f:root>
\ No newline at end of file
Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-11-30 13:12:07 UTC (rev 4388)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-11-30 14:31:50 UTC (rev 4389)
@@ -89,4 +89,8 @@
<u:style name="color" skin="generalTextColor" />
</u:selector>
+<u:selector name=".dr-ddmenu-label-disabled" >
+ <u:style name="color" skin="tabDisabledTextColor"/>
+</u:selector>
+
</f:template>
16 years, 5 months
JBoss Rich Faces SVN: r4388 - in branches/3.1.x/ui/dataTable/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-30 08:12:07 -0500 (Fri, 30 Nov 2007)
New Revision: 4388
Added:
branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
Removed:
branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractCellRenderer.java
branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlColumn.jspx
Modified:
branches/3.1.x/ui/dataTable/src/main/config/component/column.xml
Log:
RF-1278
Modified: branches/3.1.x/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/config/component/column.xml 2007-11-30 13:00:00 UTC (rev 4387)
+++ branches/3.1.x/ui/dataTable/src/main/config/component/column.xml 2007-11-30 13:12:07 UTC (rev 4388)
@@ -11,8 +11,8 @@
]]>
</description>
<renderer generate="true" override="true">
- <name>org.richfaces.ColumnRenderer</name>
- <template>org/richfaces/htmlColumn.jspx</template>
+ <name>org.richfaces.renderkit.CellRenderer</name>
+ <classname>org.richfaces.renderkit.CellRenderer</classname>
</renderer>
<tag>
<name>column</name>
Deleted: branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractCellRenderer.java
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractCellRenderer.java 2007-11-30 13:00:00 UTC (rev 4387)
+++ branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractCellRenderer.java 2007-11-30 13:12:07 UTC (rev 4388)
@@ -1,59 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.renderkit;
-
-import java.util.Map;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.renderkit.RendererBase;
-
-/**
- * @author shura
- *
- */
-public abstract class AbstractCellRenderer extends RendererBase {
-
- public String styleClass(FacesContext context , UIComponent component){
- StringBuffer styleClass = new StringBuffer();
- // Construct predefined classes
- Map requestMap = context.getExternalContext().getRequestMap();
- Object parentPredefined = requestMap.get(AbstractRowsRenderer.SKIN_CELL_CLASS_KEY);
- if (null != parentPredefined) {
- styleClass.append(parentPredefined).append(" ");
- } else {
- styleClass.append("dr-table-cell rich-table-cell ");
- }
- // Append class from parent component.
- Object parent = requestMap.get(AbstractRowsRenderer.CELL_CLASS_KEY);
- if (null != parent) {
- styleClass.append(parent).append(" ");
- }
- Object custom = component.getAttributes().get("styleClass");
- if (null != custom) {
- styleClass.append(custom);
- }
- return styleClass.toString();
- }
-
-}
Added: branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java (rev 0)
+++ branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java 2007-11-30 13:12:07 UTC (rev 4388)
@@ -0,0 +1,134 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.component.UIColumn;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.ajax4jsf.renderkit.RendererBase;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
+
+/**
+ * @author shur
+ * modified by Alexej Kushunin
+ *
+ */
+public class CellRenderer extends RendererBase {
+
+ public String styleClass(FacesContext context , UIComponent component){
+ StringBuffer styleClass = new StringBuffer();
+ // Construct predefined classes
+ Map requestMap = context.getExternalContext().getRequestMap();
+ Object parentPredefined = requestMap.get(AbstractRowsRenderer.SKIN_CELL_CLASS_KEY);
+ if (null != parentPredefined) {
+ styleClass.append(parentPredefined).append(" ");
+ } else {
+ styleClass.append("dr-table-cell rich-table-cell ");
+ }
+ // Append class from parent component.
+ Object parent = requestMap.get(AbstractRowsRenderer.CELL_CLASS_KEY);
+ if (null != parent) {
+ styleClass.append(parent).append(" ");
+ }
+ Object custom = component.getAttributes().get("styleClass");
+ if (null != custom) {
+ styleClass.append(custom);
+ }
+ return styleClass.toString();
+ }
+
+ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+
+ super.doEncodeBegin(writer, context, component);
+ java.lang.String clientId = component.getClientId(context);
+ boolean isHeader = (styleClass(context, component)).contains("header");
+ if(isHeader)
+ {
+ writer.startElement("th", component);
+
+ }else{
+
+ writer.startElement("td", component);
+ }
+
+
+ getUtils().writeAttribute(writer, "class", styleClass(context,component) );
+ getUtils().writeAttribute(writer, "id", clientId );
+ getUtils().encodeAttributesFromArray(context,component,new String[] {
+ "abbr" ,
+ "align" ,
+ "axis" ,
+ "bgcolor" ,
+ "char" ,
+ "charoff" ,
+ "colspan" ,
+ "dir" ,
+ "headers" ,
+ "height" ,
+ "lang" ,
+ "nowrap" ,
+ "onclick" ,
+ "ondblclick" ,
+ "onkeydown" ,
+ "onkeypress" ,
+ "onkeyup" ,
+ "onmousedown" ,
+ "onmousemove" ,
+ "onmouseout" ,
+ "onmouseover" ,
+ "onmouseup" ,
+ "rowspan" ,
+ "scope" ,
+ "style" ,
+ "title" ,
+ "valign" ,
+ "width" ,
+ "xml:lang" });
+
+ }
+
+
+ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ // TODO Auto-generated method stub
+ super.doEncodeEnd(writer, context, component);
+ boolean isHeader = (styleClass(context, component)).contains("header");
+ if(isHeader)
+ {
+ writer.endElement("th");
+
+ }else{
+
+ writer.endElement("td");
+ }
+ }
+
+ protected Class getComponentClass() {
+
+ return UIColumn.class;
+ }
+
+}
Property changes on: branches/3.1.x/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Deleted: branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlColumn.jspx
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlColumn.jspx 2007-11-30 13:00:00 UTC (rev 4387)
+++ branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlColumn.jspx 2007-11-30 13:12:07 UTC (rev 4388)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://ajax4jsf.org/cdk/ui"
- xmlns:u=" http://ajax4jsf.org/cdk/u"
- xmlns:x=" http://ajax4jsf.org/cdk/x"
- xmlns:h="http://jsf.exadel.com/header"
- xmlns:vcp="http://ajax4jsf.org/cdk/vcp"
-
- class="org.richfaces.renderkit.html.ColumnRenderer"
- baseclass="org.richfaces.renderkit.AbstractCellRenderer"
- component="org.richfaces.component.UIColumn"
- >
- <f:clientid var="clientId"/>
- <td id="#{clientId}"
- class="#{this:styleClass(context,component)}"
- x:passThruWithExclusions="value,name,type,id,class"
- >
- <vcp:body/>
- </td>
-</f:root>
16 years, 5 months
JBoss Rich Faces SVN: r4387 - branches/3.1.x/ui/calendar/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-30 08:00:00 -0500 (Fri, 30 Nov 2007)
New Revision: 4387
Modified:
branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-1450
Modified: branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-30 12:36:45 UTC (rev 4386)
+++ branches/3.1.x/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-30 13:00:00 UTC (rev 4387)
@@ -120,13 +120,11 @@
boolean manualInput = getUtils().isBooleanAttribute(component, "enableManualInput");
String onfieldclick =null;
String type="text";
- if(manualInput){
- variables.setVariable("manualInput",new Boolean(!manualInput));
- }
- else{
- variables.setVariable("manualInput",new Boolean(!manualInput));
+ if(!manualInput){
+ variables.setVariable("manualInput",new String("readonly"));
onfieldclick = "$('"+clientId+"').component.doSwitch();";
- }
+ }
+
if (!showInput){
type="hidden";
}
@@ -156,7 +154,8 @@
size="#{component.attributes['inputSize']}"
style="vertical-align: middle; #{component.attributes['inputStyle']}"
class="rich-calendar-input #{component.attributes['inputClass']}"
- tabindex="#{component.attributes['tabindex']}"> </input>
+ tabindex="#{component.attributes['tabindex']}">
+ </input>
<jsp:scriptlet>
<![CDATA[
String buttonIcon = org.richfaces.component.util.ViewUtil.getResourceURL((String) component.getAttributes().get("buttonIcon"),context);
16 years, 5 months
JBoss Rich Faces SVN: r4386 - in trunk/ui/calendar/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-30 07:36:45 -0500 (Fri, 30 Nov 2007)
New Revision: 4386
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-1391
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-11-30 12:27:18 UTC (rev 4385)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-11-30 12:36:45 UTC (rev 4386)
@@ -494,7 +494,7 @@
</description>
</property>
<property>
- <name>showWeeksDayBar</name>
+ <name>showWeekDaysBar</name>
<classname>boolean</classname>
<description>
If false this bar should not be shown
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-11-30 12:27:18 UTC (rev 4385)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-11-30 12:36:45 UTC (rev 4386)
@@ -179,9 +179,9 @@
public abstract void setCellWidth(String cellWidth);
- public abstract boolean isShowWeeksDaysBar();
+ public abstract boolean isShowWeekDaysBar();
- public abstract void setShowWeeksDaysBar(boolean showWeekDaysBar);
+ public abstract void setShowWeekDaysBar(boolean showWeekDaysBar);
public abstract boolean isShowWeeksBar();
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-30 12:27:18 UTC (rev 4385)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-30 12:36:45 UTC (rev 4386)
@@ -161,7 +161,7 @@
showToday:#{component.attributes['showToday']},
showScrollerBar:#{component.attributes['showScrollerBar']},
showWeeksBar:#{component.attributes['showWeeksBar']},
- showWeeksDayBar:#{component.attributes['showWeeksDayBar']},
+ showWeekDaysBar:#{component.attributes['showWeekDaysBar']},
showApplyButton:#{component.attributes['showApplyButton']}
16 years, 5 months
JBoss Rich Faces SVN: r4385 - branches/3.1.x/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-30 07:27:18 -0500 (Fri, 30 Nov 2007)
New Revision: 4385
Modified:
branches/3.1.x/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
Log:
RF-1362
Modified: branches/3.1.x/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2007-11-30 10:19:41 UTC (rev 4384)
+++ branches/3.1.x/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2007-11-30 12:27:18 UTC (rev 4385)
@@ -72,7 +72,7 @@
<u:style name="padding" value="4px 4px 4px 4px"/>
<u:style name="color" skin="headerTextColor"/> <!--headerTextColor-->
<u:style name="text-align" value="center"/>
- <u:style name="font-weight" value="headerWeightFont"/>
+ <u:style name="font-weight" skin="headerWeightFont"/>
<u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont-->
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
@@ -118,7 +118,7 @@
<u:style name="padding" value="4px 4px 4px 4px"/>
<u:style name="color" skin="generalTextColor"/> <!--headerTextColor-->
<u:style name="text-align" value="left"/>
- <u:style name="font-weight" value="headerWeightFont"/>
+ <u:style name="font-weight" skin="headerWeightFont"/>
<u:style name="font-size" skin="generalSizeFont"/> <!--generalSizeFont-->
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
16 years, 5 months
JBoss Rich Faces SVN: r4384 - in branches/3.1.x/test-applications/facelets/src/main: webapp/OrderingList and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-11-30 05:19:41 -0500 (Fri, 30 Nov 2007)
New Revision: 4384
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java
branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml
Log:
update
Modified: branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-30 04:53:28 UTC (rev 4383)
+++ branches/3.1.x/test-applications/facelets/src/main/java/orderingList/OrderingList.java 2007-11-30 10:19:41 UTC (rev 4384)
@@ -76,8 +76,8 @@
listHeight = "300";
listWidth = "800";
controlsType = "button";
- controlsHorizontalAlign = "0";
- controlsVerticalAlign = "0";
+ controlsHorizontalAlign = "right";
+ controlsVerticalAlign = "center";
headerLabel = "headerLabel";
bottomControlLabel = "bottom label";
upControlLabel = "up label";
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-11-30 04:53:28 UTC (rev 4383)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListProperty.xhtml 2007-11-30 10:19:41 UTC (rev 4384)
@@ -35,14 +35,19 @@
</h:inputText>
<h:outputText value="controlsVerticalAlign" />
- <h:inputText value="#{orderingList.controlsVerticalAlign}">
+ <h:selectOneRadio value="#{orderingList.controlsVerticalAlign}">
+ <f:selectItem itemLabel="top" itemValue="top"/>
+ <f:selectItem itemLabel="center" itemValue="center"/>
+ <f:selectItem itemLabel="bottom" itemValue="bottom"/>
<a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ </h:selectOneRadio>
<h:outputText value="controlsHorizontalAlign" />
- <h:inputText value="#{orderingList.controlsHorizontalAlign}">
+ <h:selectOneRadio value="#{orderingList.controlsHorizontalAlign}">
+ <f:selectItem itemLabel="left" itemValue="left"/>
+ <f:selectItem itemLabel="right" itemValue="right"/>
<a4j:support event="onchange" reRender="orderingListID"></a4j:support>
- </h:inputText>
+ </h:selectOneRadio>
<h:outputText value="upControlLabel" />
<h:inputText value="#{orderingList.upControlLabel}">
16 years, 5 months
JBoss Rich Faces SVN: r4382 - in branches/3.1.x: framework/impl and 14 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-29 23:40:25 -0500 (Thu, 29 Nov 2007)
New Revision: 4382
Added:
branches/3.1.x/samples/listShuttleDemo/
branches/3.1.x/samples/listShuttleDemo/pom.xml
branches/3.1.x/samples/listShuttleDemo/src/
branches/3.1.x/ui/listShuttle/
branches/3.1.x/ui/listShuttle/design/
branches/3.1.x/ui/listShuttle/pom.xml
branches/3.1.x/ui/listShuttle/src/
Removed:
branches/3.1.x/samples/listShuttleDemo/pom.xml
branches/3.1.x/samples/listShuttleDemo/src/
branches/3.1.x/sandbox/samples/listShuttleDemo/
branches/3.1.x/sandbox/ui/listShuttle/
branches/3.1.x/ui/listShuttle/design/
branches/3.1.x/ui/listShuttle/pom.xml
branches/3.1.x/ui/listShuttle/src/
Modified:
branches/3.1.x/docs/userguide/en/
branches/3.1.x/framework/impl/
branches/3.1.x/framework/test/
branches/3.1.x/samples/effect-sample/
branches/3.1.x/samples/gmap-sample/
branches/3.1.x/samples/modalpanel-sample/src/main/webapp/pages/index.jsp
branches/3.1.x/samples/pom.xml
branches/3.1.x/samples/rich-message-demo/
branches/3.1.x/sandbox/ui/state/
branches/3.1.x/ui/pom.xml
branches/3.1.x/ui/spacer/
branches/3.1.x/ui/tree/
Log:
http://jira.jboss.com/jira/browse/RF-1465
Property changes on: branches/3.1.x/docs/userguide/en
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
target(3)
Property changes on: branches/3.1.x/framework/impl
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
.clover
+ .classpath
.project
.settings
target
.clover
target(4)
Property changes on: branches/3.1.x/framework/test
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
.clover
+ target
.settings
.classpath
.project
.clover
target(5)
Property changes on: branches/3.1.x/samples/effect-sample
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
+ target
.settings
.classpath
.project
target(6)
Property changes on: branches/3.1.x/samples/gmap-sample
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
+ target
.settings
.classpath
.project
target(7)
Copied: branches/3.1.x/samples/listShuttleDemo (from rev 4354, branches/3.1.x/sandbox/samples/listShuttleDemo)
Deleted: branches/3.1.x/samples/listShuttleDemo/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/listShuttleDemo/pom.xml 2007-11-29 16:49:06 UTC (rev 4354)
+++ branches/3.1.x/samples/listShuttleDemo/pom.xml 2007-11-30 04:40:25 UTC (rev 4382)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
- <version>3.1.3-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.samples</groupId>
- <artifactId>listShuttleDemo</artifactId>
- <packaging>war</packaging>
- <name>listShuttleDemo Maven Webapp</name>
- <build>
- <finalName>listShuttleDemo</finalName>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
- <artifactId>listShuttle</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: branches/3.1.x/samples/listShuttleDemo/pom.xml (from rev 4381, branches/3.1.x/sandbox/samples/listShuttleDemo/pom.xml)
===================================================================
--- branches/3.1.x/samples/listShuttleDemo/pom.xml (rev 0)
+++ branches/3.1.x/samples/listShuttleDemo/pom.xml 2007-11-30 04:40:25 UTC (rev 4382)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>listShuttleDemo</artifactId>
+ <packaging>war</packaging>
+ <name>listShuttleDemo Maven Webapp</name>
+ <build>
+ <finalName>listShuttleDemo</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>listShuttle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>skins</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: branches/3.1.x/samples/listShuttleDemo/src (from rev 4381, branches/3.1.x/sandbox/samples/listShuttleDemo/src)
Modified: branches/3.1.x/samples/modalpanel-sample/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-11-30 03:40:58 UTC (rev 4381)
+++ branches/3.1.x/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-11-30 04:40:25 UTC (rev 4382)
@@ -153,10 +153,14 @@
<mp:modalPanel id="ccPanel" controlsClass="pointerCursor" onhide="alert(event.parameters.alertText)"
onshow="alert(event.parameters.alertText)">
- <f:verbatim><a href="#" id="hideLink" onclick="return false;">Click text to hide modal panel!</a></f:verbatim>
+ <f:verbatim>
+ <a href="#" id="hideLink0" onclick="return false;">Click text to hide modal panel!</a>
+ <br />
+ <a href="#" id="hideLink1" onclick="return false;">Click text to hide modal panel!</a>
+ </f:verbatim>
</mp:modalPanel>
- <cc:componentControl attachTo="hideLink" event="onclick" for="ccPanel" operation="hide" params="alertText: 'Bye-bye!'" />
+ <cc:componentControl attachTo="hideLink0, hideLink1" event="onclick" for="ccPanel" operation="hide" params="alertText: 'Bye-bye!'" />
<a4j:outputPanel style="cursor: pointer;">
<cc:componentControl event="onclick" for="ccPanel" operation="show" params="alertText: 'Hello!'" />
Modified: branches/3.1.x/samples/pom.xml
===================================================================
--- branches/3.1.x/samples/pom.xml 2007-11-30 03:40:58 UTC (rev 4381)
+++ branches/3.1.x/samples/pom.xml 2007-11-30 04:40:25 UTC (rev 4382)
@@ -426,6 +426,7 @@
<module>treeModelDemo</module>
<module>local-value-demo</module>
<module>orderingListDemo</module>
+ <module>listShuttleDemo</module>
<module>contextMenuDemo</module>
<!--
<module>ajaxPortlet</module>
Property changes on: branches/3.1.x/samples/rich-message-demo
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
target(8)
Property changes on: branches/3.1.x/sandbox/ui/state
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Copied: branches/3.1.x/ui/listShuttle (from rev 4358, branches/3.1.x/sandbox/ui/listShuttle)
Copied: branches/3.1.x/ui/listShuttle/design (from rev 4381, branches/3.1.x/sandbox/ui/listShuttle/design)
Deleted: branches/3.1.x/ui/listShuttle/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/listShuttle/pom.xml 2007-11-29 17:40:01 UTC (rev 4358)
+++ branches/3.1.x/ui/listShuttle/pom.xml 2007-11-30 04:40:25 UTC (rev 4382)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?><project>
- <parent>
- <artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
- <version>3.1.3-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
- <artifactId>listShuttle</artifactId>
- <name>listShuttle</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <library>
- <prefix>org.richfaces</prefix>
- <taglib>
- <shortName>listShuttle</shortName>
- </taglib>
- </library>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <artifactId>orderingList</artifactId>
- <groupId>org.richfaces.ui</groupId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: branches/3.1.x/ui/listShuttle/pom.xml (from rev 4381, branches/3.1.x/sandbox/ui/listShuttle/pom.xml)
===================================================================
--- branches/3.1.x/ui/listShuttle/pom.xml (rev 0)
+++ branches/3.1.x/ui/listShuttle/pom.xml 2007-11-30 04:40:25 UTC (rev 4382)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>listShuttle</artifactId>
+ <name>listShuttle</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <library>
+ <prefix>org.richfaces</prefix>
+ <taglib>
+ <shortName>listShuttle</shortName>
+ </taglib>
+ </library>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <artifactId>orderingList</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: branches/3.1.x/ui/listShuttle/src (from rev 4381, branches/3.1.x/sandbox/ui/listShuttle/src)
Modified: branches/3.1.x/ui/pom.xml
===================================================================
--- branches/3.1.x/ui/pom.xml 2007-11-30 03:40:58 UTC (rev 4381)
+++ branches/3.1.x/ui/pom.xml 2007-11-30 04:40:25 UTC (rev 4382)
@@ -90,6 +90,7 @@
<module>scrollableDataTable</module>
<module>componentControl</module>
<module>orderingList</module>
+ <module>listShuttle</module>
<module>contextMenu</module>
<module>insert</module>
</modules>
Property changes on: branches/3.1.x/ui/spacer
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
.clover
+ target
.settings
.classpath
.project
.clover
target(34)
Property changes on: branches/3.1.x/ui/tree
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
.project
.clover
+ target
.settings
.classpath
.project
.clover
target(41)
16 years, 5 months
JBoss Rich Faces SVN: r4381 - in branches/3.1.x/sandbox: samples/listShuttleDemo and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-29 22:40:58 -0500 (Thu, 29 Nov 2007)
New Revision: 4381
Modified:
branches/3.1.x/sandbox/samples/listShuttleDemo/pom.xml
branches/3.1.x/sandbox/samples/pom.xml
branches/3.1.x/sandbox/ui/listShuttle/pom.xml
branches/3.1.x/sandbox/ui/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-1465
Modified: branches/3.1.x/sandbox/samples/listShuttleDemo/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/listShuttleDemo/pom.xml 2007-11-30 03:37:02 UTC (rev 4380)
+++ branches/3.1.x/sandbox/samples/listShuttleDemo/pom.xml 2007-11-30 03:40:58 UTC (rev 4381)
@@ -2,11 +2,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.samples</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>listShuttleDemo</artifactId>
<packaging>war</packaging>
<name>listShuttleDemo Maven Webapp</name>
@@ -15,7 +15,7 @@
</build>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>listShuttle</artifactId>
<version>${project.version}</version>
</dependency>
Modified: branches/3.1.x/sandbox/samples/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/pom.xml 2007-11-30 03:37:02 UTC (rev 4380)
+++ branches/3.1.x/sandbox/samples/pom.xml 2007-11-30 03:40:58 UTC (rev 4381)
@@ -14,6 +14,5 @@
<module>panel2-sample</module>
<module>simpleTogglePanel2-sample</module>
- <module>listShuttleDemo</module>
</modules>
</project>
\ No newline at end of file
Modified: branches/3.1.x/sandbox/ui/listShuttle/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/listShuttle/pom.xml 2007-11-30 03:37:02 UTC (rev 4380)
+++ branches/3.1.x/sandbox/ui/listShuttle/pom.xml 2007-11-30 03:40:58 UTC (rev 4381)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>listShuttle</artifactId>
<name>listShuttle</name>
<build>
Modified: branches/3.1.x/sandbox/ui/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/pom.xml 2007-11-30 03:37:02 UTC (rev 4380)
+++ branches/3.1.x/sandbox/ui/pom.xml 2007-11-30 03:40:58 UTC (rev 4381)
@@ -13,7 +13,6 @@
<modules>
<module>panel2</module>
<module>simpleTogglePanel2</module>
-<module>listShuttle</module>
<module>state</module>
</modules>
</project>
\ No newline at end of file
16 years, 5 months
JBoss Rich Faces SVN: r4380 - in branches/3.1.x/sandbox/ui/listShuttle/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-29 22:37:02 -0500 (Thu, 29 Nov 2007)
New Revision: 4380
Modified:
branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/sandbox/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
Log:
mozilla text selection disabled
Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-11-30 03:29:42 UTC (rev 4379)
+++ branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-11-30 03:37:02 UTC (rev 4380)
@@ -188,6 +188,10 @@
<f:verbatim><![CDATA[
+.rich-list-shuttle {
+ -moz-user-select: -moz-none;
+}
+
.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;
Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/sandbox/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-11-30 03:29:42 UTC (rev 4379)
+++ branches/3.1.x/sandbox/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-11-30 03:37:02 UTC (rev 4380)
@@ -41,7 +41,7 @@
String encodedTargetRows = encodeRows(context, component, false);
]]>
</jsp:scriptlet>
- <table id="#{clientId}">
+ <table id="#{clientId}" class="rich-list-shuttle">
<tr>
<td>
<input id="#{clientId}valueKeeper" type="hidden" name="#{clientId}" value="#{component.sourceSubmittedString}"/>
16 years, 5 months