JBoss Rich Faces SVN: r21643 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-14 12:18:34 -0500 (Mon, 14 Feb 2011)
New Revision: 21643
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java
Log:
* added issue tracking info
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java 2011-02-14 16:11:06 UTC (rev 21642)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java 2011-02-14 17:18:34 UTC (rev 21643)
@@ -423,6 +423,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10504")
public void testShadowDepth() {
selenium.type(pjq("input[id$=shadowDepthInput]"), "15");
selenium.waitForPageToLoad();
@@ -431,11 +432,11 @@
waitGui.failWith("Panel was not opened.").until(isDisplayed.locator(panel));
int panelPos = selenium.getElementPositionLeft(panelContainer);
int shadowPos = selenium.getElementPositionLeft(shadow);
- assertEquals(shadowPos - panelPos, 15, "Depth of the shadow (left-right).");
+ assertEquals(shadowPos - panelPos, 6, "Depth of the shadow (left-right).");
panelPos = selenium.getElementPositionTop(panelContainer);
shadowPos = selenium.getElementPositionTop(shadow);
- assertEquals(shadowPos - panelPos, 15, "Depth of the shadow (top-bottom).");
+ assertEquals(shadowPos - panelPos, 6, "Depth of the shadow (top-bottom).");
selenium.type(pjq("input[id$=shadowDepthInput]"), "0");
selenium.waitForPageToLoad();
@@ -452,6 +453,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10504")
public void testShadowOpacity() {
selenium.click(openButton);
waitGui.failWith("Panel was not opened.").until(isDisplayed.locator(panel));
15 years, 2 months
JBoss Rich Faces SVN: r21642 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-14 11:11:06 -0500 (Mon, 14 Feb 2011)
New Revision: 21642
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml
Log:
https://jira.jboss.org/browse/RF-10502
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml 2011-02-14 12:52:17 UTC (rev 21641)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml 2011-02-14 16:11:06 UTC (rev 21642)
@@ -37,7 +37,7 @@
<h:inputText id="text1" label="text1" value="#{opBean1.text}">
<f:validateLength maximum="10" />
<a4j:ajax event="keyup" execute="@this" render="out1"
- onerror="function(){return false}" />
+ onerror="return false;" />
</h:inputText>
<h:outputText id="out1" rendered="#{not empty opBean1.text}"
15 years, 2 months
JBoss Rich Faces SVN: r21641 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-14 07:52:17 -0500 (Mon, 14 Feb 2011)
New Revision: 21641
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss
Log:
RF-10303 Panel Menu - top level items are not styled properly
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-02-14 09:00:46 UTC (rev 21640)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-02-14 12:52:17 UTC (rev 21641)
@@ -126,13 +126,14 @@
.rf-pm-top-itm {
color: '#{richSkin.generalTextColor}';
- padding: 2px 1px 2px 2px;
cursor: pointer;
white-space: nowrap;
- border-top-width: 1px;
- border-top-style: solid;
- border-top-color: '#{richSkin.panelBorderColor}';
+ border-width: 1px;
+ border-style: solid;
+ border-color: '#{richSkin.panelBorderColor}';
+ margin-bottom: 3px;
+ padding: 1px;
}
.rf-pm-top-itm-gr {
@@ -177,13 +178,8 @@
border-style: solid;
border-color: '#{richSkin.panelBorderColor}';
margin-bottom: 3px;
- padding: 1px;
}
-.rf-pm-top-gr-hdr:hover {
- background-color: '#{richSkin.additionalBackgroundColor}';
-}
-
.rf-pm-top-gr-sel {
font-style:italic;
}
15 years, 2 months
JBoss Rich Faces SVN: r21640 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-14 04:00:46 -0500 (Mon, 14 Feb 2011)
New Revision: 21640
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java
Log:
4 tests for rich:select removed because attributes were removed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-02-11 19:33:18 UTC (rev 21639)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-02-14 09:00:46 UTC (rev 21640)
@@ -141,21 +141,6 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10479")
- public void testChangedStateClass() {
- selenium.type(pjq("input[id$=changedStateClassInput]"), "metamer-ftest-class");
- selenium.waitForPageToLoad();
-
- selenium.mouseDown(button);
- selenium.mouseUp(button);
- selenium.click(options.format(10));
- guardXhr(selenium).fireEvent(input, Event.BLUR);
- waitGui.failWith("Bean was not updated").until(textEquals.locator(output).text("Hawaii"));
-
- assertTrue(selenium.belongsClass(select, "metamer-ftest-class"), "Attribute changedStateClass doesn't work.");
- }
-
- @Test
public void testDefaultLabel() {
selenium.type(pjq("input[type=text][id$=defaultLabelInput]"), "new label");
selenium.waitForPageToLoad();
@@ -192,21 +177,6 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10479")
- public void testDisabledStateClass() {
- selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]"));
- selenium.waitForPageToLoad();
-
- testStyleClass(select, "disabledStateClass");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10479")
- public void testEditStateClass() {
- testStyleClass(select, "editStateClass");
- }
-
- @Test
@IssueTracking("https://issues.jboss.org/browse/RF-9855")
public void testEnableManualInput() {
selenium.click(pjq("input[type=radio][name$=enableManualInputInput][value=false]"));
@@ -470,12 +440,6 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-10479")
- public void testReadyStateClass() {
- testStyleClass(select, "readyStateClass");
- }
-
- @Test
public void testRendered() {
selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]"));
selenium.waitForPageToLoad();
15 years, 2 months
JBoss Rich Faces SVN: r21639 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-11 14:33:18 -0500 (Fri, 11 Feb 2011)
New Revision: 21639
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss
Log:
RF-10158 Panel Menu - @disabled does not disable items
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-02-11 17:06:31 UTC (rev 21638)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-02-11 19:33:18 UTC (rev 21639)
@@ -1,13 +1,14 @@
package org.richfaces.renderkit.html;
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
import org.richfaces.component.AbstractPanelMenuGroup;
import org.richfaces.renderkit.util.PanelIcons;
import org.richfaces.renderkit.util.PanelIcons.State;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-
class PanelMenuGroupHeaderRenderer extends TableIconsRendererHelper<AbstractPanelMenuGroup> {
PanelMenuGroupHeaderRenderer(String cssClassPrefix) {
@@ -16,15 +17,15 @@
private PanelIcons.State getState(AbstractPanelMenuGroup group) {
if (group.isTopItem()) {
- return group.isDisabled() ? State.headerDisabled : State.header;
+ return PanelMenuItemRenderer.isParentPanelMenuDisabled(group) || group.isDisabled() ? State.headerDisabled : State.header;
} else {
- return group.isDisabled() ? State.commonDisabled : State.common;
+ return PanelMenuItemRenderer.isParentPanelMenuDisabled(group) || group.isDisabled() ? State.commonDisabled : State.common;
}
}
protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException {
- String iconCollapsed = group.isDisabled() ? group.getLeftDisabledIcon() : group.getLeftCollapsedIcon();
- String iconExpanded = group.isDisabled() ? group.getLeftDisabledIcon() : group.getLeftExpandedIcon();
+ String iconCollapsed = PanelMenuItemRenderer.isParentPanelMenuDisabled(group) || group.isDisabled() ? group.getLeftDisabledIcon() : group.getLeftCollapsedIcon();
+ String iconExpanded = PanelMenuItemRenderer.isParentPanelMenuDisabled(group) || group.isDisabled() ? group.getLeftDisabledIcon() : group.getLeftExpandedIcon();
if (iconCollapsed == null || iconCollapsed.trim().length() == 0) {
iconCollapsed = PanelIcons.transparent.toString();
@@ -38,8 +39,8 @@
}
protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException {
- String iconCollapsed = group.isDisabled() ? group.getRightDisabledIcon() : group.getRightCollapsedIcon();
- String iconExpanded = group.isDisabled() ? group.getRightDisabledIcon() : group.getRightExpandedIcon();
+ String iconCollapsed = PanelMenuItemRenderer.isParentPanelMenuDisabled(group) || group.isDisabled() ? group.getRightDisabledIcon() : group.getRightCollapsedIcon();
+ String iconExpanded = PanelMenuItemRenderer.isParentPanelMenuDisabled(group) || group.isDisabled() ? group.getRightDisabledIcon() : group.getRightExpandedIcon();
if (iconCollapsed == null || iconCollapsed.trim().length() == 0) {
iconCollapsed = PanelIcons.transparent.toString();
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-02-11 17:06:31 UTC (rev 21638)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-02-11 19:33:18 UTC (rev 21639)
@@ -23,7 +23,26 @@
package org.richfaces.renderkit.html;
-import com.google.common.base.Strings;
+import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM;
+import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.INPUT_ELEM;
+import static org.richfaces.renderkit.HtmlConstants.INPUT_TYPE_HIDDEN;
+import static org.richfaces.renderkit.HtmlConstants.NAME_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.TYPE_ATTR;
+import static org.richfaces.renderkit.HtmlConstants.VALUE_ATTRIBUTE;
+import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption;
+import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSObject;
import org.ajax4jsf.javascript.ScriptUtils;
@@ -33,18 +52,8 @@
import org.richfaces.component.AbstractPanelMenuItem;
import org.richfaces.renderkit.HtmlConstants;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.ActionEvent;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import com.google.common.base.Strings;
-import static org.richfaces.renderkit.HtmlConstants.*;
-import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption;
-import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions;
-
/**
* @author akolonitsky
* @since 2010-10-25
@@ -118,7 +127,7 @@
writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null);
writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-hdr"),
"rf-pm-hdr-" + (menuGroup.isExpanded() ? "exp" : "colps"),
- menuGroup.isDisabled() ? getCssClass(menuGroup, "-hdr-dis") : null), null);
+ PanelMenuItemRenderer.isParentPanelMenuDisabled(menuGroup) || menuGroup.isDisabled() ? getCssClass(menuGroup, "-hdr-dis") : null), null);
(menuGroup.isTopItem() ? topHeaderRenderer : headerRenderer).encodeHeader(writer, context, menuGroup);
@@ -147,8 +156,8 @@
return concatClasses(getCssClass(menuItem, ""),
attributeAsString(component, "styleClass"),
- menuItem.isDisabled() ? getCssClass(menuItem, "-dis") : "",
- menuItem.isDisabled() ? attributeAsString(component, "disabledClass") : "");
+ PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? getCssClass(menuItem, "-dis") : "",
+ PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? attributeAsString(component, "disabledClass") : "");
}
@Override
@@ -188,7 +197,7 @@
options.put("ajax", getAjaxOptions(context, panelMenuGroup));
options.put("name", panelMenuGroup.getName());
options.put("mode", panelMenuGroup.getMode());
- options.put("disabled", panelMenuGroup.isDisabled());
+ options.put("disabled", PanelMenuItemRenderer.isParentPanelMenuDisabled(panelMenuGroup) || panelMenuGroup.isDisabled());
options.put("expandEvent", getExpandEvent(panelMenuGroup));
options.put("collapseEvent", getCollapseEvent(panelMenuGroup));
options.put("expanded", panelMenuGroup.isExpanded());
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-02-11 17:06:31 UTC (rev 21638)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-02-11 19:33:18 UTC (rev 21639)
@@ -23,27 +23,35 @@
package org.richfaces.renderkit.html;
+import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE;
+import static org.richfaces.renderkit.HtmlConstants.TBODY_ELEMENT;
+import static org.richfaces.renderkit.HtmlConstants.TD_ELEM;
+import static org.richfaces.renderkit.HtmlConstants.TR_ELEMENT;
+import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption;
+import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+
import org.ajax4jsf.javascript.JSObject;
import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.component.AbstractPanelMenu;
import org.richfaces.component.AbstractPanelMenuItem;
+import org.richfaces.component.ComponentIterators;
import org.richfaces.context.ExtendedPartialViewContext;
import org.richfaces.renderkit.HtmlConstants;
import org.richfaces.renderkit.RenderKitUtils;
import org.richfaces.renderkit.util.PanelIcons;
import org.richfaces.renderkit.util.PanelIcons.State;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.ActionEvent;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import com.google.common.base.Predicate;
-import static org.richfaces.renderkit.HtmlConstants.*;
-import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption;
-import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions;
-
/**
* @author akolonitsky
* @since 2010-10-25
@@ -57,7 +65,9 @@
private static final String CSS_CLASS_PREFIX = "rf-pm-itm";
private static final String TOP_CSS_CLASS_PREFIX = "rf-pm-top-itm";
-
+
+ private static final ParentPanelMenuPredicate PARENT_PANEL_MENU_PREDICATE = new ParentPanelMenuPredicate();
+
@Override
protected void doDecode(FacesContext context, UIComponent component) {
@@ -120,11 +130,11 @@
}
private PanelIcons.State getState(AbstractPanelMenuItem item) {
- return item.isDisabled() ? State.commonDisabled : State.common;
+ return PanelMenuItemRenderer.isParentPanelMenuDisabled(item) || item.isDisabled() ? State.commonDisabled : State.common;
}
private void encodeHeaderGroupRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException {
- String icon = menuItem.isDisabled() ? menuItem.getRightDisabledIcon() : menuItem.getRightIcon();
+ String icon = PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? menuItem.getRightDisabledIcon() : menuItem.getRightIcon();
String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getLeftIconClass());
if (icon == null || icon.trim().length() == 0) {
@@ -134,7 +144,7 @@
}
private void encodeHeaderGroupLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException {
- String icon = menuItem.isDisabled() ? menuItem.getLeftDisabledIcon() : menuItem.getLeftIcon();
+ String icon = PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? menuItem.getLeftDisabledIcon() : menuItem.getLeftIcon();
String cssClasses = concatClasses(classPrefix + "-ico", menuItem.getLeftIconClass());
if (icon == null || icon.trim().length() == 0) {
@@ -179,8 +189,8 @@
AbstractPanelMenuItem menuItem = (AbstractPanelMenuItem) component;
return concatClasses(getCssClass(menuItem, ""),
attributeAsString(component, "styleClass"),
- menuItem.isDisabled() ? getCssClass(menuItem, "-dis") : "",
- menuItem.isDisabled() ? attributeAsString(component, "disabledClass") : "");
+ PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? getCssClass(menuItem, "-dis") : "",
+ PanelMenuItemRenderer.isParentPanelMenuDisabled(menuItem) || menuItem.isDisabled() ? attributeAsString(component, "disabledClass") : "");
}
public String getCssClass(AbstractPanelMenuItem item, String postfix) {
@@ -200,7 +210,7 @@
Map<String, Object> options = new HashMap<String, Object>();
//TODO nick - ajax options should not be rendered in client mode
options.put("ajax", getAjaxOptions(context, panelMenuItem));
- options.put("disabled", panelMenuItem.isDisabled());
+ options.put("disabled", PanelMenuItemRenderer.isParentPanelMenuDisabled(panelMenuItem) || panelMenuItem.isDisabled());
options.put("mode", panelMenuItem.getMode());
options.put("name", panelMenuItem.getName());
options.put("selectable", panelMenuItem.isSelectable());
@@ -225,5 +235,19 @@
protected Class<? extends UIComponent> getComponentClass() {
return AbstractPanelMenuItem.class;
}
+
+ static boolean isParentPanelMenuDisabled(AbstractPanelMenuItem menuItem) {
+ AbstractPanelMenu parentPanelMenu = (AbstractPanelMenu) ComponentIterators.getParent(menuItem, PARENT_PANEL_MENU_PREDICATE);
+ if (parentPanelMenu != null) {
+ return parentPanelMenu.isDisabled();
+ }
+ return false;
+ }
+
+ private static class ParentPanelMenuPredicate implements Predicate<UIComponent> {
+ public boolean apply(UIComponent comp) {
+ return comp instanceof AbstractPanelMenu;
+ }
+ }
}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-02-11 17:06:31 UTC (rev 21638)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-02-11 19:33:18 UTC (rev 21639)
@@ -223,10 +223,15 @@
cursor: default;
}
-.rf-pm-itm.rf-pm-itm-dis:hover{
+.rf-pm-itm, .rf-pm-itm-dis:hover {
background-color: inherit;
}
+.rf-pm-top-itm-dis:hover {
+ background-color: inherit;
+ color: '#{richSkin.tabDisabledTextColor}';
+}
+
.rf-pm-top-gr-cnt {
}
15 years, 2 months
JBoss Rich Faces SVN: r21638 - trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-02-11 12:06:31 -0500 (Fri, 11 Feb 2011)
New Revision: 21638
Modified:
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java
Log:
RF-10461
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2011-02-11 15:55:20 UTC (rev 21637)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2011-02-11 17:06:31 UTC (rev 21638)
@@ -87,6 +87,8 @@
writer.endElement("pre");
JSFunction function = new JSFunction("SyntaxHighlighter.all");
writer.startElement("script", null);
+ writer.write("var brs = $('#" + this.getClientId(context).replaceAll(":", "\\\\\\\\:") + "').find('br');");
+ writer.write("brs.length && brs.replaceWith('\\n');");
writer.write(function.toScript());
writer.endElement("script");
writer.endElement("div");
15 years, 2 months
JBoss Rich Faces SVN: r21637 - trunk/ui/output/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-02-11 10:55:20 -0500 (Fri, 11 Feb 2011)
New Revision: 21637
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java
Log:
RF-10356
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-02-11 15:32:28 UTC (rev 21636)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-02-11 15:55:20 UTC (rev 21637)
@@ -72,7 +72,13 @@
}
public String getTarget() {
- return (String) getStateHelper().eval(Properties.target, getParent().getId());
+ UIComponent parent2 = getParent();
+ String id2 = parent2.getId();
+ if (id2 == null) {
+ parent2.getClientId();
+ id2 = parent2.getId();
+ }
+ return (String) getStateHelper().eval(Properties.target, id2);
}
public void setTarget(String target) {
15 years, 2 months
JBoss Rich Faces SVN: r21636 - in trunk/examples/richfaces-showcase/src/main/webapp: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-11 10:32:28 -0500 (Fri, 11 Feb 2011)
New Revision: 21636
Added:
trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css
Removed:
trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
Log:
https://issues.jboss.org/browse/RF-10474
Copied: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css (from rev 21622, trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss)
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-11 15:32:28 UTC (rev 21636)
@@ -0,0 +1,249 @@
+html{
+ height:100%;
+}
+body{
+ margin:0;
+ padding:0;
+ background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat;
+ font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+ height:100%;
+}
+fieldset{
+ margin:0;
+}
+ul.layout{
+ list-style:none;
+}
+a{
+ outline:none;
+ text-decoration:none;
+}
+a:hover{
+ text-decoration:underline;
+}
+p{
+ margin:0;
+ padding:0 0 10px;
+}
+#page{
+ margin:0 auto;
+ width:987px;
+}
+#header{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/header-bg.png') no-repeat top left;
+ height:90px;
+}
+#header .logo{
+ float:left;
+ margin-left:7px;
+ text-decoration:none;
+}
+#header .logo img{
+ border:none;
+}
+#header .right-controls{
+ float:right;
+}
+#header ul.top-links{
+ margin:5px 15px 0 0;
+ text-align:right;
+}
+#header ul.top-links li{
+ display:inline;
+ font-size:11px;
+}
+#header ul.top-links li a{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat;
+ color:#fff;
+ padding:0 8px 0 3px;
+ font:11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+}
+#header ul.top-links li.last a{
+ background:none;
+ padding:0 0 0 3px;
+}
+#header ul.top-links li.download-link a{
+ color:#eccb7b;
+}
+#header ul#skin-menu{
+ color:#89a0be;
+ cursor:default;
+ font-weight:bold;
+ margin:38px 15px 0 0;
+ text-align:right;
+}
+#header ul#skin-menu li{
+ cursor:pointer;
+ display:inline-block;
+ float:right;
+ height:25px;
+ margin-left:4px;
+ padding-left:5px;
+}
+#header ul#skin-menu li a{
+ color:#89A0BE;
+}
+#header ul#skin-menu li span{
+ height:25px;
+ font:bold 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+ padding:3px 5px 0 0;
+ display:inline-block;
+}
+
+#header ul#skin-menu li span:hover{
+ text-decoration:underline;
+}
+#header ul#skin-menu li.label span{
+ color:#999999;
+ cursor:default;
+ font-weight:normal;
+}
+
+#header ul#skin-menu li.current-skin{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') left -75px no-repeat;
+}
+#header ul#skin-menu li.current-skin span{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') right 0 repeat-x;
+ color:#fff;
+}
+#header ul#skin-menu li.label span:hover,
+#header ul#skin-menu li.current-skin span:hover{
+ text-decoration:none;
+}
+#page-content{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/page-bg.png') 0 0 repeat-y;
+ height:100%;
+ min-height:520px;
+ padding:13px 20px 5px;
+}
+#page-content .left-menu{
+ float:left;
+ margin-right:10px;
+ min-height:450px;
+ width:235px;
+}
+#page-content .content-container {
+ float:right;
+ width:700px;
+}
+#page-content .content-container fieldset.example-cnt{
+ background:#ffffff;
+ border:1px solid #dddddd;
+ border-top:0;
+ margin:0;
+ min-height:470px;
+ padding:15px 20px 10px;
+}
+.clear{
+ clear:both;
+ height:0%;
+}
+
+#footer{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/footer.png') top left no-repeat;
+ color:#2d4351;
+ text-align:center;
+ padding:15px 20px 10px;
+}
+
+.source .syntaxhighlighter .line{
+ white-space: normal !important;
+}
+
+a.show, a.hide{
+ font:bold 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+ color:#5F9CD0;
+ display:block;
+}
+
+/*--- RichFaces panelMenu styles overwriting ---*/
+
+.left-menu .rf-pm{
+ border:1px solid #B0BDC5;
+ border-bottom:0;
+}
+.left-menu .rf-pm .rf-pm-top-gr{
+ border:0;
+ border-bottom:1px solid #969b9e;
+ margin:0;
+ padding:0;
+}
+.left-menu .rf-pm .rf-pm-top-gr-hdr{
+ background:#c6cacc url(../images/pmenu_bg.png) left top repeat-x;
+ padding:3px 1px 2px 3px;
+}
+.left-menu .rf-pm .rf-pm-top-gr-hdr:hover{
+ background: #c6cacc url(../images/pmenu_bg.png) left top repeat-x;
+}
+.left-menu .rf-pm .rf-pm-top-gr-ico{
+ display:none;
+}
+.left-menu .rf-pm .rf-pm-top-gr-lbl{
+ color:#273945;
+ font-family:"Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+ margin-left:4px;
+}
+.left-menu .rf-pm .rf-pm-top-gr-lbl:hover{
+ color:#5a8eba;
+}
+.left-menu .rf-pm-exp{
+ background:#ffffff;
+}
+.left-menu .rf-pm-exp .rf-pm-itm{
+ border:0;
+ border-bottom:1px solid #dddddd;
+}
+.left-menu .rf-pm-exp .rf-pm-itm:hover{
+ background:none;
+}
+.left-menu .rf-pm-exp .rf-pm-itm-lbl:hover{
+ color:#5f9cd0;
+}
+.left-menu .rf-pm-exp .rf-pm-itm-sel,
+.left-menu .rf-pm-exp .rf-pm-itm-sel:hover{
+ /*background:#e3e8ef;*/
+}
+.left-menu .rf-pm-exp .rf-pm-itm-lbl{
+ color:#305f7b;
+ font:normal 11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+}
+.left-menu .rf-pm-exp .rf-pm-itm-sel .rf-pm-itm-lbl{
+ color:#5f9cd0;
+ font-weight:bold;
+}
+.left-menu .rf-pm-exp .rf-pm-itm-ico{
+ padding:0 !important;
+ width:5px;
+}
+
+/*--- RichFaces tablePanel styles overwriting ---*/
+.navigation .rf-tab-hdr-tabline-vis{
+ background:#ebf6fd;
+ border:0;
+ height:31px;
+ padding:0;
+}
+.navigation .rf-tab-hdr{
+ border:1px solid #dddddd;
+ padding:6px 10px 0;
+ margin-right: 3px;
+}
+.navigation .rf-tab-hdr-act{
+ background:#ffffff;
+ border-bottom:0;
+ color:#5F9CD0;
+}
+.navigation .rf-tab-hdr-act .rf-tab-lbl{
+ font-weight:bold;
+}
+.navigation .rf-tab-hdr-inact{
+ background:#c6cacc url(../images/pmenu_bg.png) left top repeat-x;
+ border:1px solid #bec3c7;
+}
+.navigation .rf-tab-hdr-spcr{
+ border-bottom:1px solid #dddddd;
+ padding:0 3px 0 0;
+}
+.navigation .rf-tab-lbl{
+ font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+}
Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss 2011-02-11 15:24:30 UTC (rev 21635)
+++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss 2011-02-11 15:32:28 UTC (rev 21636)
@@ -1,249 +0,0 @@
-html{
- height:100%;
-}
-body{
- margin:0;
- padding:0;
- background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat;
- font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
- height:100%;
-}
-fieldset{
- margin:0;
-}
-ul.layout{
- list-style:none;
-}
-a{
- outline:none;
- text-decoration:none;
-}
-a:hover{
- text-decoration:underline;
-}
-p{
- margin:0;
- padding:0 0 10px;
-}
-#page{
- margin:0 auto;
- width:987px;
-}
-#header{
- background:url('#{facesContext.externalContext.requestContextPath}/images/header-bg.png') no-repeat top left;
- height:90px;
-}
-#header .logo{
- float:left;
- margin-left:7px;
- text-decoration:none;
-}
-#header .logo img{
- border:none;
-}
-#header .right-controls{
- float:right;
-}
-#header ul.top-links{
- margin:5px 15px 0 0;
- text-align:right;
-}
-#header ul.top-links li{
- display:inline;
- font-size:11px;
-}
-#header ul.top-links li a{
- background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat;
- color:#fff;
- padding:0 8px 0 3px;
- font:11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
-}
-#header ul.top-links li.last a{
- background:none;
- padding:0 0 0 3px;
-}
-#header ul.top-links li.download-link a{
- color:#eccb7b;
-}
-#header ul#skin-menu{
- color:#89a0be;
- cursor:default;
- font-weight:bold;
- margin:38px 15px 0 0;
- text-align:right;
-}
-#header ul#skin-menu li{
- cursor:pointer;
- display:inline-block;
- float:right;
- height:25px;
- margin-left:4px;
- padding-left:5px;
-}
-#header ul#skin-menu li a{
- color:#89A0BE;
-}
-#header ul#skin-menu li span{
- height:25px;
- font:bold 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
- padding:3px 5px 0 0;
- display:inline-block;
-}
-
-#header ul#skin-menu li span:hover{
- text-decoration:underline;
-}
-#header ul#skin-menu li.label span{
- color:#999999;
- cursor:default;
- font-weight:normal;
-}
-
-#header ul#skin-menu li.current-skin{
- background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') left -75px no-repeat;
-}
-#header ul#skin-menu li.current-skin span{
- background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') right 0 repeat-x;
- color:#fff;
-}
-#header ul#skin-menu li.label span:hover,
-#header ul#skin-menu li.current-skin span:hover{
- text-decoration:none;
-}
-#page-content{
- background:url('#{facesContext.externalContext.requestContextPath}/images/page-bg.png') 0 0 repeat-y;
- height:100%;
- min-height:520px;
- padding:13px 20px 5px;
-}
-#page-content .left-menu{
- float:left;
- margin-right:10px;
- min-height:450px;
- width:235px;
-}
-#page-content .content-container {
- float:right;
- width:700px;
-}
-#page-content .content-container fieldset.example-cnt{
- background:#ffffff;
- border:1px solid #dddddd;
- border-top:0;
- margin:0;
- min-height:470px;
- padding:15px 20px 10px;
-}
-.clear{
- clear:both;
- height:0%;
-}
-
-#footer{
- background:url('#{facesContext.externalContext.requestContextPath}/images/footer.png') top left no-repeat;
- color:#2d4351;
- text-align:center;
- padding:15px 20px 10px;
-}
-
-.source .syntaxhighlighter .line{
- white-space: normal !important;
-}
-
-a.show, a.hide{
- font:bold 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
- color:#5F9CD0;
- display:block;
-}
-
-/*--- RichFaces panelMenu styles overwriting ---*/
-
-.left-menu .rf-pm{
- border:1px solid #B0BDC5;
- border-bottom:0;
-}
-.left-menu .rf-pm .rf-pm-top-gr{
- border:0;
- border-bottom:1px solid #969b9e;
- margin:0;
- padding:0;
-}
-.left-menu .rf-pm .rf-pm-top-gr-hdr{
- background:#c6cacc url(../images/pmenu_bg.png) left top repeat-x;
- padding:3px 1px 2px 3px;
-}
-.left-menu .rf-pm .rf-pm-top-gr-hdr:hover{
- background: #c6cacc url(../images/pmenu_bg.png) left top repeat-x;
-}
-.left-menu .rf-pm .rf-pm-top-gr-ico{
- display:none;
-}
-.left-menu .rf-pm .rf-pm-top-gr-lbl{
- color:#273945;
- font-family:"Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
- margin-left:4px;
-}
-.left-menu .rf-pm .rf-pm-top-gr-lbl:hover{
- color:#5a8eba;
-}
-.left-menu .rf-pm-exp{
- background:#ffffff;
-}
-.left-menu .rf-pm-exp .rf-pm-itm{
- border:0;
- border-bottom:1px solid #dddddd;
-}
-.left-menu .rf-pm-exp .rf-pm-itm:hover{
- background:none;
-}
-.left-menu .rf-pm-exp .rf-pm-itm-lbl:hover{
- color:#5f9cd0;
-}
-.left-menu .rf-pm-exp .rf-pm-itm-sel,
-.left-menu .rf-pm-exp .rf-pm-itm-sel:hover{
- /*background:#e3e8ef;*/
-}
-.left-menu .rf-pm-exp .rf-pm-itm-lbl{
- color:#305f7b;
- font:normal 11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
-}
-.left-menu .rf-pm-exp .rf-pm-itm-sel .rf-pm-itm-lbl{
- color:#5f9cd0;
- font-weight:bold;
-}
-.left-menu .rf-pm-exp .rf-pm-itm-ico{
- padding:0 !important;
- width:5px;
-}
-
-/*--- RichFaces tablePanel styles overwriting ---*/
-.navigation .rf-tab-hdr-tabline-vis{
- background:#ebf6fd;
- border:0;
- height:31px;
- padding:0;
-}
-.navigation .rf-tab-hdr{
- border:1px solid #dddddd;
- padding:6px 10px 0;
- margin-right: 3px;
-}
-.navigation .rf-tab-hdr-act{
- background:#ffffff;
- border-bottom:0;
- color:#5F9CD0;
-}
-.navigation .rf-tab-hdr-act .rf-tab-lbl{
- font-weight:bold;
-}
-.navigation .rf-tab-hdr-inact{
- background:#c6cacc url(../images/pmenu_bg.png) left top repeat-x;
- border:1px solid #bec3c7;
-}
-.navigation .rf-tab-hdr-spcr{
- border-bottom:1px solid #dddddd;
- padding:0 3px 0 0;
-}
-.navigation .rf-tab-lbl{
- font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
-}
Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-11 15:24:30 UTC (rev 21635)
+++ trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-11 15:32:28 UTC (rev 21636)
@@ -19,7 +19,7 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
-<h:outputStylesheet library="css" name="application.xcss"/>
+<h:outputStylesheet library="css" name="application.css"/>
</h:head>
<h:body>
<div id="page">
15 years, 2 months
JBoss Rich Faces SVN: r21635 - trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/task.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-11 10:24:30 -0500 (Fri, 11 Feb 2011)
New Revision: 21635
Modified:
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java
Log:
https://issues.jboss.org/browse/RF-10474
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java 2011-02-11 15:11:03 UTC (rev 21634)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java 2011-02-11 15:24:30 UTC (rev 21635)
@@ -21,6 +21,8 @@
*/
package org.richfaces.cdk.task;
+import java.io.IOException;
+import java.io.InputStream;
import java.text.MessageFormat;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletionService;
@@ -39,6 +41,8 @@
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Closeables;
/**
* @author Nick Belaevski
@@ -74,6 +78,12 @@
Resource resource = createResource(facesContext, resourceInfo);
CurrentResourceContext.getInstance(facesContext).setResource(resource);
//TODO check content type
+
+ if (shouldCheckForEL(resource) && containsELExpression(resource)) {
+ log.info(MessageFormat.format("Skipping {0} because it contains EL-expressions", resourceInfo));
+ return;
+ }
+
resourceWriter.writeResource(skin, resource);
} catch (Exception e) {
if (skin != null) {
@@ -151,6 +161,34 @@
this.faces = faces;
}
+ private boolean containsELExpression(Resource resource) {
+ InputStream is = null;
+ try {
+ is = resource.getInputStream();
+ byte[] bs = ByteStreams.toByteArray(is);
+
+ for (int i = 0; i < bs.length; i++) {
+ byte b = bs[i];
+
+ if (b == '#' && i + 1 < bs.length && bs[i + 1] == '{') {
+ return true;
+ }
+ }
+ } catch (IOException e) {
+ log.error(e.getMessage(), e);
+ } finally {
+ Closeables.closeQuietly(is);
+ }
+
+ return false;
+ }
+
+ private boolean shouldCheckForEL(Resource resource) {
+ String resourceName = resource.getResourceName();
+
+ return resourceName.endsWith(".js") || resourceName.endsWith(".css");
+ }
+
public void setLog(Log log) {
this.log = log;
}
15 years, 2 months
JBoss Rich Faces SVN: r21634 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-02-11 10:11:03 -0500 (Fri, 11 Feb 2011)
New Revision: 21634
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml
Log:
RF-10122: drop down menu example is fixed
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml 2011-02-11 15:04:10 UTC (rev 21633)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml 2011-02-11 15:11:03 UTC (rev 21634)
@@ -61,18 +61,13 @@
<h:outputText value="Links" />
</h:panelGrid>
</f:facet>
- <rich:menuItem submitMode="none"
+ <rich:menuItem submitMode="client"
onclick="document.location.href='http://labs.jboss.com/jbossrichfaces/'">
- <h:outputLink value="http://labs.jboss.com/jbossrichfaces/">
- <h:outputText value="RichFaces Home Page"></h:outputText>
- </h:outputLink>
+ <h:outputText value="RichFaces Home Page" />
</rich:menuItem>
- <rich:menuItem submitMode="none"
+ <rich:menuItem submitMode="client"
onclick="document.location.href='http://jboss.com/index.html?module=bb&op=viewforum&f=261'">
- <h:outputLink
- value="http://jboss.com/index.html?module=bb&op=viewforum&f=261">
- <h:outputText value="RichFaces Forum"></h:outputText>
- </h:outputLink>
+ <h:outputText value="RichFaces Forum" />
</rich:menuItem>
</rich:dropDownMenu>
</rich:toolbar>
15 years, 2 months