11:03 a.m.
Author: vmolotkov
Date: 2007-12-04 12:03:39 -0500 (Tue, 04 Dec 2007)
New Revision: 4458
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
Log:
layout was corrected
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
16:46:40 UTC (rev 4457)
+++
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-04
17:03:39 UTC (rev 4458)
@@ -74,11 +74,11 @@
}
public void encodeSLHeader(FacesContext context, UIOrderingBaseComponent shuttle) throws
IOException {
- encodeHeader(context, shuttle, "rich-table-header", "ol_col
rich-table-header-cell", "sourceHeaderClass");
+ encodeHeader(context, shuttle, "rich-table-header",
"ol_internal_header_tab_cell", "sourceHeaderClass");
}
public void encodeTLHeader(FacesContext context, UIOrderingBaseComponent shuttle) throws
IOException {
- encodeHeader(context, shuttle, "rich-table-header", "ol_col
rich-table-header-cell", "sourceHeaderClass");
+ encodeHeader(context, shuttle, "rich-table-header",
"ol_internal_header_tab_cell", "sourceHeaderClass");
}
protected String encodeRows(FacesContext context, UIOrderingBaseComponent shuttle,
boolean source) throws IOException {
@@ -141,6 +141,11 @@
writer.writeAttribute("class", cellClassName.toString(), null);
+ writer.startElement(HTML.IMG_ELEMENT, table);
+ writer.writeAttribute(HTML.src_ATTRIBUTE,
getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context,
null), null);
+ writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;",
null);
+ writer.endElement(HTML.IMG_ELEMENT);
+
renderChildren(context, column);
if (!columnRendered) {
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
16:46:40 UTC (rev 4457)
+++
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-04
17:03:39 UTC (rev 4458)
@@ -44,19 +44,23 @@
.ol_internal_header_tab {
background : repeat scroll left top;
- width: 100%;
}
-.ol_internal_header_tab th{background : url(ol_images/bg_header.png) 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}
+.ol_internal_header_tab_cell{
+ background : none top left repeat-x;
+ border-style: solid;
+ padding : 2px;
+}
.ol_internal_header_tab .ol_endcol {
border-right : 0px;
white-space: nowrap;
+ width:100%;
}
.ol_internal_tab {
background : repeat scroll left top;
- width: 100%;
+ width:100%;
}
.ol_internal_tab .ol_endcol{border-right : 0px;}
@@ -155,13 +159,6 @@
<u:style name="background-color" skin="headerBackgroundColor"
/>
</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=".ol_internal_tab tr.ol_select">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient"
/>
@@ -259,27 +256,27 @@
.rich-ordering-list-items {
background : repeat scroll left top;
- width: 100%;
+ /*width: 100%;*/
}
.rich-ordering-list-active {
background : repeat scroll left top;
- width: 100%;
+ /*width: 100%;*/
}
.rich-ordering-list-disabled {
background : repeat scroll left top;
- width: 100%;
+ /*width: 100%;*/
}
.rich-ordering-list-row-active {
background : transparent none repeat-x scroll left top;
- width: 100%;
+ /*width: 100%;*/
}
.rich-ordering-list-row-selected {
background : transparent none repeat-x scroll left top;
- width: 100%;
+ /*width: 100%;*/
}
.rich-ordering-list-table-header-cell {
@@ -333,6 +330,22 @@
]]>
</f:verbatim>
+<u:selector name=".ol_internal_header_tab_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-list-shuttle-button">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient"
/>
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
16:46:40 UTC (rev 4457)
+++
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-04
17:03:39 UTC (rev 4458)
@@ -128,15 +128,15 @@
<div id="#{clientId}tlHeaderBox" class="ol_list
ol_outputlist">
<jsp:scriptlet>
<![CDATA[
- contentContainerStyle = "";
+ String trContentContainerStyle = "";
String targetListWidthValue = (String)
component.getAttributes().get("targetListWidth");
if (targetListWidthValue != null) {
- contentContainerStyle =
contentContainerStyle.concat("width:").concat(HtmlUtil.qualifySize(targetListWidthValue)).concat(";");
- variables.setVariable("contentContainerStyle",
contentContainerStyle);
+ trContentContainerStyle =
trContentContainerStyle.concat("width:").concat(HtmlUtil.qualifySize(targetListWidthValue)).concat(";");
+ variables.setVariable("trContentContainerStyle",
trContentContainerStyle);
}
]]>
</jsp:scriptlet>
- <div class="ol_list_header"
style="#{contentContainerStyle}">
+ <div class="ol_list_header"
style="#{trContentContainerStyle}">
<table id="#{clientId}tlInternal_header_tab"
class="ol_internal_header_tab" cellpadding="0"
cellspacing="0">
<f:call name="encodeTLHeader"/>
</table>
@@ -144,12 +144,12 @@
<jsp:scriptlet>
<![CDATA[
if (listHeightValue != null) {
- contentContainerStyle =
contentContainerStyle.concat("height:").concat(HtmlUtil.qualifySize(listHeightValue)).concat(";");
- variables.setVariable("contentContainerStyle",
contentContainerStyle);
+ trContentContainerStyle =
trContentContainerStyle.concat("height:").concat(HtmlUtil.qualifySize(listHeightValue)).concat(";");
+ variables.setVariable("trContentContainerStyle",
trContentContainerStyle);
}
]]>
</jsp:scriptlet>
- <div id="#{clientId}tlContentBox"
class="ol_list_content" style="#{contentContainerStyle}">
+ <div id="#{clientId}tlContentBox"
class="ol_list_content" style="#{trContentContainerStyle}">
<table id="#{clientId}tlInternal_tab"
class="ol_internal_tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tlTbody">
<jsp:scriptlet><![CDATA[