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 2012/06/08 11:13:21 UTC
svn commit: r1347963 - in /myfaces/tobago/trunk:
tobago-example/tobago-example-test/src/main/webapp/tc/date/
tobago-example/tobago-example-test/src/main/webapp/tc/in/
tobago-example/tobago-example-test/src/main/webapp/tc/text/
tobago-example/tobago-exa...
Author: lofwyr
Date: Fri Jun 8 09:13:21 2012
New Revision: 1347963
URL: http://svn.apache.org/viewvc?rev=1347963&view=rev
Log:
TOBAGO-1151: Define default values for preferredWidth
- tc:in
- tc:date
- tc:textarea
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/date/date-layout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/in/in-layout.xhtml
- copied, changed from r1347553, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectOneChoice/selectOneChoice-layout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/text/
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/text/textarea-layout.xhtml
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tobago-resource/html/standard/standard/image/
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
Added: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/date/date-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/date/date-layout.xhtml?rev=1347963&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/date/date-layout.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/date/date-layout.xhtml Fri Jun 8 09:13:21 2012
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * 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.
+-->
+
+<f:view
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page id="page">
+ <tc:gridLayoutConstraint width="700px" height="600px"/>
+ <f:facet name="layout">
+ <tc:gridLayout columns="auto;auto" rows="auto;auto"/>
+ </f:facet>
+
+ <tc:label value="tc"/>
+ <tc:label value="tx"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;auto"/>
+ </f:facet>
+
+ <tc:date id="s1"/>
+ <tc:datePicker for="s1"/>
+ </tc:panel>
+
+ <tx:date label="normal" fieldId="s2"/>
+
+ <tc:script file="script/tobago-assert.js"/>
+
+ <!--
+ TODO: here we have the problem, that the tc:date has no icon, so we can't define only "one" value.
+ TODO: The renderer class must fix it.
+ -->
+ <tc:script onload="TobagoAssert.assertLayout('page:s1', 0, 25, 179, 20);"/>
+ <tc:script onload="TobagoAssert.assertLayout('page:s2', 330, 25, 179, 20);"/>
+
+ </tc:page>
+</f:view>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/in/in-layout.xhtml (from r1347553, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectOneChoice/selectOneChoice-layout.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/in/in-layout.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/in/in-layout.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectOneChoice/selectOneChoice-layout.xhtml&r1=1347553&r2=1347963&rev=1347963&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectOneChoice/selectOneChoice-layout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/in/in-layout.xhtml Fri Jun 8 09:13:21 2012
@@ -31,14 +31,8 @@
<tc:label value="tc"/>
<tc:label value="tx"/>
- <tc:selectOneChoice value="a" id="s1">
- <tc:selectItem itemValue="a" itemLabel="A Value"/>
- <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
- </tc:selectOneChoice>
- <tx:selectOneChoice value="b" label="normal" fieldId="s2">
- <tc:selectItem itemValue="a" itemLabel="A Value"/>
- <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
- </tx:selectOneChoice>
+ <tc:in value="a" id="s1"/>
+ <tx:in value="b" label="normal" fieldId="s2"/>
<tc:script file="script/tobago-assert.js"/>
Added: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/text/textarea-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/text/textarea-layout.xhtml?rev=1347963&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/text/textarea-layout.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/text/textarea-layout.xhtml Fri Jun 8 09:13:21 2012
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * 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.
+-->
+
+<f:view
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page id="page">
+ <tc:gridLayoutConstraint width="700px" height="600px"/>
+ <f:facet name="layout">
+ <tc:gridLayout columns="auto;auto" rows="auto;auto"/>
+ </f:facet>
+
+ <tc:label value="tc"/>
+ <tc:label value="tx"/>
+
+ <tc:textarea value="a" id="s1"/>
+ <tx:textarea value="b" label="normal" fieldId="s2"/>
+
+ <tc:script file="script/tobago-assert.js"/>
+
+ <tc:script onload="TobagoAssert.assertLayout('page:s1', 0, 25, 200, 33);"/>
+ <tc:script onload="TobagoAssert.assertLayout('page:s2', 330, 25, 200, 33);"/>
+
+ </tc:page>
+</f:view>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=1347963&r1=1347962&r2=1347963&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Fri Jun 8 09:13:21 2012
@@ -80,6 +80,8 @@ DatePicker.pickerWidth=16
Date.minimumHeight=25
Date.preferredHeight=25
Date.maximumHeight=25
+# 200 - 5 - 16 for space and picker
+Date.preferredWidth=179
Date.css.border-left-width=2
Date.css.border-top-width=2
Date.css.border-right-width=2
@@ -101,7 +103,7 @@ Image.headerHeight=0
In.minimumHeight=25
In.preferredHeight=25
In.maximumHeight=25
-In.preferredWidth=144
+In.preferredWidth=200
In.css.border-left-width=2
In.css.border-top-width=2
In.css.border-right-width=2
@@ -208,6 +210,7 @@ TabGroup.borderBottom=2
Textarea.headerHeight=0
Textarea.minimumWidth=20
Textarea.minimumHeight=36
+Textarea.preferredWidth=200
Textarea.css.border-left-width=2
Textarea.css.border-top-width=2
Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=1347963&r1=1347962&r2=1347963&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Fri Jun 8 09:13:21 2012
@@ -57,7 +57,6 @@ DatePicker.fixedWidth=20
In.minimumHeight=20
In.preferredHeight=20
In.maximumHeight=20
-In.preferredWidth=120
In.css.border-left-width=1
In.css.border-top-width=1
In.css.border-right-width=1