10:43 a.m.
Author: sergeyhalipov
Date: 2007-11-27 11:43:53 -0500 (Tue, 27 Nov 2007)
New Revision: 4292
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListHeaderGradient.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListSelectGradient.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
Skinning for ordering list:
http://jira.jboss.com/jira/browse/RF-1402
http://jira.jboss.com/jira/browse/RF-1401
http://jira.jboss.com/jira/browse/RF-1303
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -55,8 +55,6 @@
private final static String ATTRIBUTE_CLASS_DISABLED_CONTROL =
"disabledControlClass";
- private final static String STYLE_SKIN_CONTROL_BUTTON = "ol_button_control";
-
private final static String DIS_CONTROL_ID_PREFIX = "dis";
private final static String CONTROL_ID_UP = "up";
@@ -72,8 +70,8 @@
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";
+ private final static String ATTRIBUTE_CLASS_BUTTON =
"rich-ordering-list-button";
+ private final static String ATTRIBUTE_CLASS_BUTTON_DISABLED =
"rich-ordering-list-button-disabled";
protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new
OrderingComponentRendererBase.ControlsHelper[] {
new OrderingComponentRendererBase.ControlsHelper("top",
"TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP,
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -139,10 +139,9 @@
this.bundleName = bundleName;
}
- public void encodeCaption(FacesContext context, UIComponent component)
- throws IOException {
- encodeCaption(context, component, OrderingComponentControlsHelper.FACET_CAPTION,
"ol_label ol_out_label rich-ordering-list-caption");
-
+ public void encodeCaption(FacesContext context, UIComponent component) throws
IOException {
+ encodeCaption(context, component, OrderingComponentControlsHelper.FACET_CAPTION,
+ "rich-ordering-list-caption");
}
protected void encodeCaption(FacesContext context, UIComponent component, String
facetCaption, String captionStyle)
@@ -167,11 +166,11 @@
public void encodeHeader(FacesContext context, UIOrderingBaseComponent component)
throws IOException {
- encodeHeader(context, component, "rich-table-header", "ol_col
rich-table-header-cell", "headerClass");
+ encodeHeader(context, component, "rich-ordering-list-table-header",
"rich-ordering-list-table-header-cell", "headerClass");
}
- protected void encodeHeader(FacesContext context, UIOrderingBaseComponent component,
String rowStyle,
- String styleCell, String headerClassAttr) throws IOException {
+ protected void encodeHeader(FacesContext context, UIOrderingBaseComponent component,
String rowClass,
+ String cellClass, String headerClassAttr) throws IOException {
ResponseWriter writer = context.getResponseWriter();
//UIComponent header = orderingList.getHeader();
Iterator headers = component.columns();
@@ -181,8 +180,8 @@
String headerClass = (String) component.getAttributes().get(headerClassAttr);
writer.startElement("tr", component);
- encodeStyleClass(writer, null, rowStyle, null, headerClass);
- encodeHeaderFacets(context, writer, headers, styleCell, headerClass,
"header", "th", component);
+ encodeStyleClass(writer, null, rowClass, null, headerClass);
+ encodeHeaderFacets(context, writer, headers, cellClass, headerClass,
"header", "th", component);
writer.endElement("tr");
@@ -211,8 +210,7 @@
writer.startElement(HTML.DIV_ELEM, orderingList);
writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null);
//FIXME:
- writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " +
currentStyle, null);
- //HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ?
"ol_control_shown" : "ol_control_hidden") + currentStyle
+ writer.writeAttribute(HTML.class_ATTRIBUTE, currentStyle, null);
String style = null;
if (enabled) {
style = "display:block;";
@@ -225,14 +223,14 @@
writer.startElement(HTML.DIV_ELEM, orderingList);
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);
- writer.writeAttribute(HTML.onmouseup_ATTRIBUTE,
"this.className='ol_button'", null);
- writer.writeAttribute(HTML.onmouseout_ATTRIBUTE,
"this.className='ol_button'", null);
+ writer.writeAttribute(HTML.onmouseover_ATTRIBUTE,
"this.className='rich-ordering-list-button-light'", null);
+ writer.writeAttribute(HTML.onmousedown_ATTRIBUTE,
"this.className='rich-ordering-list-button-press'", null);
+ writer.writeAttribute(HTML.onmouseup_ATTRIBUTE,
"this.className='rich-ordering-list-button'", null);
+ writer.writeAttribute(HTML.onmouseout_ATTRIBUTE,
"this.className='rich-ordering-list-button'", null);
}
writer.startElement(HTML.DIV_ELEM, orderingList);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_content", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE,
"rich-ordering-list-button-content", null);
}
@@ -296,7 +294,7 @@
writer.startElement(element, column);
if (!headers.hasNext()) {
- skinCellClass = "ol_endcol rich-table-header-cell-end";
+ skinCellClass = "rich-ordering-list-table-header-cell-end";
}
encodeStyleClass(writer, null, skinCellClass, headerClass, columnHeaderClass);
getUtils().encodeAttribute(context, column, "colspan");
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -131,21 +131,21 @@
writer.startElement(HTML.TR_ELEMENT, table);
writer.writeAttribute("id", clientId, null);
- StringBuffer rowClassName = new StringBuffer("ol_normal
rich-ordering-list-row");
- StringBuffer cellClassName = new StringBuffer("ol_cell
rich-ordering-list-cell");
+ StringBuffer rowClassName = new StringBuffer("rich-ordering-list-row");
+ StringBuffer cellClassName = new StringBuffer("rich-ordering-list-cell");
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, table);
ItemState state = (ItemState) variables.getVariable(ITEM_STATE_VAR_NAME);
if (state.isActive()) {
- rowClassName.append(" ol_active rich-ordering-list-row-active");
+ rowClassName.append(" rich-ordering-list-row-active");
cellClassName.append(" rich-ordering-list-cell-active");
}
boolean selected = state.isSelected();
if (selected) {
- rowClassName.append(" ol_select rich-ordering-list-row-selected");
+ rowClassName.append(" rich-ordering-list-row-selected");
cellClassName.append(" rich-ordering-list-cell-selected");
}
@@ -164,7 +164,7 @@
writer.startElement(HTML.td_ELEM, table);
if (!iterator.hasNext()) {
- cellClassName.insert(7, " ol_endcol ");
+ cellClassName.append(" rich-ordering-list-cell-end");
}
writer.writeAttribute("class", cellClassName.toString(), null);
renderChildren(context, column);
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListClickedGradient.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -39,7 +39,7 @@
}
public OrderingListClickedGradient() {
- super(7, 15, 9, "headerGradientColor", Skin.headerBackgroundColor);
+ super(7, 15, 9, Skin.generalBackgroundColor, "tabBackgroundColor");
}
}
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListHeaderGradient.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListHeaderGradient.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListHeaderGradient.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -30,6 +30,6 @@
*/
public class OrderingListHeaderGradient extends BaseGradient {
public OrderingListHeaderGradient() {
- super(8, 18, 9, "headerGradientColor", Skin.headerBackgroundColor);
+ super(8, 18, 9, Skin.generalBackgroundColor, "tabBackgroundColor");
}
}
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListSelectGradient.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListSelectGradient.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/gradientimages/OrderingListSelectGradient.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -29,6 +29,6 @@
*/
public class OrderingListSelectGradient extends BaseGradient {
public OrderingListSelectGradient() {
- super(11, 18, "headerGradientColor",
"additionalBackgroundColor");
+ super(11, 18, 18, "additionalBackgroundColor",
"headerGradientColor");
}
}
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-27
16:43:53 UTC (rev 4292)
@@ -46,13 +46,13 @@
private static final Dimension DIMENSION = new Dimension(15, 15);
- protected static final String ICON_COLOR = "headerTextColor";
- protected static final String BACKGROUND_COLOR = "headerBackgroundColor";
- protected static final String BORDER_COLOR = "subBorderColor";
+ protected static final String ICON_COLOR = "generalTextColor";
+ protected static final String BACKGROUND_COLOR = "tabBackgroundColor";
+ protected static final String BORDER_COLOR = "generalBackgroundColor";
protected static final String DISABLED_ICON_COLOR = "tabDisabledTextColor";
protected static final String DISABLED_BACKGROUND_COLOR =
"tabBackgroundColor";
- protected static final String DISABLED_BORDER_COLOR = "subBorderColor";
+ protected static final String DISABLED_BORDER_COLOR =
"generalBackgroundColor";
public OrderingListIconBase() {
setRenderer(new GifRenderer());
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-27
16:43:53 UTC (rev 4292)
@@ -5,242 +5,303 @@
<f:verbatim><![CDATA[
+.rich-ordering-control-disabled {
+ border : 1px solid;
+ margin-bottom : 3px;
+}
-.ol_button_layout{padding : 15px 8px 15px 0px;}
-.ol_button_border{border : 1px solid #bfbfc0; margin-bottom : 3px;}
+.rich-ordering-control-top {
+ border : 1px solid;
+ margin-bottom : 3px;
+}
-.ol_button {
- background : top left #C6D6EA repeat-x;
+.rich-ordering-control-bottom {
+ border : 1px solid;
+ margin-bottom : 3px;
+}
+
+.rich-ordering-control-up {
+ border : 1px solid;
+ margin-bottom : 3px;
+}
+
+.rich-ordering-control-down {
+ border : 1px solid;
+ margin-bottom : 3px;
+}
+
+.rich-ordering-list-button {
+ background : top left repeat-x;
cursor : pointer;
padding : 2px;
- font-family : Arial; font-size :11px;
}
-.ol_button_disabled {
- background : top left #C6D6EA repeat-x;
+.rich-ordering-list-button-disabled {
+ background : top left 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;}
-.ol_center_button_col_valign{vertical-align : middle}
-.ol_right_button_col_valign{vertical-align : middle}
+.rich-ordering-list-button-light {
+ background : top left repeat-x;
+ border-style: solid;
+ cursor : pointer;
+ padding: 1px;
+}
-.ol_button_content {
- font-family : Arial;
- font-size :11px;
+/*
+.rich-ordering-list-button-dis {
+ border : 1px solid #bfbfc0;
+ margin-bottom : 3px;
+ padding : 1px
+}
+*/
+
+.rich-ordering-list-button-press {
+ background : top left repeat-x;
+ border-style: solid;
+ padding : 2px 0px 0px 2px;
+}
+
+.rich-ordering-list-button-valign {
+ vertical-align : middle;
+}
+
+.rich-ordering-list-button-layout {
+ padding : 15px 8px 15px 0px;
+}
+
+.rich-ordering-list-button-content {
padding : 0px 4px 0px 1px;
text-align : left;
white-space: nowrap;
}
-.ol_button_content img {
+.rich-ordering-list-button-content img {
margin-right: 2px;
vertical-align: middle;
}
-
-/*
-.ol_button_clicked {
- background : repeat scroll left top;
- border : 1px solid #bfbfc0;
- margin-bottom : 3px;
- cursor : pointer;
- padding : 1px;
-}
-.ol_button_dis {
- background : #bfbfc0;
- border : 1px solid #bfbfc0;
- margin-bottom : 3px;
- padding : 1px;
+.rich-ordering-list-caption {
+ height: 8px;
+ padding : 3px 3px 3px 8px
}
-.ol_button_press {
- background : #4A75B5;
- border : 1px solid #bfbfc0;
- margin-bottom : 3px;
- padding : 2px 0px 0px 2px;
+.rich-ordering-list-body {
+ border : 0px solid;
}
-*/
-.ol_caption {
- padding : 1px;
- height: 8px;
+.rich-ordering-list-output {
+ border : 1px solid;
+ margin : 0px 8px 8px 8px;
+ background: none repeat scroll 0% 50%;
}
-.ol_body{border : 0px solid #bfbfc0;}
-
-.ol_label{font-family : Arial; font-size :11px; font-weight : bold;}
-
-.ol_out_label{padding : 3px 3px 3px 8px}
-
-.ol_list{background : #FFFFFF; border : 1px solid #bfbfc0;}
-
-.ol_outputlist{ margin : 0px 8px 8px 8px;}
-
-.ol_list_content {
- /*overflow-y : scroll;
- overflow-x: auto;*/
+.rich-ordering-list-content {
overflow: auto;
- /*width: 200px;
- height: 150px;*/
}
-.ol_list_header {
+.rich-ordering-list-header {
overflow: hidden;
- /*width: 300px;*/
height: 18px;
}
-.ol_internal_header_tab {
+.rich-ordering-list-items {
background : repeat scroll left top;
- /*width : 100%;*/
+ width: 100%;
}
-.ol_internal_header_tab th{background : none top left repeat-x #C6D6EA; color : #000000;
font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid
#bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px
solid #FFFFFF; padding : 2px}
+.rich-ordering-list-active {
+ background : repeat scroll left top;
+ width: 100%;
+}
-.ol_internal_header_tab .ol_endcol {
- border-right : 0px;
- white-space: nowrap;
+.rich-ordering-list-disabled {
+ background : repeat scroll left top;
+ width: 100%;
}
-.ol_internal_tab {
- width : 100%;
+.rich-ordering-list-row-active {
+ background : transparent none repeat-x scroll left top;
+ width: 100%;
}
-.ol_internal_tab .ol_endcol{border-right : 0px;}
+.rich-ordering-list-row-selected {
+ background : transparent none repeat-x scroll left top;
+ width: 100%;
+}
-.ol_internal_tab td{font-family : Arial; font-size :11px; padding : 2px;border-right :
1px solid #FFFFFF; border-left : 1px solid #FFFFFF;}
-
-.ol_internal_tab .ol_endcol{border-right : 0px;}
-
-.ol_internal_tab tr.ol_select{background : #EAF0F8}
-
-.ol_internal_tab tr.ol_active {
- /*background : #EAF0F8; color : #4A75B5;*/
+.rich-ordering-list-table-header-cell {
+ background : none top left repeat-x;
+ border-style: solid;
+ padding : 2px;
}
-.ol_internal_tab tr.ol_active * {
- font-weight: bold;
- /*color : #4A75B5;*/
+.rich-ordering-list-table-header-cell-end {
+ border-right : 0px;
+ white-space: nowrap;
}
-.ol_internal_tab tr.ol_normal {
+.rich-ordering-list-cell-end {
+ border-right : 0px;
+ white-space: nowrap;
}
-.ol_control_shown {
- /*visibility: visible;*/
- display: block;
+.rich-ordering-list-cell {
+ padding : 2px;
+ white-space: nowrap;
}
-.ol_control_hidden {
- /*visibility: hidden;*/
- display: none;
-}
-.disableSelection {
+.rich-ordering-list-ds {
-moz-user-select: -moz-none;
}
-.disableSelection input {
+.rich-ordering-list-fk {
+ width: 1px;
+ position: absolute;
+ left: -32767px;
+}
+
+.rich-ordering-list-ds input {
-moz-user-select: text;
}
]]>
</f:verbatim>
-<u:selector name=".ol_cell, .ol_cell *">
- <u:style name="color" skin="generalTextColor"/>
- <u:style name="font-size" skin="generalSizeFont"/>
- <u:style name="font-family" skin="generalFamilyFont"/>
- <u:style name="white-space" value="nowrap"/>
-</u:selector>
-<u:selector name=".ol_control_bn_up">
+<u:selector name=".rich-ordering-list-button">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconUp"
/>
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_down">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconDown" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_top">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconTop" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_bottom">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconBottom" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_up">
- <u:style name="disabled" value="true"/>
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconUpDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_down">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconDownDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_top">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconTopDisabled" />
- </u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_bottom">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled"
/>
- </u:style>
-</u:selector>
-
-<u:selector name=".ol_button">
- <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:style name="background-color" skin="tabBackgroundColor" />
+ <u:style name="color" skin="generalTextColor"/>
+ <u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="font-size" skin="headerSizeFont"/>
</u:selector>
-<u:selector name=".ol_button_disabled">
+<u:selector name=".rich-ordering-list-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:style name="background-color" skin="tabBackgroundColor" />
<u:style name="color" skin="tabDisabledTextColor"/>
+ <u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="font-size" skin="headerSizeFont"/>
</u:selector>
-<u:selector name=".ol_button_light">
- <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=".rich-ordering-list-button-light">
+ <u:style name="background-image">
+ <f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient"
/>
+ </u:style>
+ <u:style name="background-color" skin="tabBackgroundColor"
/>
+ <u:style name="border-color" skin="tableBorderColor" />
+ <u:style name="border-width" skin="tableBorderWidth" />
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ <u:style name="color" skin="generalTextColor"/>
+ </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=".rich-ordering-list-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="generalBackgroundColor"
/>
+ <u:style name="border-color" skin="tableBorderColor" />
+ <u:style name="border-width" skin="tableBorderWidth" />
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ <u:style name="color" skin="generalTextColor"/>
+ </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"
/>
- </u:style>
- <u:style name="background-color" skin="headerBackgroundColor"
/>
-</u:selector>
+ <u:selector name=".rich-ordering-list-table-header-cell">
+ <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:style name="color" skin="headerTextColor" />
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ <u:style name="font-weight" skin="headerWeightFont" />
+ <u:style name="border-width" skin="tableBorderWidth" />
+ <u:style name="border-top-color" skin="subBorderColor" />
+ <u:style name="border-bottom-color" skin="tableBorderColor"
/>
+ <u:style name="border-right-color" skin="tableBorderColor"
/>
+ <u:style name="border-left-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-table-header-cell-end">
+ <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:style name="color" skin="headerTextColor" />
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ <u:style name="font-weight" skin="headerWeightFont" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-cell-end">
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ </u:selector>
-<u:selector name=".ol_internal_tab tr.ol_select">
- <u:style name="background-image">
- <f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient"
/>
- </u:style>
- <u:style name="background-color" skin="additionalBackgroundColor"
/>
-</u:selector>
-
-<u:selector name=".ol_internal_tab tr.ol_active">
- <u:style name="font-weight" value="bold" />
-</u:selector>
+ <u:selector name=".rich-ordering-list-items">
+ <u:style name="background-color" skin="generalBackgroundColor"
/>
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-output">
+ <u:style name="background-color" skin="generalBackgroundColor"
/>
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-cell">
+ <u:style name="color" skin="generalTextColor"/>
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-control-disabled">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+ <u:selector name=".rich-ordering-control-top">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+ <u:selector name=".rich-ordering-control-bottom">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+ <u:selector name=".rich-ordering-control-up">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+ <u:selector name=".rich-ordering-control-down">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-button-content">
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-caption">
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ <u:style name="font-weight" skin="headerWeightFont" />
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-row-active">
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ <u:style name="font-weight" skin="headerWeightFont" />
+ <u:style name="background-image">
+ <f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient"
/>
+ </u:style>
+ <u:style name="background-color" skin="headerGradientColor"
/>
+ </u:selector>
+
+ <u:selector name=".rich-ordering-list-row-selected">
+ <u:style name="background-image">
+ <f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient"
/>
+ </u:style>
+ <u:style name="background-color" skin="headerGradientColor"
/>
+ </u:selector>
+}
+
</f:template>
\ No newline at end of file
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-11-27
16:43:53 UTC (rev 4292)
@@ -7,9 +7,9 @@
}
Richfaces.ListBase.ORDERING_LIST_CLASSES = {
- normal : "ol_internal_tab rich-ordering-list-items",
- disabled : "ol_internal_tab rich-ordering-list-disabled",
- active : "ol_internal_tab rich-ordering-list-active"
+ normal : "rich-ordering-list-items",
+ disabled : "rich-ordering-list-disabled",
+ active : "rich-ordering-list-active"
}
Richfaces.ListBase.ASC = "acs";
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-11-27
16:43:53 UTC (rev 4292)
@@ -4,10 +4,10 @@
Richfaces.SelectItems = {
CLASSES : {
ROW : {
- ACTIVE : "ol_active rich-ordering-list-row-active",
- SELECTED : "ol_select rich-ordering-list-row-selected",
+ ACTIVE : "rich-ordering-list-row-active",
+ SELECTED : "rich-ordering-list-row-selected",
DISABLED : "rich-ordering-list-row-disabled",
- NORMAL : "ol_normal rich-ordering-list-row"
+ NORMAL : "rich-ordering-list-row"
},
CELL : {
ACTIVE : "rich-ordering-list-cell-active",
Modified:
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-27
16:36:10 UTC (rev 4291)
+++
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-27
16:43:53 UTC (rev 4292)
@@ -24,40 +24,41 @@
<f:clientId var="clientId"/>
- <div id="#{clientId}" class="disableSelection"
x:passThruWithExclusions="id,class">
- <input id="#{clientId}focusKeeper" type="button"
value="" style="width: 1px; position: absolute; left: -32767px;"
name="focusKeeper"/>
+ <div id="#{clientId}" class="rich-ordering-list-ds"
x:passThruWithExclusions="id,class">
+ <input id="#{clientId}focusKeeper" type="button"
value="" name="focusKeeper"
+ class="rich-ordering-list-fk" />
<input id="#{clientId}valueKeeper" type="hidden"
name="#{clientId}" value="#{component.submittedString}"/>
- <table id="#{clientId}table" cellpadding="0"
cellspacing="0" class="ol_body">
+ <table id="#{clientId}table" cellpadding="0"
cellspacing="0" class="rich-ordering-list-body">
<tbody>
<tr>
- <td colspan="2" class="ol_caption">
+ <td colspan="2" class="rich-ordering-list-caption">
<f:call name="encodeCaption"/>
</td>
</tr>
<tr>
<td>
- <div id="#{clientId}headerBox" class="ol_list
ol_outputlist">
- <jsp:scriptlet><![CDATA[
- String contentContainerStyle = "";
- if (component.getAttributes().get("listWidth") != null) {
- contentContainerStyle =
contentContainerStyle.concat("width:").concat(component.getAttributes().get("listWidth").toString()).concat("px;");
- variables.setVariable("contentContainerStyle",
contentContainerStyle);
- }
+ <div id="#{clientId}headerBox"
class="rich-ordering-list-output">
+ <jsp:scriptlet><![CDATA[
+ String contentContainerStyle = "";
+ if (component.getAttributes().get("listWidth") != null) {
+ contentContainerStyle =
contentContainerStyle.concat("width:").concat(component.getAttributes().get("listWidth").toString()).concat("px;");
+ variables.setVariable("contentContainerStyle",
contentContainerStyle);
+ }
]]></jsp:scriptlet>
- <div class="ol_list_header"
style="#{contentContainerStyle}">
- <table id="#{clientId}internal_header_tab"
class="ol_internal_header_tab rich-ordering-list-items"
cellpadding="0" cellspacing="0">
+ <div class="rich-ordering-list-header" style="width:
#{component.attributes['listWidth']}px;">
+ <table id="#{clientId}internal_header_tab"
class="rich-ordering-list-items" cellpadding="0"
cellspacing="0">
<f:call name="encodeHeader"/>
</table>
</div>
- <jsp:scriptlet><![CDATA[
- if (component.getAttributes().get("listHeight") != null) {
- contentContainerStyle =
contentContainerStyle.concat("height:").concat(component.getAttributes().get("listHeight").toString()).concat("px;");
- variables.setVariable("contentContainerStyle",
contentContainerStyle);
- }
- ]]></jsp:scriptlet>
- <div id="#{clientId}contentBox" class="ol_list_content"
style="#{contentContainerStyle}">
- <table id="#{clientId}internal_tab"
class="ol_internal_tab" cellpadding="0" cellspacing="0">
+ <jsp:scriptlet><![CDATA[
+ if (component.getAttributes().get("listHeight") != null) {
+ contentContainerStyle =
contentContainerStyle.concat("height:").concat(component.getAttributes().get("listHeight").toString()).concat("px;");
+ variables.setVariable("contentContainerStyle",
contentContainerStyle);
+ }
+ ]]></jsp:scriptlet>
+ <div id="#{clientId}contentBox"
class="rich-ordering-list-content" style="width:
#{component.attributes['listWidth']}px;
height:#{component.attributes['listHeight']}px;">
+ <table id="#{clientId}internal_tab"
class="rich-ordering-list-items" cellpadding="0"
cellspacing="0">
<tbody id="#{clientId}tbody">
<vcp:body>
<f:call name="encodeRows" />
@@ -67,8 +68,8 @@
</div>
</div>
</td>
- <td class="ol_center_button_col_valign">
- <div class="ol_button_layout">
+ <td class="rich-ordering-list-button-valign">
+ <div class="rich-ordering-list-button-layout">
<f:call name="encodeControlsFacets" />
</div>
<f:clientId var="clientId"/>