mindbridge 2005/08/14 13:39:59 Modified: examples/Workbench/src/context/WEB-INF Border.html LocaleList.jwc LocaleList.html Added: examples/Workbench/src/context/WEB-INF LocaleList.properties Log: Making some changes to Workbench to use the unified table components Revision Changes Path 1.10 +2 -0 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/Border.html Index: Border.html =================================================================== RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/Border.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Border.html 28 Jul 2005 19:11:15 -0000 1.9 +++ Border.html 14 Aug 2005 20:39:58 -0000 1.10 @@ -52,5 +52,7 @@ <span jwcid="@contrib:InspectorButton" disabled="ognl:visit.disableInspector"/> +<span jwcid="@contrib:Timeout" autoProlongTime="600" disableWarning="true"/> + </body> </html> 1.10 +11 -8 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleList.jwc Index: LocaleList.jwc =================================================================== RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleList.jwc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- LocaleList.jwc 28 Jul 2005 19:11:16 -0000 1.9 +++ LocaleList.jwc 14 Aug 2005 20:39:58 -0000 1.10 @@ -25,7 +25,7 @@ <bean name="rowClass" class="org.apache.tapestry.bean.EvenOdd"/> - <property name="currentLocale"/> + <!--property name="currentLocale"/--> <property name="selectedLocales" persist="session" initial-value="new java.util.HashSet()"/> @@ -33,28 +33,31 @@ <!--binding name="listener" value="listeners.formSubmit"/--> </component> - <component id="checkbox" type="Checkbox"> + <component id="checkboxGroup" type="contrib:CheckboxGroup"/> + + <component id="controlCheckbox" type="contrib:ControlCheckbox"/> + + <component id="checkbox" type="contrib:ControlledCheckbox"> <binding name="value" value="checkboxSelected"/> </component> <component id="submitButton" type="Submit"> - <binding name="label" value="literal:Select locales"/> <binding name="listener" value="listener:selectLocales"/> </component> <component id="tableView" type="contrib:TableView"> <binding name="source" value="@[EMAIL PROTECTED]()"/> - <binding name="columns"> literal: - * Locale:toString(), Language:displayLanguage, Country:displayCountry, - Variant:displayVariant, ISO Language:ISO3Language, ISO Country:ISO3Country + <binding name="columns">literal: + * locale:toString(), language:displayLanguage, country:displayCountry, + variant:displayVariant, isoLanguage:ISO3Language, isoCountry:ISO3Country </binding> </component> <component id="tableColumns" type="contrib:TableColumns"/> - <component id="tableFormRows" type="contrib:TableFormRows"> + <component id="tableFormRows" type="contrib:TableRows"> <binding name="row" value="currentLocale"/> - <binding name="convertor" value="localeConvertor"/> + <binding name="keyExpression" value="literal:toString()"/> <binding name="class" value="beans.rowClass.next"/> </component> 1.2 +6 -2 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleList.html Index: LocaleList.html =================================================================== RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleList.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LocaleList.html 28 Oct 2004 22:24:46 -0000 1.1 +++ LocaleList.html 14 Aug 2005 20:39:58 -0000 1.2 @@ -2,6 +2,8 @@ <form jwcid="form"> + <span jwcid="checkboxGroup"> + <!-- This component could be implemented using the FormTable component in the following way: @@ -27,7 +29,7 @@ </tr> <tr> - <td></td> + <td><span jwcid="controlCheckbox"/></td> <td jwcid="tableColumns"/> </tr> @@ -37,7 +39,9 @@ </tr> </table> - <span jwcid="submitButton"/> + </span> + + <span jwcid="submitButton" value="Select locales"/> </form> 1.1 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/LocaleList.properties Index: LocaleList.properties =================================================================== # Copyright 2004, 2005 The Apache Software Foundation # # Licensed 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. locale=Locale language=Language country=Country variant=Variant isoLanguage=ISO Language isoCountry=ISO Country
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]