[richfaces-svn-commits] JBoss Rich Faces SVN: r4421 - in branches/3.1.x/ui/listShuttle/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Dec 3 09:14:18 EST 2007
Author: vmolotkov
Date: 2007-12-03 09:14:17 -0500 (Mon, 03 Dec 2007)
New Revision: 4421
Modified:
branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
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:
listHeight,sourceListWidth,targetListWidth were added
Modified: branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-03 12:24:05 UTC (rev 4420)
+++ branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-03 14:14:17 UTC (rev 4421)
@@ -66,6 +66,24 @@
</property>
<property>
+ <name>sourceListWidth</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>targetListWidth</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>listsHeight</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
<name>orderControlsVisible</name>
<classname>boolean</classname>
<description>
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-03 12:24:05 UTC (rev 4420)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-03 14:14:17 UTC (rev 4421)
@@ -35,23 +35,16 @@
.ol_outputlist{ margin : 0px 8px 8px 8px;}
.ol_list_content {
- overflow-y : scroll;
- overflow-x: auto;
- /*width: 300px;
- height: 232px;*/
- width: 200px;
- height: 150px;
+ overflow: auto;
}
.ol_list_header {
overflow: hidden;
- /*width: 300px;*/
height: 18px;
}
.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}
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-03 12:24:05 UTC (rev 4420)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-03 14:14:17 UTC (rev 4421)
@@ -12,6 +12,7 @@
>
<jsp:directive.page import="org.richfaces.renderkit.OrderingComponentRendererBase" />
+ <jsp:directive.page import="org.richfaces.component.util.HtmlUtil" />
<h:styles>css/listShuttle.xcss</h:styles>
@@ -59,12 +60,31 @@
<tr>
<td>
<div id="#{clientId}headerBox" class="ol_list ol_outputlist">
- <div class="ol_list_header" style="width: #{component.attributes['listWidth']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ String contentContainerStyle = "";
+ String sourceListWidthValue = (String) component.getAttributes().get("sourceListWidth");
+ if (sourceListWidthValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("width:").concat(HtmlUtil.qualifySize(sourceListWidthValue)).concat(";");
+ 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">
<f:call name="encodeSLHeader"/>
</table>
</div>
- <div id="#{clientId}contentBox" class="ol_list_content" style="width: #{component.attributes['listWidth']}px; height:#{component.attributes['listHeight']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ String listHeightValue = (String) component.getAttributes().get("listsHeight");
+ if (listHeightValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("height:").concat(HtmlUtil.qualifySize(listHeightValue)).concat(";");
+ 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">
<tbody id="#{clientId}tbody">
<jsp:scriptlet><![CDATA[
@@ -103,12 +123,30 @@
<tr>
<td>
<div id="#{clientId}tlHeaderBox" class="ol_list ol_outputlist">
- <div class="ol_list_header" style="width: #{component.attributes['listWidth']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ contentContainerStyle = "";
+ String targetListWidthValue = (String) component.getAttributes().get("targetListWidth");
+ if (targetListWidthValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("width:").concat(HtmlUtil.qualifySize(targetListWidthValue)).concat(";");
+ variables.setVariable("contentContainerStyle", contentContainerStyle);
+ }
+ ]]>
+ </jsp:scriptlet>
+ <div class="ol_list_header" style="#{contentContainerStyle}">
<table id="#{clientId}tlInternal_header_tab" class="ol_internal_header_tab rich-ordering-list-items" cellpadding="0" cellspacing="0">
<f:call name="encodeTLHeader"/>
</table>
</div>
- <div id="#{clientId}tlContentBox" class="ol_list_content" style="width: #{component.attributes['listWidth']}px; height:#{component.attributes['listHeight']}px;">
+ <jsp:scriptlet>
+ <![CDATA[
+ if (listHeightValue != null) {
+ contentContainerStyle = contentContainerStyle.concat("height:").concat(HtmlUtil.qualifySize(listHeightValue)).concat(";");
+ variables.setVariable("contentContainerStyle", contentContainerStyle);
+ }
+ ]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}tlContentBox" class="ol_list_content" style="#{contentContainerStyle}">
<table id="#{clientId}tlInternal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0">
<tbody id="#{clientId}tlTbody">
<jsp:scriptlet><![CDATA[
More information about the richfaces-svn-commits
mailing list