3:03 p.m.
Author: sergeyhalipov
Date: 2007-11-16 16:03:35 -0500 (Fri, 16 Nov 2007)
New Revision: 4059
Modified:
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
Ordering list: cursor style for disabled buttons.
Modified:
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
===================================================================
---
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-16
20:44:13 UTC (rev 4058)
+++
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-16
21:03:35 UTC (rev 4059)
@@ -107,6 +107,9 @@
private final static String DEFAULT_LABEL_DOWN = "Down";
private final static String DEFAULT_LABEL_BOTTOM = "Last";
+ private final static String ATTRIBUTE_CLASS_BUTTON = "ol_button";
+ private final static String ATTRIBUTE_CLASS_BUTTON_DISABLED =
"ol_button_disabled";
+
protected static abstract class ControlsHelper {
private String name;
@@ -124,7 +127,7 @@
private String styleFromAttribute;
- private String buttonStyle;
+ private String buttonStyleClass;
private boolean enable;
@@ -133,7 +136,7 @@
public abstract boolean isRendered(FacesContext context, UIOrderingList list);
public ControlsHelper(String name, String bundlePropertyName, String defaultText,
String imageURI,
- String facetName, String styleClassName, String styleFromAttribute, String
buttonStyle,
+ String facetName, String styleClassName, String styleFromAttribute, String
buttonStyleClass,
String idSuffix, String customEvent, boolean isEnable) {
super();
this.name = name;
@@ -145,7 +148,7 @@
this.styleFromAttribute = styleFromAttribute;
this.idSuffix = idSuffix;
this.customEvent = customEvent;
- this.buttonStyle = buttonStyle;
+ this.buttonStyleClass = buttonStyleClass;
this.enable = isEnable;
}
@@ -181,8 +184,8 @@
return styleFromAttribute;
}
- public String getButtonStyle() {
- return buttonStyle;
+ public String getButtonStyleClass() {
+ return buttonStyleClass;
}
public boolean isEnable() {
@@ -196,7 +199,7 @@
protected static final ControlsHelper[] HELPERS = new ControlsHelper[] {
new ControlsHelper("top", "TOP_LABEL", DEFAULT_LABEL_TOP,
OrderingListIconTop.class.getName(), FACET_TOP,
- " rich-ordering-control-top", ATTRIBUTE_CLASS_TOP_CONTROL,
"ol_control_bn_top",
+ " rich-ordering-control-top", ATTRIBUTE_CLASS_TOP_CONTROL,
ATTRIBUTE_CLASS_BUTTON,
CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -205,7 +208,7 @@
},
new ControlsHelper("disabledTop", "TOP_LABEL", DEFAULT_LABEL_TOP,
OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP,
- " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
"ol_control_dbn_top",
+ " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
ATTRIBUTE_CLASS_BUTTON_DISABLED,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -214,7 +217,7 @@
},
new ControlsHelper("up", "UP_LABEL", DEFAULT_LABEL_UP,
OrderingListIconUp.class.getName(), FACET_UP,
- " rich-ordering-control-up", ATTRIBUTE_CLASS_UP_CONTROL,
"ol_control_bn_up",
+ " rich-ordering-control-up", ATTRIBUTE_CLASS_UP_CONTROL,
ATTRIBUTE_CLASS_BUTTON,
CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -223,7 +226,7 @@
},
new ControlsHelper("disabledUp", "UP_LABEL", DEFAULT_LABEL_UP,
OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP,
- " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
"ol_control_dbn_up",
+ " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
ATTRIBUTE_CLASS_BUTTON_DISABLED,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -232,7 +235,7 @@
},
new ControlsHelper("down", "DOWN_LABEL", DEFAULT_LABEL_DOWN,
OrderingListIconDown.class.getName(), FACET_DOWN,
- " rich-ordering-control-down", ATTRIBUTE_CLASS_DOWN_CONTROL,
"ol_control_bn_down",
+ " rich-ordering-control-down", ATTRIBUTE_CLASS_DOWN_CONTROL,
ATTRIBUTE_CLASS_BUTTON,
CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -241,7 +244,7 @@
},
new ControlsHelper("disabledDown", "DOWN_LABEL",
DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN,
- " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
"ol_control_dbn_down",
+ " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
ATTRIBUTE_CLASS_BUTTON_DISABLED,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -250,7 +253,7 @@
},
new ControlsHelper("bottom", "BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM,
OrderingListIconBottom.class.getName(), FACET_BOTTOM,
- " rich-ordering-control-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL,
"ol_control_bn_bottom",
+ " rich-ordering-control-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL,
ATTRIBUTE_CLASS_BUTTON,
CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -259,7 +262,7 @@
},
new ControlsHelper("disabledBottom", "BOTTOM_LABEL",
DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM,
- " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
"ol_control_dbn_bottom",
+ " rich-ordering-control-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL,
ATTRIBUTE_CLASS_BUTTON_DISABLED,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false) {
public boolean isRendered(FacesContext context, UIOrderingList list) {
@@ -436,7 +439,7 @@
if (!useFacet) {
writer.startElement(HTML.DIV_ELEM, orderingList);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, helper.getButtonStyleClass(), null);
if (helper.enable) {
writer.writeAttribute(HTML.onmouseover_ATTRIBUTE,
"this.className='ol_button_light'", null);
writer.writeAttribute(HTML.onmousedown_ATTRIBUTE,
"this.className='ol_button_press'", null);
Modified:
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
---
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-16
20:44:13 UTC (rev 4058)
+++
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-16
21:03:35 UTC (rev 4059)
@@ -8,7 +8,20 @@
.ol_button_layout{padding : 15px 8px 15px 0px;}
.ol_button_border{border : 1px solid #bfbfc0; margin-bottom : 3px;}
-.ol_button{background : top left #C6D6EA repeat-x; cursor : pointer; padding : 2px;
font-family : Arial; font-size :11px;}
+
+.ol_button {
+ background : top left #C6D6EA repeat-x;
+ cursor : pointer;
+ padding : 2px;
+ font-family : Arial; font-size :11px;
+}
+
+.ol_button_disabled {
+ background : top left #C6D6EA repeat-x;
+ padding : 2px;
+ font-family : Arial; font-size :11px;
+}
+
.ol_button_light{background : top left #C6D6EA repeat-x; border : 1px solid
#E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;}
.ol_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px;
padding : 1px}
.ol_button_press{background : top left repeat-x #EAF0F8; border : 1px solid #E79A00;
padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;}
@@ -178,6 +191,13 @@
<u:style name="background-color" skin="headerBackgroundColor"
/>
</u:selector>
+<u:selector name=".ol_button_disabled">
+ <u:style name="background-image">
+ <f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient"
/>
+ </u:style>
+ <u:style name="background-color" skin="headerBackgroundColor"
/>
+</u:selector>
+
<u:selector name=".ol_button_light">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient"
/>