[richfaces-svn-commits] JBoss Rich Faces SVN: r4505 - in branches/3.1.x/ui: listShuttle/src/main/resources/org/richfaces/renderkit/html/css and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Dec 5 11:06:43 EST 2007
Author: sergeyhalipov
Date: 2007-12-05 11:06:43 -0500 (Wed, 05 Dec 2007)
New Revision: 4505
Modified:
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
Log:
List shuttle skinning. Not finished.
Modified: branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-05 16:06:43 UTC (rev 4505)
@@ -101,15 +101,23 @@
ListShuttleRowKey listShuttleRowKey = (ListShuttleRowKey) table.getRowKey();
if (listShuttleRowKey != null) {
- if (shuttleRendererTableHolder.isSource() == listShuttleRowKey.isFacadeSource()) {
+ boolean source = shuttleRendererTableHolder.isSource();
+ if (source == listShuttleRowKey.isFacadeSource()) {
ResponseWriter writer = context.getResponseWriter();
String clientId = holder.getTable().getClientId(context);
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();
+ StringBuffer cellClassName = new StringBuffer();
+ if (source) {
+ rowClassName.append("rich-shuttle-source-row");
+ cellClassName.append("rich-shuttle-source-cell");
+ } else {
+ rowClassName.append("rich-shuttle-target-row");
+ cellClassName.append("rich-shuttle-target-cell");
+ }
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, table);
SelectionState selectionState = (SelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME);
@@ -117,15 +125,25 @@
boolean active = itemState.isActive();
if (active) {
- rowClassName.append(" rich-ordering-list-row-active");
- cellClassName.append(" rich-ordering-list-cell-active");
+ if (source) {
+ rowClassName.append(" rich-shuttle-source-row-active");
+ cellClassName.append(" rich-shuttle-source-cell-active");
+ } else {
+ rowClassName.append(" rich-shuttle-target-row-active");
+ cellClassName.append(" rich-shuttle-target-cell-active");
+ }
}
boolean selected = itemState.isSelected();
selectionState.addState(selected);
if (selected) {
- rowClassName.append(" rich-ordering-list-row-selected");
- cellClassName.append(" rich-ordering-list-cell-selected");
+ if (source) {
+ rowClassName.append(" rich-shuttle-source-row-selected");
+ cellClassName.append(" rich-shuttle-source-cell-selected");
+ } else {
+ rowClassName.append(" rich-shuttle-target-row-selected");
+ cellClassName.append(" rich-shuttle-target-cell-selected");
+ }
}
writer.writeAttribute("class", rowClassName.toString(), null);
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-05 16:06:43 UTC (rev 4505)
@@ -19,11 +19,7 @@
.shuttle_center_button_col_valign{vertical-align : middle}
.shuttle_right_button_col_valign{vertical-align : middle}
-.rich-shuttle-body {
- /*width: 100%;*/
-}
-
-.ol_list_content {
+.rich-shuttle-list-content {
overflow: auto;
}
@@ -41,35 +37,26 @@
width:100%;
}
-.ol_internal_tab {
- background : repeat scroll left top;
+.rich-shuttle-internal-tab {
width:100%;
}
-.ol_internal_tab .ol_endcol{border-right : 0px;}
+.rich-shuttle-internal-tab .ol_endcol{border-right : 0px;}
-/*.ol_internal_tab td{font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0; border-top : 1px solid #FFFFFF; padding : 2px;}
-*/
+.rich-shuttle-internal-tab tr.ol_select{background : #EAF0F8}
-.ol_internal_tab tr.ol_select{background : #EAF0F8}
-
-.ol_internal_tab tr.ol_active {
+.rich-shuttle-internal-tab tr.ol_active {
background : #EAF0F8; color : #4A75B5;
}
-.ol_internal_tab tr.ol_active td{
+.rich-shuttle-internal-tab tr.ol_active td{
color : #4A75B5;
}
-.ol_internal_tab tr.ol_normal {
-}
-
.ol_control_shown {
- /*visibility: visible;*/
display: block;
}
.ol_control_hidden {
- /*visibility: hidden;*/
display: none;
}
@@ -85,7 +72,7 @@
<u:style name="border-style" value="none" />
</u:selector>
-<u:selector name=".ol_cell, .ol_cell *">
+<u:selector name=".rich-shuttle-source-cell, .rich-shuttle-target-cell, .rich-shuttle-source-cell *, .rich-shuttle-target-cell *">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
@@ -148,14 +135,14 @@
<u:style name="background-color" skin="headerBackgroundColor" />
</u:selector>
-<u:selector name=".ol_internal_tab tr.ol_select">
+<u:selector name=".rich-shuttle-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:selector name=".rich-shuttle-internal-tab tr.ol_active">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
</u:style>
@@ -176,7 +163,7 @@
.rich-list-shuttle-button, .rich-list-shuttle-button-disabled {
background : top left repeat-x;
- padding : 2px;
+ padding : 2px 0px;
}
.rich-list-shuttle-button {
@@ -261,17 +248,14 @@
.rich-ordering-list-disabled {
background : repeat scroll left top;
- /*width: 100%;*/
}
-.rich-ordering-list-row-active {
+.rich-shuttle-source-row-active, .rich-shuttle-target-row-active {
background : transparent none repeat-x scroll left top;
- /*width: 100%;*/
}
-.rich-ordering-list-row-selected {
+.rich-shuttle-source-row-selected, .rich-shuttle-target-row-selected {
background : transparent none repeat-x scroll left top;
- /*width: 100%;*/
}
.rich-ordering-list-table-header-cell {
@@ -280,7 +264,7 @@
padding : 2px;
}
-.rich-ordering-list-table-header-cell-end {
+.rich-shuttle-header-tab-cell-end {
border-right : 0px;
white-space: nowrap;
padding : 2px;
@@ -292,26 +276,22 @@
padding : 2px;
}
-.rich-ordering-list-cell {
+.rich-shuttle-source-cell, .rich-shuttle-target-cell {
padding : 2px;
white-space: nowrap;
}
-.rich-ordering-list-cell-selected, rich-ordering-list-cell-selected * {
+.rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected * {
padding : 2px;
white-space: nowrap;
}
-.rich-ordering-list-cell-active {
+.rich-shuttle-source-cell-active, .rich-shuttle-target-cell-active {
padding: 1px 2px 1px 2px;
border-top: 1px dotted gray;
border-bottom: 1px dotted gray;
}
-.rich-ordering-list-cell-active * {
-
-}
-
.rich-ordering-list-ds {
-moz-user-select: -moz-none;
}
@@ -411,7 +391,7 @@
<u:style name="border-left-color" skin="panelBorderColor" />
</u:selector>
- <u:selector name=".rich-ordering-list-table-header-cell-end">
+ <u:selector name=".rich-shuttle-header-tab-cell-end">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
</u:style>
@@ -446,13 +426,13 @@
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-cell-selected, .rich-ordering-list-cell-selected *">
+ <u:selector name=".rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected *">
<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-list-cell-active, .rich-ordering-list-cell-active *">
+ <u:selector name=".rich-shuttle-source-cell-active, .rich-shuttle-target-cell-active, .rich-shuttle-source-cell-active *, .rich-shuttle-target-cell-active *">
<u:style name="font-size" skin="generalSizeFont" />
<u:style name="font-family" skin="generalFamilyFont" />
</u:selector>
@@ -472,7 +452,7 @@
<u:style name="font-weight" skin="headerWeightFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-row-selected">
+ <u:selector name=".rich-shuttle-source-row-selected, .rich-shuttle-target-row-selected">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
</u:style>
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-05 16:06:43 UTC (rev 4505)
@@ -144,4 +144,21 @@
copyAll: function (e) { this.moveItems(this.sourceList, this.targetList, this.sourceList.shuttleItems); return false; },
remove: function (e) { this.moveItems(this.targetList, this.sourceList, this.targetList.selectedItems); return false; },
removeAll: function (e) { this.moveItems(this.targetList, this.sourceList, this.targetList.shuttleItems); return false; }
+};
+
+Richfaces.SelectItems.CLASSES = {
+ ROW : {
+ ACTIVE : "rich-shuttle-source-row-active",
+ SELECTED : "rich-shuttle-source-row-selected",
+ ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
+ DISABLED : "rich-shuttle-source-row-disabled",
+ NORMAL : "rich-shuttle-source-row"
+ },
+ CELL : {
+ ACTIVE : "rich-shuttle-source-cell-active",
+ SELECTED : "rich-shuttle-source-cell-selected",
+ ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
+ DISABLED : "rich-shuttle-source-cell-disabled",
+ NORMAL : "rich-shuttle-source-cell"
+ }
};
\ No newline at end of file
Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-05 16:06:43 UTC (rev 4505)
@@ -88,8 +88,8 @@
}
]]>
</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">
+ <div id="#{clientId}contentBox" class="rich-shuttle-list-content" style="#{contentContainerStyle}">
+ <table id="#{clientId}internal_tab" class="rich-shuttle-internal-tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tbody">
<jsp:scriptlet><![CDATA[
writer.write(encodedSourceRows);
@@ -147,8 +147,8 @@
}
]]>
</jsp:scriptlet>
- <div id="#{clientId}tlContentBox" class="ol_list_content" style="#{trContentContainerStyle}">
- <table id="#{clientId}tlInternal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0">
+ <div id="#{clientId}tlContentBox" class="rich-shuttle-list-content" style="#{trContentContainerStyle}">
+ <table id="#{clientId}tlInternal_tab" class="rich-shuttle-internal-tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tlTbody">
<jsp:scriptlet><![CDATA[
writer.write(encodedTargetRows);
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-12-05 16:05:20 UTC (rev 4504)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-12-05 16:06:43 UTC (rev 4505)
@@ -354,7 +354,7 @@
writer.startElement(element, column);
if (!headers.hasNext()) {
- skinCellClass = "rich-ordering-list-table-header-cell-end";
+ skinCellClass = skinCellClass + "-end";
}
encodeStyleClass(writer, null, skinCellClass, headerClass, columnHeaderClass);
getUtils().encodeAttribute(context, column, "colspan");
More information about the richfaces-svn-commits
mailing list