Author: sergeyhalipov Date: 2007-11-16 15:06:14 -0500 (Fri, 16 Nov 2007) New Revision: 4053 Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss Log: Ordering list - background gradient for clicked button. 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 19:43:56 UTC (rev 4052) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-16 20:06:14 UTC (rev 4053) @@ -101,6 +101,11 @@ private final static String CONTROL_ID_BOTTOM = "last"; + private final static String DEFAULT_LABEL_TOP = "First"; + private final static String DEFAULT_LABEL_UP = "Up"; + private final static String DEFAULT_LABEL_DOWN = "Down"; + private final static String DEFAULT_LABEL_BOTTOM = "Last"; + protected static abstract class ControlsHelper { private String name; @@ -189,7 +194,7 @@ }; protected static final ControlsHelper[] HELPERS = new ControlsHelper[] { - new ControlsHelper("top", "TOP_LABEL", "Top", OrderingListIconTop.class.getName(), FACET_TOP, + 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", CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true) { @@ -198,7 +203,7 @@ } }, - new ControlsHelper("disabledTop", "TOP_LABEL", "Top", OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, + 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", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false) { @@ -207,7 +212,7 @@ } }, - new ControlsHelper("up", "UP_LABEL", "Up", OrderingListIconUp.class.getName(), FACET_UP, + 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", CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true) { @@ -216,7 +221,7 @@ } }, - new ControlsHelper("disabledUp", "UP_LABEL", "Up", OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, + 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", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false) { @@ -225,7 +230,7 @@ } }, - new ControlsHelper("down", "DOWN_LABEL", "Down", OrderingListIconDown.class.getName(), FACET_DOWN, + 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", CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true) { @@ -234,7 +239,7 @@ } }, - new ControlsHelper("disabledDown", "DOWN_LABEL", "Down", OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, + 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", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false) { @@ -243,7 +248,7 @@ } }, - new ControlsHelper("bottom", "BOTTOM_LABEL", "Bottom", OrderingListIconBottom.class.getName(), FACET_BOTTOM, + 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", CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true) { @@ -252,7 +257,7 @@ } }, - new ControlsHelper("disabledBottom", "BOTTOM_LABEL", "Bottom", OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, + 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", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false) { Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java 2007-11-16 19:43:56 UTC (rev 4052) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java 2007-11-16 20:06:14 UTC (rev 4053) @@ -25,16 +25,22 @@ import java.awt.geom.AffineTransform; import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; /** * @author Siarhej Chalipau * */ -public class OrderingListClickedGradient extends OrderingListHeaderGradient { +public class OrderingListClickedGradient extends BaseGradient { @Override protected void paint(ResourceContext resourceContext, Graphics2D g2d) { - g2d.transform(new AffineTransform(1., 0., 0., -1., 0., 18.)); + g2d.transform(new AffineTransform(1., 0., 0., -1., 0., 15.)); super.paint(resourceContext, g2d); } + + public OrderingListClickedGradient() { + super(7, 15, 9, "headerGradientColor", Skin.headerBackgroundColor); + } } 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 19:43:56 UTC (rev 4052) +++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-16 20:06:14 UTC (rev 4053) @@ -176,13 +176,20 @@ <u:style name="background-color" skin="headerBackgroundColor" /> </u:selector> -<u:selector name=".ol_button_clicked"> +<u:selector name=".ol_button_light"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient" /> + <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_press"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient" /> + </u:style> + <u:style name="background-color" skin="headerGradientColor" /> +</u:selector> + <u:selector name=".ol_internal_header_tab th"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />