You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/04/27 16:54:33 UTC
svn commit: r938486 - in /myfaces/tobago/trunk:
example/demo/src/main/webapp/reference/
example/test/src/main/webapp/tc/selectManyListbox/
theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/
theme/scarbor...
Author: lofwyr
Date: Tue Apr 27 14:54:32 2010
New Revision: 938486
URL: http://svn.apache.org/viewvc?rev=938486&view=rev
Log:
TOBAGO-823: new layout and selectManyListbox
- fine tuning
Added:
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/property/
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/property/tobago-theme-config.properties
- copied, changed from r937997, myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/property/
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/property/
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/property/tobago-theme-config.properties
- copied, changed from r937997, myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/property/
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/property/tobago-theme-config.properties
- copied, changed from r937997, myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties
Modified:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/select.jsp
myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectManyListbox/selectManyListbox.xhtml
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/select.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/select.jsp?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/select.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/select.jsp Tue Apr 27 14:54:32 2010
@@ -47,8 +47,7 @@
</tc:selectBooleanCheckbox>
<%-- code-sniplet-start id="selectManyListbox" --%>
- <tx:selectManyListbox inline="true" id="LabeledInlineMultiSelect"
- label="Contact via: ">
+ <tx:selectManyListbox inline="true" label="Contact via: ">
<f:selectItem itemValue="Phone" itemLabel="Phone"/>
<f:selectItem itemValue="eMail" itemLabel="eMail"/>
<f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
@@ -94,15 +93,13 @@
</tx:selectOneChoice>
<%-- code-sniplet-start id="selectOneListbox" --%>
- <tx:selectOneListbox id="LabeledInlineSingleSelect"
- label="Contact via: " height="90px">
+ <tx:selectOneListbox label="Contact via: ">
<f:selectItem itemValue="Phone" itemLabel="Phone"/>
<f:selectItem itemValue="eMail" itemLabel="eMail"/>
<f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
<f:selectItem itemValue="Fax" itemLabel="Faxscimile"/>
</tx:selectOneListbox>
- <tx:selectOneListbox id="LabeledInlineSingleSelect1"
- label="Contact via: " height="90px">
+ <tx:selectOneListbox label="Contact via: ">
<f:selectItem itemValue="Phone" itemLabel="Phone"/>
<f:selectItem itemValue="eMail" itemLabel="eMail"/>
<f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
@@ -156,4 +153,4 @@
</tc:box>
</jsp:body>
-</layout:overview>
\ No newline at end of file
+</layout:overview>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectManyListbox/selectManyListbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectManyListbox/selectManyListbox.xhtml?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectManyListbox/selectManyListbox.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/selectManyListbox/selectManyListbox.xhtml Tue Apr 27 14:54:32 2010
@@ -11,16 +11,16 @@
<tc:gridLayoutConstraint width="630px" height="600px"/>
<f:facet name="layout">
<!-- fixme: rows="20px" -->
- <tc:gridLayout columns="*;2*" rows="auto;20px" columnSpacing="30px"/>
+ <tc:gridLayout columns="*;2*" rows="auto;20px;auto;auto;auto;auto;auto;auto" columnSpacing="30px"/>
</f:facet>
<tc:messages>
<tc:gridLayoutConstraint columnSpan="2"/>
</tc:messages>
-
+
<tc:label value="tc"/>
<tc:label value="tx"/>
-
+
<tc:selectManyListbox>
<tc:selectItem itemValue="a" itemLabel="A Value"/>
<tc:selectItem itemValue="b" itemLabel="An Alternative"/>
@@ -65,8 +65,8 @@
<tc:selectItem itemValue="a" itemLabel="A Value"/>
<tc:selectItem itemValue="b" itemLabel="An Alternative"/>
</tx:selectManyListbox>
-
+
<tc:button label="submit"/>
-
+
</tc:page>
</f:view>
Copied: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/property/tobago-theme-config.properties (from r937997, myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/property/tobago-theme-config.properties)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/property/tobago-theme-config.properties?p2=myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/property/tobago-theme-config.properties&p1=myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/property/tobago-theme-config.properties&r1=937997&r2=938486&rev=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_6_0/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -15,12 +15,11 @@
# limitations under the License.
#
-Box.paddingTopWhenToolbar=0
-Box.extraPaddingHeightWhenToolbar=23
+# theme: scarborough
+# agent: msie_6_0
-# IE can't have td with 0px height
-Messages.fixedHeight=1
+SelectManyListbox.minimumHeight=38
+SelectManyListbox.preferredHeight=86
-ToolBar.small_bottom_Height=56
-ToolBar.big_bottom_Height=73
-ToolBar.fixedHeight=31
+SelectOneListbox.minimumHeight=38
+SelectOneListbox.preferredHeight=86
Added: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/property/tobago-theme-config.properties?rev=938486&view=auto
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/property/tobago-theme-config.properties (added)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie_7_0/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# theme: scarborough
+# agent: msie_7_0
+
+SelectManyListbox.minimumHeight=38
+SelectManyListbox.preferredHeight=86
+
+SelectOneListbox.minimumHeight=38
+SelectOneListbox.preferredHeight=86
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -15,6 +15,9 @@
# limitations under the License.
#
+# theme: scarborough
+# agent: standard
+
Tobago.labelWidth=144
Tobago.paddingWidth=0
Tobago.paddingHeight=0
@@ -130,11 +133,13 @@ SelectBooleanCheckbox.height=24
SelectManyCheckbox.height=20
-SelectManyListbox.minimumHeight=65
+SelectManyListbox.minimumHeight=33
+SelectManyListbox.preferredHeight=71
SelectOneChoice.height=25
-SelectOneListbox.minimumHeight=25
+SelectOneListbox.minimumHeight=33
+SelectOneListbox.preferredHeight=71
SelectOneRadio.height=20
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Tue Apr 27 14:54:32 2010
@@ -474,6 +474,7 @@ label.tobago-label-inline {
.tobago-selectManyListbox-default {
font-family: arial, helvetica, sans-serif;
+ color: #000000;
background: #ffffff;
height: 25px;
}
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css Tue Apr 27 14:54:32 2010
@@ -45,13 +45,6 @@ label.tobago-label-default {
padding-top: 1px;
}
-/* selectManyListbox ------------------------------------------------------- */
-
-.tobago-selectManyListbox-default {
- margin-bottom: -1px;
- /* height: 20px;*/
-}
-
/* selectOneChoice --------------------------------------------------------- */
.tobago-selectOneChoice-default {
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -15,12 +15,13 @@
# limitations under the License.
#
+# theme: speyside
+# agent: msie
+
Box.paddingHeight=11
-SelectManyListbox.fixedHeight=21
-#SelectOneChoice.fixedHeight=21
File.fixedHeight=24
ToolBar.small_right_Height=27
ToolBar.off_bottom_Height=27
-ToolBar.off_right_Height=27
\ No newline at end of file
+ToolBar.off_right_Height=27
Copied: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/property/tobago-theme-config.properties (from r937997, myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/property/tobago-theme-config.properties?p2=myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/property/tobago-theme-config.properties&p1=myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties&r1=937997&r2=938486&rev=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_6_0/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -15,12 +15,11 @@
# limitations under the License.
#
-Box.paddingHeight=11
+# theme: speyside
+# agent: msie_6_0
-SelectManyListbox.fixedHeight=21
-#SelectOneChoice.fixedHeight=21
-File.fixedHeight=24
+SelectManyListbox.minimumHeight=36
+SelectManyListbox.preferredHeight=81
-ToolBar.small_right_Height=27
-ToolBar.off_bottom_Height=27
-ToolBar.off_right_Height=27
\ No newline at end of file
+SelectOneListbox.minimumHeight=36
+SelectOneListbox.preferredHeight=81
Copied: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/property/tobago-theme-config.properties (from r937997, myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/property/tobago-theme-config.properties?p2=myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/property/tobago-theme-config.properties&p1=myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties&r1=937997&r2=938486&rev=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie_7_0/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -15,12 +15,11 @@
# limitations under the License.
#
-Box.paddingHeight=11
+# theme: speyside
+# agent: msie_7_0
-SelectManyListbox.fixedHeight=21
-#SelectOneChoice.fixedHeight=21
-File.fixedHeight=24
+SelectManyListbox.minimumHeight=36
+SelectManyListbox.preferredHeight=81
-ToolBar.small_right_Height=27
-ToolBar.off_bottom_Height=27
-ToolBar.off_right_Height=27
\ No newline at end of file
+SelectOneListbox.minimumHeight=36
+SelectOneListbox.preferredHeight=81
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Tue Apr 27 14:54:32 2010
@@ -15,6 +15,9 @@
# limitations under the License.
#
+# theme: speyside
+# agent: standard
+
Tobago.labelWidth=120
Tobago.labelSpace=5
Tobago.fixedHeight=20
@@ -74,11 +77,13 @@ Popup.paddingHeight=0
SelectBooleanCheckbox.height=19
-SelectOneChoice.height=20
+SelectManyListbox.minimumHeight=33
+SelectManyListbox.preferredHeight=75
-SelectOneListbox.minimumHeight=20
+SelectOneChoice.height=20
-SelectManyListbox.minimumHeight=60
+SelectOneListbox.minimumHeight=33
+SelectOneListbox.preferredHeight=75
Separator.height=14
Separator.withoutLabelHeight=1
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=938486&r1=938485&r2=938486&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Tue Apr 27 14:54:32 2010
@@ -551,6 +551,7 @@ label.tobago-label-error {
/* selectManyListbox ------------------------------------------------------- */
.tobago-selectManyListbox-default {
+ border: 1px solid #000000;
font: 12px arial, helvetica, sans-serif;
padding-top: -1px;
color: #000000;
@@ -582,6 +583,7 @@ tobago-selectOneChoice-readonly {
/* selectOneListbox -------------------------------------------------------- */
.tobago-selectOneListbox-default {
+ border: 1px solid #000000;
font-size: 12px;
}