JBoss Rich Faces SVN: r837 - trunk/richfaces/panelmenu/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-05-23 06:29:19 -0400 (Wed, 23 May 2007)
New Revision: 837
Modified:
trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
Log:
Add needed ajax4jsf JavaScript file.
Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
===================================================================
--- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-05-23 09:41:34 UTC (rev 836)
+++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-05-23 10:29:19 UTC (rev 837)
@@ -16,6 +16,7 @@
</h:styles>
<h:scripts>
new org.ajax4jsf.framework.resource.PrototypeScript(),
+ new org.ajax4jsf.framework.ajax.AjaxScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
/org/richfaces/renderkit/html/scripts/panelMenu.js,
</h:scripts>
16 years, 12 months
JBoss Rich Faces SVN: r836 - trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-05-23 05:41:34 -0400 (Wed, 23 May 2007)
New Revision: 836
Modified:
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
Log:
Panel menu: fix some problems with action in ajax mode.
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java 2007-05-22 19:26:59 UTC (rev 835)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java 2007-05-23 09:41:34 UTC (rev 836)
@@ -34,6 +34,7 @@
import org.richfaces.component.UISwitchablePanel;
import org.richfaces.component.panelmenu.UIPanelMenu;
import org.richfaces.component.panelmenu.UIPanelMenuGroup;
+import org.richfaces.event.SwitchablePanelSwitchEvent;
public class PanelMenuGroupRenderer extends PanelMenuRendererBase {
protected Class getComponentClass() {
@@ -56,10 +57,9 @@
}
if(isSubmitted(context, component)){
- if (UISwitchablePanel.SERVER_METHOD.equals(getItemMode(group))) {
- ActionEvent actionEvent = new ActionEvent(component);
- component.queueEvent(actionEvent);
- } else if (UISwitchablePanel.AJAX_METHOD.equals(getItemMode(group))) {
+ new SwitchablePanelSwitchEvent(findMenu(component), null, component).queue();
+ new ActionEvent(component).queue();
+ if (UISwitchablePanel.AJAX_METHOD.equals(getItemMode(component))) {
new AjaxEvent(component).queue();
}
}
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java 2007-05-22 19:26:59 UTC (rev 835)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuItemRenderer.java 2007-05-23 09:41:34 UTC (rev 836)
@@ -29,11 +29,14 @@
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent;
+import org.ajax4jsf.framework.ajax.AjaxEvent;
import org.ajax4jsf.framework.renderer.compiler.TemplateContext;
import org.ajax4jsf.framework.util.style.CSSFormat;
+import org.richfaces.component.UISwitchablePanel;
import org.richfaces.component.panelmenu.UIPanelMenu;
import org.richfaces.component.panelmenu.UIPanelMenuGroup;
import org.richfaces.component.panelmenu.UIPanelMenuItem;
+import org.richfaces.event.SwitchablePanelSwitchEvent;
public class PanelMenuItemRenderer extends PanelMenuRendererBase {
protected Class getComponentClass() {
@@ -44,9 +47,12 @@
}
protected void doDecode(FacesContext context, UIComponent component) {
- if(isSubmitted(context, component)){
- ActionEvent actionEvent = new ActionEvent(component);
- component.queueEvent(actionEvent);
+ if(isSubmitted(context, component)) {
+ new SwitchablePanelSwitchEvent(findMenu(component), null, component).queue();
+ new ActionEvent(component).queue();
+ if (UISwitchablePanel.AJAX_METHOD.equals(getItemMode(component))) {
+ new AjaxEvent(component).queue();
+ }
}
}
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-22 19:26:59 UTC (rev 835)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-23 09:41:34 UTC (rev 836)
@@ -331,11 +331,14 @@
buffer.append(","+'"'+ ("".equals(sourceIconNodeOpened)?iconExpandedSource:sourceIconNodeOpened) + '"').append(","+
'"'+("".equals(sourceIconNodeClosed)?iconCollapsedSource:sourceIconNodeClosed)+'"'+";");
} else if("".equals(iconExpanded)){
- buffer.append(","+'"'+iconCollapsedSource+'"').append(","+'"'+iconCollapsedSource+'"');
+ buffer.append(","+'"'+iconCollapsedSource+'"')
+ .append(","+'"'+iconCollapsedSource+'"');
} else if ("".equals(iconCollapsed)) {
- buffer.append(","+'"'+iconExpandedSource+'"').append(","+'"'+iconExpandedSource+'"');
+ buffer.append(","+'"'+iconExpandedSource+'"')
+ .append(","+'"'+iconExpandedSource+'"');
} else {
- buffer.append(","+'"'+iconExpandedSource+'"').append(","+'"'+iconCollapsedSource+'"');
+ buffer.append(","+'"'+iconExpandedSource+'"')
+ .append(","+'"'+iconCollapsedSource+'"');
}
} else if (iconNodeClosed.equals("custom")){
buffer.append(",\"" + ("".equals(iconExpanded)? sourceIconNodeOpened : iconExpandedSource) + '"').
@@ -357,20 +360,24 @@
if (!"".equals(iconItem)){
if (!iconItem.equals("custom")){
if(component.getAttributes().get("icon").equals("")){
- buffer.append(","+'"'+sourceIconItem+'"').append(","+'"'+sourceIconItem+'"'+" ");
+ buffer.append(","+'"'+sourceIconItem+'"')
+ .append(","+'"'+sourceIconItem+'"'+" ");
} else {
- buffer.append(","+'"'+customIconSource+'"').append(","+'"'+customIconSource+'"'+" ");
+ buffer.append(","+'"'+customIconSource+'"')
+ .append(","+'"'+customIconSource+'"'+" ");
}
} else {
if(component.getAttributes().get("icon").equals("")){
- buffer.append(","+'"'+PANEL_MENU_SPACER_ICON+'"').append(","+'"'+PANEL_MENU_SPACER_ICON+'"'+" ");
+ buffer.append(","+'"'+PANEL_MENU_SPACER_ICON+'"')
+ .append(","+'"'+PANEL_MENU_SPACER_ICON+'"'+" ");
} else {
buffer.append(","+'"'+customIconSource+'"').append(","+'"'+customIconSource+'"'+" ");
}
}
} else {
- buffer.append(" ");
+ buffer.append(",\"\" ");
}
+ buffer.append(",\"\" ");
}
}
16 years, 12 months
JBoss Rich Faces SVN: r835 - in trunk/richfaces/tree/src/main: java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-22 15:26:59 -0400 (Tue, 22 May 2007)
New Revision: 835
Modified:
trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java
trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
Log:
RF-220 fixed
Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-05-22 19:15:55 UTC (rev 834)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-05-22 19:26:59 UTC (rev 835)
@@ -47,6 +47,11 @@
*/
protected final static String DEFAULT_NODE_FACE_ATTRIBUTE_NAME = "#defaultNodeFace";
+ private final static String LEAF_FACET_NAME = "leaf";
+ private final static String ICON_FACET_NAME = "icon";
+ private final static String ICON_EXPANDED_FACET_NAME = "iconExpanded";
+ private final static String ICON_COLLAPSED_FACET_NAME = "iconCollapsed";
+
public abstract String getType();
public abstract void setType(String type);
@@ -268,6 +273,34 @@
}
}
+ private UIComponent getTreeFacet(String facetName) {
+ UIComponent facet = getFacet(facetName);
+ if (facet == null || !facet.isRendered()) {
+ UIComponent parentFacet = getUITree().getFacet(facetName);
+ if (facet == null || parentFacet != null && parentFacet.isRendered()) {
+ facet = parentFacet;
+ }
+ }
+
+ return facet;
+ }
+
+ public UIComponent getIconFacet() {
+ return getTreeFacet(ICON_FACET_NAME);
+ }
+
+ public UIComponent getLeafFacet() {
+ return getTreeFacet(LEAF_FACET_NAME);
+ }
+
+ public UIComponent getIconExpandedFacet() {
+ return getTreeFacet(ICON_EXPANDED_FACET_NAME);
+ }
+
+ public UIComponent getIconCollapsedFacet() {
+ return getTreeFacet(ICON_COLLAPSED_FACET_NAME);
+ }
+
public Object saveState(FacesContext context) {
Object[] state = new Object[3];
state[0] = super.saveState(context);
Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-05-22 19:15:55 UTC (rev 834)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-05-22 19:26:59 UTC (rev 835)
@@ -216,6 +216,22 @@
}
}
+ private String getHandleDisplayStyle(FacesContext context, UITreeNode node, boolean expandHandle) {
+ if (node.getUITree().isExpanded() ^ expandHandle) {
+ return "display: none;";
+ }
+
+ return "";
+ }
+
+ public String getHandleCollapsedDisplayStyle(FacesContext context, UITreeNode node) {
+ return getHandleDisplayStyle(context, node, false);
+ }
+
+ public String getHandleExpandedDisplayStyle(FacesContext context, UITreeNode node) {
+ return getHandleDisplayStyle(context, node, true);
+ }
+
protected void doDecode(FacesContext context, UIComponent component) {
super.doDecode(context, component);
Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-05-22 19:15:55 UTC (rev 834)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-05-22 19:26:59 UTC (rev 835)
@@ -38,6 +38,7 @@
import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
import org.ajax4jsf.framework.renderer.ComponentVariables;
import org.ajax4jsf.framework.renderer.ComponentsVariableResolver;
+import org.ajax4jsf.framework.renderer.RendererUtils;
import org.ajax4jsf.framework.util.javascript.JSFunction;
import org.ajax4jsf.framework.util.javascript.JSReference;
import org.ajax4jsf.framework.util.javascript.ScriptUtils;
@@ -398,13 +399,15 @@
ResponseWriter writer) throws IOException {
writer.startElement("table", tree);
- getUtils().writeAttribute(writer, "border", "0");
- getUtils().writeAttribute(writer, "cellpadding", "0");
- getUtils().writeAttribute(writer, "cellspacing", "0");
- getUtils().writeAttribute(writer, "id", tree.getNodeFacet().getClientId(context));
- getUtils().writeAttribute(writer, "style", "width: 100%;");
- getUtils().writeAttribute(writer, "rich:nodeId", tree.getNodeFacet().getId());
-
+ UITreeNode node = tree.getNodeFacet();
+
+ RendererUtils utils = getUtils();
+ utils.writeAttribute(writer, "border", "0");
+ utils.writeAttribute(writer, "cellpadding", "0");
+ utils.writeAttribute(writer, "cellspacing", "0");
+ utils.writeAttribute(writer, "id", node.getClientId(context));
+ utils.writeAttribute(writer, "style", "width: 100%;");
+ utils.writeAttribute(writer, "rich:nodeId", node.getId());
writer.startElement("tbody", tree);
}
Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-05-22 19:15:55 UTC (rev 834)
+++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-05-22 19:26:59 UTC (rev 835)
@@ -12,17 +12,17 @@
padding : 1px
}
-.dr-tree-h-ic-div {
- width: 16px;
-}
-
.dr-tree-h-ic-img{
margin: 0px;
display: block;
- wigth : 16px;
+ width : 16px;
height : 16px;
}
+.dr-tree-h-ic-facets{
+ overflow: hidden;
+}
+
.dr-tree-h-ic-line {
background-position: center;
background-repeat: repeat-y;
Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-05-22 19:15:55 UTC (rev 834)
+++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-05-22 19:26:59 UTC (rev 835)
@@ -8,8 +8,7 @@
xmlns:vcp=" http://ajax4jsf.org/cdk/vcp"
class="org.richfaces.renderkit.html.TreeNodeRenderer"
baseclass="org.richfaces.renderkit.NodeRendererBase"
- component="org.richfaces.component.UITreeNode"
- xmlns:ils="urn:intralinks">
+ component="org.richfaces.component.UITreeNode">
<f:clientId var="clientId" />
@@ -35,30 +34,86 @@
<tr id="#{clientId}:mainRow" >
<f:call name="encodeAttributeParameters" />
<td class="dr-tree-h-ic #{line}">
- <div class="dr-tree-h-ic-div" >
+ <div>
<jsp:scriptlet>
+ <![CDATA[
+ if (component.getUITree().isLeaf()) {
+ ]]>
+ </jsp:scriptlet>
+ <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img" />
+ <jsp:scriptlet>
+ <![CDATA[
+ } else {
+ ]]>
+ </jsp:scriptlet>
+ <a href="#" id="#{clientId}:handle"
+ onclick="#{this:getToggleScript(context, component)} return false;">
+
+ <jsp:scriptlet>
<![CDATA[
- if (component.getUITree().isLeaf()) {
+ UIComponent iconCollapsedFacet = component.getIconCollapsedFacet();
+ if (iconCollapsedFacet != null && iconCollapsedFacet.isRendered()) {
+ ]]>
+ </jsp:scriptlet>
+ <span id="#{clientId}:handle:img:collapsed"
+ class="dr-tree-pointer-cursor dr-tree-h-ic-img dr-tree-h-ic-facets"
+ style="#{this:getHandleCollapsedDisplayStyle(context, component)}">
+
+ <jsp:scriptlet>
+ <![CDATA[
+ renderChild(context, iconCollapsedFacet);
+ ]]>
+ </jsp:scriptlet>
+ </span>
+ <jsp:scriptlet>
+ <![CDATA[
+ } else {
]]>
- </jsp:scriptlet> <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img" /> <jsp:scriptlet>
+ </jsp:scriptlet>
+
+ <img border="0" id="#{clientId}:handle:img:collapsed"
+ src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img"
+ style="#{this:getHandleCollapsedDisplayStyle(context, component)}" alt="" />
+
+ <jsp:scriptlet>
<![CDATA[
- } else {
- ]]>
- </jsp:scriptlet> <a href="#" id="#{clientId}:handle"
- onclick="#{this:getToggleScript(context, component)} return false;"> <jsp:scriptlet>
- <![CDATA[if (component.getUITree().isExpanded()) {]]>
- </jsp:scriptlet> <img border="0" id="#{clientId}:handle:img:collapsed"
- src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img" style="display: none;" alt="" />
- <img border="0" id="#{clientId}:handle:img:expanded" src="#{expanded}"
- class="dr-tree-pointer-cursor dr-tree-h-ic-img" alt="" /> <jsp:scriptlet>
- <![CDATA[} else {]]>
- </jsp:scriptlet> <img border="0" id="#{clientId}:handle:img:collapsed"
- src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img" alt="" /> <img border="0"
- id="#{clientId}:handle:img:expanded" src="#{expanded}"
- class="dr-tree-pointer-cursor dr-tree-h-ic-img" style="display: none;" alt="" /> <jsp:scriptlet>
- <![CDATA[}]]>
- </jsp:scriptlet> </a> <jsp:scriptlet>
+ }
+ ]]>
+ </jsp:scriptlet>
+
+
+ <jsp:scriptlet>
+ <![CDATA[
+ UIComponent iconExpandedFacet = component.getIconExpandedFacet();
+ if (iconExpandedFacet != null && iconExpandedFacet.isRendered()) {
+ ]]>
+ </jsp:scriptlet>
+ <span id="#{clientId}:handle:img:expanded"
+ style="#{this:getHandleExpandedDisplayStyle(context, component)}"
+ class="dr-tree-pointer-cursor dr-tree-h-ic-img dr-tree-h-ic-facets">
+
+ <jsp:scriptlet>
<![CDATA[
+ renderChild(context, iconExpandedFacet);
+ ]]>
+ </jsp:scriptlet>
+ </span>
+ <jsp:scriptlet>
+ <![CDATA[
+ } else {
+ ]]>
+ </jsp:scriptlet>
+ <img border="0" id="#{clientId}:handle:img:expanded" src="#{expanded}"
+ style="#{this:getHandleExpandedDisplayStyle(context, component)}"
+ class="dr-tree-pointer-cursor dr-tree-h-ic-img" alt="" />
+ <jsp:scriptlet>
+ <![CDATA[
+ }
+ ]]>
+ </jsp:scriptlet>
+ </a>
+ <jsp:scriptlet>
+ <![CDATA[
}
]]>
</jsp:scriptlet>
@@ -76,17 +131,52 @@
<jsp:scriptlet>
<![CDATA[
if (component.getUITree().isLeaf()) {
+ UIComponent leafFacet = component.getLeafFacet();
+ if (leafFacet != null && leafFacet.isRendered()) {
+
]]>
</jsp:scriptlet>
- <img src="#{leaf}" alt="" class="dr-tree-h-ic-img" />
+ <span class="dr-tree-h-ic-img dr-tree-h-ic-facets">
+ <jsp:scriptlet>
+ <![CDATA[
+ renderChild(context, leafFacet);
+ ]]>
+ </jsp:scriptlet>
+ </span>
<jsp:scriptlet>
<![CDATA[
+ } else {
+ ]]>
+ </jsp:scriptlet>
+ <img src="#{leaf}" alt="" class="dr-tree-h-ic-img" />
+ <jsp:scriptlet>
+ <![CDATA[
+ }
+ ]]>
+ </jsp:scriptlet>
+ <jsp:scriptlet>
+ <![CDATA[
} else {
+ UIComponent iconFacet = component.getIconFacet();
+ if (iconFacet != null && iconFacet.isRendered()) {
]]>
</jsp:scriptlet>
- <img src="#{folder}" alt="" class="dr-tree-h-ic-img" />
+ <span class="dr-tree-h-ic-img dr-tree-h-ic-facets">
+ <jsp:scriptlet>
+ <![CDATA[
+ renderChild(context, iconFacet);
+ ]]>
+ </jsp:scriptlet>
+ </span>
<jsp:scriptlet>
<![CDATA[
+ } else {
+ ]]>
+ </jsp:scriptlet>
+ <img src="#{folder}" alt="" class="dr-tree-h-ic-img" />
+ <jsp:scriptlet>
+ <![CDATA[
+ }
}
]]>
</jsp:scriptlet>
17 years
JBoss Rich Faces SVN: r834 - in trunk/richfaces-samples/tree-demo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-22 15:15:55 -0400 (Tue, 22 May 2007)
New Revision: 834
Modified:
trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Bean.java
trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp
Log:
RF-220 fixed
Modified: trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Bean.java 2007-05-22 16:56:10 UTC (rev 833)
+++ trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Bean.java 2007-05-22 19:15:55 UTC (rev 834)
@@ -66,6 +66,8 @@
private String iconLeaf = null;
private String icon = null;
+ private boolean renderFacets = false;
+
private String pathToExpand;
private boolean dragOn = true;
@@ -360,4 +362,12 @@
public void setData1(TreeNodeImpl data1) {
this.data1 = data1;
}
+
+ public boolean isRenderFacets() {
+ return renderFacets;
+ }
+
+ public void setRenderFacets(boolean renderFacets) {
+ this.renderFacets = renderFacets;
+ }
}
\ No newline at end of file
Modified: trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp 2007-05-22 16:56:10 UTC (rev 833)
+++ trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp 2007-05-22 19:15:55 UTC (rev 834)
@@ -53,6 +53,13 @@
<f:selectItem itemLabel="on" itemValue="#{true}" />
<f:selectItem itemLabel="off" itemValue="#{false}" />
</h:selectOneRadio>
+
+ <h:outputText value="Render facets:" />
+ <h:selectOneRadio value="#{bean.renderFacets}" onclick="submit()">
+ <f:selectItem itemLabel="true" itemValue="#{true}" />
+ <f:selectItem itemLabel="false" itemValue="#{false}" />
+ </h:selectOneRadio>
+
<h:outputText value="Drag is: #{bean.dragOn ? 'on' : 'off'}" />
<br />
<h:commandButton value="#{bean.commandButtonCaption}"
@@ -80,6 +87,22 @@
icon="#{bean.icon}"
dropListener="#{bean.processDrop}">
+ <f:facet name="icon">
+ <h:outputText value="icon" rendered="#{bean.renderFacets}"/>
+ </f:facet>
+
+ <f:facet name="leaf">
+ <h:outputText value="leaf" rendered="#{bean.renderFacets}"/>
+ </f:facet>
+
+ <f:facet name="iconExpanded">
+ <h:outputText value="expanded" rendered="#{bean.renderFacets}"/>
+ </f:facet>
+
+ <f:facet name="iconCollapsed">
+ <h:outputText value="collapsed" rendered="#{bean.renderFacets}"/>
+ </f:facet>
+
<dnd:dndParam name="treeParam" value="Tree Parameter" />
<dnd:dndParam name="accept" value="accept" />
17 years
JBoss Rich Faces SVN: r833 - in trunk/richfaces/tree/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-05-22 12:56:10 -0400 (Tue, 22 May 2007)
New Revision: 833
Modified:
trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
Log:
Move icon size to style classes from style attribute.
Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-05-22 16:01:03 UTC (rev 832)
+++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-05-22 16:56:10 UTC (rev 833)
@@ -12,6 +12,10 @@
padding : 1px
}
+.dr-tree-h-ic-div {
+ width: 16px;
+}
+
.dr-tree-h-ic-img{
margin: 0px;
display: block;
Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-05-22 16:01:03 UTC (rev 832)
+++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-05-22 16:56:10 UTC (rev 833)
@@ -34,8 +34,8 @@
<tr id="#{clientId}:mainRow" >
<f:call name="encodeAttributeParameters" />
- <td class="dr-tree-h-ic #{line}" style="width: 16px;">
- <div style="width: 16px;">
+ <td class="dr-tree-h-ic #{line}">
+ <div class="dr-tree-h-ic-div" >
<jsp:scriptlet>
<![CDATA[
if (component.getUITree().isLeaf()) {
17 years
JBoss Rich Faces SVN: r832 - trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-05-22 12:01:03 -0400 (Tue, 22 May 2007)
New Revision: 832
Modified:
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
Log:
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-22 14:10:22 UTC (rev 831)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-22 16:01:03 UTC (rev 832)
@@ -274,7 +274,10 @@
if (property!=null && property.toString().equals("true")){
buffer.append(",true");
} else {
- buffer.append(",false");
+
+ //return isChildrenExpanded(component) ? "opened" : "closed";
+ buffer.append(isChildrenExpanded(child) ? ",true" : ",false");
+ //buffer.append(",false");
}
}
}
17 years
JBoss Rich Faces SVN: r831 - in trunk/richfaces/togglePanel/src: test/java/org/richfaces/renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-05-22 10:10:22 -0400 (Tue, 22 May 2007)
New Revision: 831
Modified:
trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java
Log:
RF-192 fixed
Modified: trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
===================================================================
--- trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2007-05-22 14:08:14 UTC (rev 830)
+++ trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2007-05-22 14:10:22 UTC (rev 831)
@@ -80,23 +80,17 @@
public void handleFacets(FacesContext context, UITogglePanel component) throws IOException {
UITogglePanel panel = (UITogglePanel)component;
List stateOrderList = component.getStateOrderList();
- if (stateOrderList.isEmpty()) {
- throw new FacesException("The \"stateOrder\" attribute of the togglePanel component shouldn't be empty!");
- }
-
String state = (String) component.getValue();
if (state == null) {
String initialState = component.getInitialState();
if(initialState != null) {
- if (stateOrderList.contains(initialState)){
- state = initialState;
- }
- else{
- state = (String) stateOrderList.get(0);
- }
- }
- else{
- state = (String) stateOrderList.get(0);
+ state = initialState;
+ } else {
+ if (!stateOrderList.isEmpty()) {
+ state = (String) stateOrderList.get(0);
+ } else {
+ throw new FacesException("The \"initialState\" attribute of the togglePanel component should be set if \"stateOrder\" attribute is empty!");
+ }
}
}
Modified: trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java
===================================================================
--- trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java 2007-05-22 14:08:14 UTC (rev 830)
+++ trunk/richfaces/togglePanel/src/test/java/org/richfaces/renderkit/html/TogglePanelRenderersTest.java 2007-05-22 14:10:22 UTC (rev 831)
@@ -21,12 +21,14 @@
package org.richfaces.renderkit.html;
-import javax.faces.FacesException;
+import java.io.StringWriter;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlForm;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.apache.shale.test.mock.MockResponseWriter;
import org.richfaces.component.UIToggleControl;
import org.richfaces.component.UITogglePanel;
@@ -139,12 +141,8 @@
assertEquals(panelRenderer.getComponentClass(), UITogglePanel.class);
+ facesContext.setResponseWriter(new MockResponseWriter(new StringWriter(), "text/html", "UTF-8"));
togglePanel.setStateOrder(null);
- try {
- panelRenderer.handleFacets(facesContext, togglePanel);
- assertTrue(false);
- } catch (Exception e) {
- assertTrue(e instanceof FacesException);
- }
+ panelRenderer.handleFacets(facesContext, togglePanel);
}
}
17 years
JBoss Rich Faces SVN: r830 - in trunk/richfaces/panelmenu/src/main: java/org/richfaces/component/panelmenu and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-05-22 10:08:14 -0400 (Tue, 22 May 2007)
New Revision: 830
Modified:
trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml
trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuGroup.java
trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuItem.java
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java
trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
Log:
Panel menu: target, width, mode, expandMode attributes added;
Modified: trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml
===================================================================
--- trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/config/component/panelMenu.xml 2007-05-22 14:08:14 UTC (rev 830)
@@ -295,7 +295,7 @@
Set the submission mode for all panel menu groups after expand/collapse
except ones where this attribute redefined. (ajax, server, none(Default))
</description>
- <defaultvalue><![CDATA["none"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconExpanded</name>
@@ -439,7 +439,7 @@
<description>
Set the submission mode (ajax,server(Default),none)
</description>
- <defaultvalue><![CDATA["server"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>icon</name>
@@ -518,5 +518,10 @@
&ui_command_attributes;
&html_style_attributes;
&html_events;
+ <property>
+ <name>target</name>
+ <classname>java.lang.String</classname>
+ <description>Target frame for action to execute.</description>
+ </property>
</component>
</components>
\ No newline at end of file
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuGroup.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuGroup.java 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuGroup.java 2007-05-22 14:08:14 UTC (rev 830)
@@ -21,9 +21,11 @@
package org.richfaces.component.panelmenu;
+import javax.faces.component.UICommand;
+
import org.richfaces.component.UISwitchablePanel;
-public abstract class UIPanelMenuGroup extends UISwitchablePanel {
+public abstract class UIPanelMenuGroup extends UICommand {
public static final String COMPONENT_TYPE = "org.richfaces.panelMenuGroup";
@@ -47,12 +49,8 @@
public abstract void setDisabled(boolean disabled);
public abstract Object getValue();
public abstract void setValue(Object value);
- public abstract String getAction();
- public abstract void setAction(String action);
public abstract String getTarget();
public abstract void setTarget(String target);
- /*public abstract boolean isImmediate();
- public abstract void setImmediate(boolean immediate);*/
public abstract String getHoverClass();
public abstract void setHoverClass(String hoverClass);
public abstract String getHoverStyle();
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuItem.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuItem.java 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/component/panelmenu/UIPanelMenuItem.java 2007-05-22 14:08:14 UTC (rev 830)
@@ -53,5 +53,6 @@
public abstract void setIconClass(String iconClass);
public abstract String getIconStyle();
public abstract void setIconStyle(String iconStyle);
-
+ public abstract String getTarget();
+ public abstract void setTarget(String target);
}
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuGroupRenderer.java 2007-05-22 14:08:14 UTC (rev 830)
@@ -29,7 +29,9 @@
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent;
+import org.ajax4jsf.framework.ajax.AjaxEvent;
import org.ajax4jsf.framework.util.style.CSSFormat;
+import org.richfaces.component.UISwitchablePanel;
import org.richfaces.component.panelmenu.UIPanelMenu;
import org.richfaces.component.panelmenu.UIPanelMenuGroup;
@@ -41,20 +43,25 @@
protected void doDecode(FacesContext context, UIComponent component) {
String clientId = component.getClientId(context);
Map requestMap =context.getExternalContext().getRequestParameterMap();
+ UIPanelMenuGroup group = ((UIPanelMenuGroup)component);
if(requestMap.containsKey("panelMenuState"+clientId)){
Object property = requestMap.get("panelMenuState"+clientId);
if (property.equals("opened")) {
- ((UIPanelMenuGroup)component).setExpanded(true);
+ group.setExpanded(true);
} else if (property.equals("closed")) {
((UIPanelMenuGroup)component).setExpanded(false);
}
}
if(isSubmitted(context, component)){
- ActionEvent actionEvent = new ActionEvent(component);
- component.queueEvent(actionEvent);
+ if (UISwitchablePanel.SERVER_METHOD.equals(getItemMode(group))) {
+ ActionEvent actionEvent = new ActionEvent(component);
+ component.queueEvent(actionEvent);
+ } else if (UISwitchablePanel.AJAX_METHOD.equals(getItemMode(group))) {
+ new AjaxEvent(component).queue();
+ }
}
}
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-22 14:08:14 UTC (rev 830)
@@ -33,7 +33,9 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.util.javascript.JSFunction;
import org.richfaces.component.panelmenu.UIPanelMenu;
import org.richfaces.component.panelmenu.UIPanelMenuGroup;
import org.richfaces.component.panelmenu.UIPanelMenuItem;
@@ -72,6 +74,7 @@
.append(");\n");
String iconPosition = ((UIPanelMenu)component).getIconItemPosition();
String iconPositionTopLevel = ((UIPanelMenu)component).getIconItemTopPosition();
+
for (Iterator iter = flatList.iterator(); iter.hasNext();) {
UIComponent child = (UIComponent) iter.next();
if ((child instanceof UIPanelMenuItem)||(child instanceof UIPanelMenuGroup)) {
@@ -107,6 +110,13 @@
String [] hoveredStyles = hoveredStyle.split(";");
String [] hoveredClasses = hoveredClass.split(" ");
+ String mode = getItemMode(child);
+ Object target = child.getAttributes().get("target");
+ String targetString;
+ if (null == target)
+ targetString = "";
+ else
+ targetString = target.toString();
if (childRendered && parentRendered){
if (childDisabled==null || !childDisabled.equals("true")){
@@ -118,6 +128,8 @@
.append("'},{type:" + (child instanceof UIPanelMenuItem ? "\"item\"":"\"node\""))
.append(",onopen:"+(onopen.equals("") ? "\"\"" : "\"" + onopen + "\"")+",onclose:"+(onclose.equals("") ? "\"\"" : "\"" + onclose + "\""))
.append(",event:\"" + event + "\"")
+ .append(",mode:\"" + mode + "\"")
+ .append(",target:\"" + targetString + "\"")
.append("},{");
@@ -157,7 +169,9 @@
addImages(buffer,context,child,component.getClientId(context).toString());
- buffer.append("\n");
+ addAjaxFunction(context,child,buffer);
+
+ buffer.append(");\n");
}
} else {
continue;
@@ -335,26 +349,38 @@
String iconExpandedScript = ("".equals(iconNodeOpened)) ? "null" : "\"" + iconExpandedSource + "\"";
buffer.append("," + iconExpandedScript + "," + iconCollapsedScript);
}
- buffer.append(",\"" + PANEL_MENU_SPACER_ICON + "\");");
+ buffer.append(",\"" + PANEL_MENU_SPACER_ICON + "\"");
} else {
if (!"".equals(iconItem)){
if (!iconItem.equals("custom")){
if(component.getAttributes().get("icon").equals("")){
- buffer.append(","+'"'+sourceIconItem+'"').append(","+'"'+sourceIconItem+'"'+");");
+ buffer.append(","+'"'+sourceIconItem+'"').append(","+'"'+sourceIconItem+'"'+" ");
} else {
- buffer.append(","+'"'+customIconSource+'"').append(","+'"'+customIconSource+'"'+");");
+ buffer.append(","+'"'+customIconSource+'"').append(","+'"'+customIconSource+'"'+" ");
}
} else {
if(component.getAttributes().get("icon").equals("")){
- buffer.append(","+'"'+PANEL_MENU_SPACER_ICON+'"').append(","+'"'+PANEL_MENU_SPACER_ICON+'"'+");");
+ buffer.append(","+'"'+PANEL_MENU_SPACER_ICON+'"').append(","+'"'+PANEL_MENU_SPACER_ICON+'"'+" ");
} else {
- buffer.append(","+'"'+customIconSource+'"').append(","+'"'+customIconSource+'"'+");");
+ buffer.append(","+'"'+customIconSource+'"').append(","+'"'+customIconSource+'"'+" ");
}
}
} else {
- buffer.append(");");
+ buffer.append(" ");
}
}
}
+ protected void addAjaxFunction(FacesContext context, UIComponent child, StringBuffer buffer) {
+ JSFunction function = AjaxRendererUtils.buildAjaxFunction(child,
+ context);
+ Map eventOptions = AjaxRendererUtils.buildEventOptions(context,
+ child);
+ function.addParameter(eventOptions);
+
+ buffer.append(",\"");
+ function.appendScript(buffer);
+ buffer.append("\"");
+ }
+
}
Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java
===================================================================
--- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2007-05-22 14:08:14 UTC (rev 830)
@@ -36,6 +36,7 @@
import org.ajax4jsf.framework.util.style.CSSFormat;
import org.richfaces.component.panelmenu.UIPanelMenu;
import org.richfaces.component.panelmenu.UIPanelMenuGroup;
+import org.richfaces.component.panelmenu.UIPanelMenuItem;
import org.richfaces.renderkit.iconImages.PanelMenuIconArrow;
import org.richfaces.renderkit.iconImages.PanelMenuIconArrowDown;
import org.richfaces.renderkit.iconImages.PanelMenuIconArrowUp;
@@ -206,4 +207,28 @@
return submitted;
}
+ protected String getItemMode(UIComponent component) {
+ String parentExpandMode = findMenu(component).getExpandMode();
+ String parentMode = findMenu(component).getMode();
+ if (null == parentMode && "".equals(parentMode))
+ parentMode = "server";
+ if (null == parentExpandMode && "".equals(parentExpandMode))
+ parentExpandMode = "none";
+ String mode = "none";
+ if (component instanceof UIPanelMenuGroup) {
+ UIPanelMenuGroup group = (UIPanelMenuGroup) component;
+ if (null != group.getMode() && ! "".equals(group.getMode()))
+ mode = group.getMode();
+ else
+ mode = parentExpandMode;
+ } else if (component instanceof UIPanelMenuItem) {
+ UIPanelMenuItem item = (UIPanelMenuItem) component;
+ if (null != item.getMode() && ! "".equals(item.getMode()))
+ mode = item.getMode();
+ else
+ mode = parentMode;
+ }
+ return mode;
+ }
+
}
Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
===================================================================
--- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-22 14:08:14 UTC (rev 830)
@@ -17,12 +17,21 @@
PanelMenuStorage[myId] = this;}};
PanelMenuItem = Class.create();
PanelMenuItem.prototype = {
- initialize: function(ids, options, hoveredStyles, hoveredClasses, level, haveDynamicIcon, action, opened, iconAlign, iconExpanded, iconCollapsed, iconSpacer){
+ initialize: function(ids, options, hoveredStyles, hoveredClasses, level, haveDynamicIcon, action, opened, iconAlign, iconExpanded, iconCollapsed, iconSpacer,
+ ajaxFunction){
if (!ids.parentId){return};
this.type = options.type;
this.onopen = options.onopen;
this.onclose = options.onclose;
this.event = options.event;
+
+ this.mode = options.mode;
+ if (!this.mode)
+ this.mode = ("node" == this.type) ? "none" : "server";
+
+ this.ajaxSubmit = ajaxFunction;
+ this.target = options.target;
+
this.hoveredStyles = hoveredStyles;
this.hoveredClasses = hoveredClasses;
this.tdhider = $("tdhide"+ids.myId);
@@ -139,6 +148,7 @@
}
this.expanded = true;
},
+
show: function(){
if (this.type!="node")
this.inputState.value="opened";
@@ -150,7 +160,10 @@
preTrigger:function(e){
this.inputAction.setAttribute('value', this.obj.id);
},
+
trigger:function(e){
+ if ("none" == this.mode)
+ return;
if (this.action !="panelMenuItemAction"){
this.preTrigger(e);
var form = Event.findElement(e, "form");
@@ -161,7 +174,15 @@
form.action = action;
document.body.appendChild(form);
}
- form.submit();
+ if ("server" == this.mode) {
+ if (this.target)
+ form.target = this.target;
+ form.submit();
+ }
+ else if ("ajax" == this.mode) {
+ var event = e;
+ eval(this.ajaxSubmit);
+ }
}
},
Modified: trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
===================================================================
--- trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-05-22 12:16:34 UTC (rev 829)
+++ trunk/richfaces/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-05-22 14:08:14 UTC (rev 830)
@@ -25,7 +25,7 @@
<f:call name="utils.encodeBeginFormIfNessesary"/>
<table cellpadding="0" cellspacing="0"
style="#{component.style};" class="#{component.styleClass}"
- id="#{clientId}" >
+ id="#{clientId}" width="#{component.width}" >
<tbody>
<vcp:body>
17 years
JBoss Rich Faces SVN: r829 - trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-05-22 08:16:34 -0400 (Tue, 22 May 2007)
New Revision: 829
Modified:
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
Log:
changing font-color on menu mouseout fixed
Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-22 12:10:12 UTC (rev 828)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-22 12:16:34 UTC (rev 829)
@@ -34,7 +34,7 @@
.dr-menu-icon img {
vertical-align: middle;
}
-.dr-menu-item span, a {
+.dr-menu-item span, .dr-menu-item a {
color : #000000;
text-decoration : none;
}
@@ -80,7 +80,7 @@
</u:style>
</u:selector>
-<u:selector name=".dr-menu-item span, a">
+<u:selector name=".dr-menu-item span, .dr-menu-item a">
<u:style name="color" skin="generalTextColor" />
</u:selector>
17 years
JBoss Rich Faces SVN: r828 - trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-05-22 08:10:12 -0400 (Tue, 22 May 2007)
New Revision: 828
Modified:
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
Log:
changing font-color on menu mouseout fixed
Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-21 22:12:23 UTC (rev 827)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-22 12:10:12 UTC (rev 828)
@@ -34,7 +34,7 @@
.dr-menu-icon img {
vertical-align: middle;
}
-.dr-menu-item a {
+.dr-menu-item span, a {
color : #000000;
text-decoration : none;
}
@@ -80,7 +80,7 @@
</u:style>
</u:selector>
-<u:selector name=".dr-menu-item a">
+<u:selector name=".dr-menu-item span, a">
<u:style name="color" skin="generalTextColor" />
</u:selector>
17 years