[richfaces-svn-commits] JBoss Rich Faces SVN: r4472 - in branches/3.1.x/ui: listShuttle/src/main/resources/org/richfaces/renderkit/html/css and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Dec 4 15:22:39 EST 2007
Author: sergeyhalipov
Date: 2007-12-04 15:22:37 -0500 (Tue, 04 Dec 2007)
New Revision: 4472
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/templates/org/richfaces/htmlListShuttle.jspx
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
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-04 18:51:39 UTC (rev 4471)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-04 20:22:37 UTC (rev 4472)
@@ -76,11 +76,11 @@
}
public void encodeSLHeader(FacesContext context, UIOrderingBaseComponent shuttle) throws IOException {
- encodeHeader(context, shuttle, "rich-table-header", "ol_internal_header_tab_cell", "sourceHeaderClass");
+ encodeHeader(context, shuttle, "rich-table-header", "rich-shuttle-header-tab-cell", "sourceHeaderClass");
}
public void encodeTLHeader(FacesContext context, UIOrderingBaseComponent shuttle) throws IOException {
- encodeHeader(context, shuttle, "rich-table-header", "ol_internal_header_tab_cell", "sourceHeaderClass");
+ encodeHeader(context, shuttle, "rich-table-header", "rich-shuttle-header-tab-cell", "sourceHeaderClass");
}
protected String encodeRows(FacesContext context, UIOrderingBaseComponent shuttle, boolean source) throws IOException {
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-04 18:51:39 UTC (rev 4471)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-04 20:22:37 UTC (rev 4472)
@@ -19,32 +19,23 @@
.shuttle_center_button_col_valign{vertical-align : middle}
.shuttle_right_button_col_valign{vertical-align : middle}
-.ol_body{border : 0px solid #bfbfc0;}
+.rich-shuttle-body {
+ width: 100%;
+}
-.ol_list{background : #FFFFFF; border : 1px solid #bfbfc0;}
-
-.ol_outputlist{ margin : 0px 8px 8px 8px;}
-
.ol_list_content {
overflow: auto;
}
-.ol_list_header {
+.rich-shuttle-list-header {
overflow: hidden;
- height: 18px;
}
-.ol_internal_header_tab {
- background : repeat scroll left top;
+.rich-shuttle-header-tab-cell {
+ padding : 0px 2px;
}
-.ol_internal_header_tab_cell{
- background : none top left repeat-x;
- border-style: solid;
- padding : 2px;
-}
-
-.ol_internal_header_tab .ol_endcol {
+.rich-shuttle-internal-header-tab .ol_endcol {
border-right : 0px;
white-space: nowrap;
width:100%;
@@ -88,6 +79,12 @@
]]>
</f:verbatim>
+<u:selector name=".rich-shuttle-list">
+ <u:style name="background-color" skin="generalBackgroundColor"/>
+ <u:style name="border-width" value="0px" />
+ <u:style name="border-style" value="none" />
+</u:selector>
+
<u:selector name=".ol_cell, .ol_cell *">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
@@ -249,14 +246,17 @@
height: 18px;
}
-.rich-ordering-list-items {
- background : repeat scroll left top;
- /*width: 100%;*/
+.rich-shuttle-source-items {
+ margin: 0px 8px 8px;
}
+.rich-shuttle-target-items {
+ margin: 0px 8px 8px 0px;
+}
+
.rich-ordering-list-active {
background : repeat scroll left top;
- /*width: 100%;*/
+ width: 100%;
}
.rich-ordering-list-disabled {
@@ -326,14 +326,14 @@
</f:verbatim>
<u:selector name=".rich-list-shuttle">
- <u:style name="background-color" skin="additionalBackgroundColor" />
+ <!--u:style name="background-color" skin="additionalBackgroundColor" />
<u:style name="border-color" skin="tableBorderColor" />
<u:style name="border-width" skin="tableBorderWidth" />
- <u:style name="border-style" value="solid" />
+ <u:style name="border-style" value="solid" /-->
<u:style name="-moz-user-select" value="-moz-none" />
</u:selector>
-<u:selector name=".ol_internal_header_tab_cell">
+<u:selector name=".rich-shuttle-header-tab-cell">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
</u:style>
@@ -425,9 +425,12 @@
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
- <u:selector name=".rich-ordering-list-items">
+ <u:selector name=".rich-shuttle-source-items, .rich-shuttle-target-items">
<u:style name="background-color" skin="generalBackgroundColor" />
<u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-width" skin="tableBorderWidth" />
+ <u:style name="border-style" value="solid" />
+ <u:style name="overflow" value="auto" />
</u:selector>
<u:selector name=".rich-ordering-list-output">
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-04 18:51:39 UTC (rev 4471)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-04 20:22:37 UTC (rev 4472)
@@ -56,14 +56,14 @@
</tr>
<tr>
<td>
- <div>
+ <div class="rich-shuttle-source-items">
<input id="#{clientId}focusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" name="focusKeeper"/>
- <table id="#{clientId}table" cellpadding="0" cellspacing="0" class="ol_body">
+ <table id="#{clientId}table" cellpadding="0" cellspacing="0" class="rich-shuttle-body">
<tbody>
<tr>
<td>
- <div id="#{clientId}headerBox" class="ol_list ol_outputlist">
+ <div id="#{clientId}headerBox" class="rich-shuttle-list">
<jsp:scriptlet>
<![CDATA[
String contentContainerStyle = "";
@@ -74,8 +74,8 @@
}
]]>
</jsp:scriptlet>
- <div class="ol_list_header" style="#{contentContainerStyle}">
- <table id="#{clientId}internal_header_tab" class="ol_internal_header_tab" cellpadding="0" cellspacing="0">
+ <div class="rich-shuttle-list-header" style="#{contentContainerStyle}">
+ <table id="#{clientId}internal_header_tab" class="rich-shuttle-internal-header-tab" cellpadding="0" cellspacing="0">
<f:call name="encodeSLHeader"/>
</table>
</div>
@@ -114,16 +114,16 @@
</td>
<td>
- <div>
+ <div class="rich-shuttle-target-items" >
<input type="hidden" value=":" style="display: none;" name="#{clientId}" />
<input id="#{clientId}tlFocusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" name="focusKeeper"/>
- <table id="#{clientId}tlTable" cellpadding="0" cellspacing="0" class="ol_body">
+ <table id="#{clientId}tlTable" cellpadding="0" cellspacing="0" class="rich-shuttle-body">
<tbody>
<tr>
<td>
- <div id="#{clientId}tlHeaderBox" class="ol_list ol_outputlist">
+ <div id="#{clientId}tlHeaderBox" class="rich-shuttle-list">
<jsp:scriptlet>
<![CDATA[
String trContentContainerStyle = "";
@@ -134,8 +134,8 @@
}
]]>
</jsp:scriptlet>
- <div class="ol_list_header" style="#{trContentContainerStyle}">
- <table id="#{clientId}tlInternal_header_tab" class="ol_internal_header_tab" cellpadding="0" cellspacing="0">
+ <div class="rich-shuttle-list-header" style="#{trContentContainerStyle}">
+ <table id="#{clientId}tlInternal_header_tab" class="rich-shuttle-internal-header-tab" cellpadding="0" cellspacing="0">
<f:call name="encodeTLHeader"/>
</table>
</div>
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-12-04 18:51:39 UTC (rev 4471)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-04 20:22:37 UTC (rev 4472)
@@ -346,15 +346,15 @@
setFocus : function() {
this.focusKeeper.focus();
this.focusKeeper.focused = true;
- if (this.isListActive()) {
- this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.active;
- }
+ //if (this.isListActive()) {
+ // this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.active;
+ //}
},
focusListener : function(e) {
e = e || window.event;
this.focusKeeper.focused = false;
- this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.normal;
+ //this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.normal;
if (Richfaces.SelectItems.isSelected(this.activeItem)) {
Richfaces.SelectItems.doSelect(this.activeItem);
More information about the richfaces-svn-commits
mailing list