Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalScrRdr-golden.xml?view=diff&rev=526659&r1=526658&r2=526659
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalScrRdr-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalScrRdr-golden.xml Sun Apr 8 23:28:32 2007
@@ -94,12 +94,12 @@
selected="selected"
value="1"
>
- 1-5 of 6
+ 1-3 of 6
</option>
<option
- value="6"
+ value="4"
>
- 6-6 of 6
+ 4-6 of 6
</option>
</select>
<label
@@ -133,10 +133,10 @@
<a
class="OraNavBarActiveLink"
- onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'4');return false"
href="uri-attr:#"
>
- Next 1
+ Next 3
</a>
</td>
</tr>
@@ -177,12 +177,6 @@
>
StringHeader
</th>
- <th
- class="af_column_header-text OraTableBorder0001"
- scope="col"
- >
- IntHeader
- </th>
</tr>
<tr
>
@@ -212,11 +206,6 @@
>
First
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 1
- </td>
</tr>
<tr
>
@@ -246,11 +235,6 @@
>
Second
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 2
- </td>
</tr>
<tr
>
@@ -280,10 +264,261 @@
>
Three
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ type="text/javascript"
+ >
+ _uixt_mainId=new CollectionComponent('formId','mainId');
+ </script>
+ <input
+ name="mainId:rangeStart"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </div>
+<!--AttributeTest[autoSubmit,false]-->
+
+ <div
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_table_control-bar-top"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ width="100%"
+ >
+
+ </td>
+ <td
+ align="right"
+ valign="middle"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ id="mainId-nb"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-3 of 6
+ </option>
+ <option
+ value="4"
+ >
+ 4-6 of 6
+ </option>
+ </select>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId-nb__xc_c"
+ >
+ Select record set
+ </label>
+ <script
+ type="text/javascript"
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'4');return false"
+ href="uri-attr:#"
+ >
+ Next 3
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="1"
+ cellspacing="0"
+ class="af_table_content"
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <th
+ class="af_column_header-icon-format"
+ nowrap="nowrap"
+ scope="col"
+ width="1%"
+ >
+ Select
+ </th>
+ <th
+ class="af_column_header-text OraTableBorder0001"
+ scope="col"
+ >
+ StringHeader
+ </th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectOne_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:0"
+ name="mainId:selected"
+ title="Select"
+ type="radio"
+ value="0"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:0"
+ >
+ Select
+ </label>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ >
+ First
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectOne_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:1"
+ name="mainId:selected"
+ title="Select"
+ type="radio"
+ value="1"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:1"
+ >
+ Select
+ </label>
+ </td>
<td
class="af_column_cell-text OraTableBorder1111"
>
- 3
+ Second
</td>
</tr>
<tr
@@ -294,17 +529,17 @@
>
<input
- id="mainId:3"
+ id="mainId:2"
name="mainId:selected"
title="Select"
type="radio"
- value="3"
+ value="2"
>
</input>
<label
class="p_OraHiddenLabel"
- for="mainId:3"
+ for="mainId:2"
>
Select
</label>
@@ -312,12 +547,240 @@
<td
class="af_column_cell-text OraTableBorder1111"
>
- Four
+ Three
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ type="text/javascript"
+ >
+ _uixt_mainId=new CollectionComponent('formId','mainId');
+ </script>
+ <input
+ name="mainId:rangeStart"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </div>
+<!--AttributeTest[autoSubmit,true]-->
+
+ <div
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_table_control-bar-top"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ width="100%"
+ >
+
+ </td>
+ <td
+ align="right"
+ valign="middle"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ id="mainId-nb"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-3 of 6
+ </option>
+ <option
+ value="4"
+ >
+ 4-6 of 6
+ </option>
+ </select>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId-nb__xc_c"
+ >
+ Select record set
+ </label>
+ <script
+ type="text/javascript"
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'4');return false"
+ href="uri-attr:#"
+ >
+ Next 3
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="1"
+ cellspacing="0"
+ class="af_table_content"
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <th
+ class="af_column_header-icon-format"
+ nowrap="nowrap"
+ scope="col"
+ width="1%"
+ >
+ Select
+ </th>
+ <th
+ class="af_column_header-text OraTableBorder0001"
+ scope="col"
+ >
+ StringHeader
+ </th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectOne_cell-icon-format OraTableBorder1111"
+ >
+
+ <script
+ type="text/javascript"
+ >
+ var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
+ </script>
+ <input
+ id="mainId:0"
+ name="mainId:selected"
+ onclick="_adfspu('formId',1,'mainId','mainId');return true;"
+ title="Select"
+ type="radio"
+ value="0"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:0"
+ >
+ Select
+ </label>
</td>
<td
class="af_column_cell-text OraTableBorder1111"
>
- 4
+ First
</td>
</tr>
<tr
@@ -328,17 +791,18 @@
>
<input
- id="mainId:4"
+ id="mainId:1"
name="mainId:selected"
+ onclick="_adfspu('formId',1,'mainId','mainId');return true;"
title="Select"
type="radio"
- value="4"
+ value="1"
>
</input>
<label
class="p_OraHiddenLabel"
- for="mainId:4"
+ for="mainId:1"
>
Select
</label>
@@ -346,12 +810,37 @@
<td
class="af_column_cell-text OraTableBorder1111"
>
- Five
+ Second
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectOne_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:2"
+ name="mainId:selected"
+ onclick="_adfspu('formId',1,'mainId','mainId');return true;"
+ title="Select"
+ type="radio"
+ value="2"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:2"
+ >
+ Select
+ </label>
</td>
<td
class="af_column_cell-text OraTableBorder1111"
>
- 5
+ Three
</td>
</tr>
</table>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectMany.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectMany.xml?view=diff&rev=526659&r1=526658&r2=526659
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectMany.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectMany.xml Sun Apr 8 23:28:32 2007
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="windows-1252" ?>
<test xmlns="http://myfaces.apache.org/trinidad/test"
xmlns:tr="http://myfaces.apache.org/trinidad">
- <base-component tr:type="org.apache.myfaces.trinidad.CoreTable" value="#{simpleList}" var="row" rows="5"
+ <base-component tr:type="org.apache.myfaces.trinidad.CoreTable" value="#{simpleList}" var="row" rows="3"
rowSelection="multiple">
<component tr:type="org.apache.myfaces.trinidad.CoreColumn">
<component tr:facet="header" tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="StringHeader"/>
<component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="#{row.string}"/>
</component>
- <component tr:type="org.apache.myfaces.trinidad.CoreColumn">
- <component tr:facet="header" tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="IntHeader"/>
- <component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="#{row.int}"/>
- </component>
</base-component>
+ <boolean-test name="autoSubmit" default="false"/>
</test>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectOne.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectOne.xml?view=diff&rev=526659&r1=526658&r2=526659
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectOne.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/tableSelectOne.xml Sun Apr 8 23:28:32 2007
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="windows-1252" ?>
<test xmlns="http://myfaces.apache.org/trinidad/test"
xmlns:tr="http://myfaces.apache.org/trinidad">
- <base-component tr:type="org.apache.myfaces.trinidad.CoreTable" value="#{simpleList}" var="row" rows="5"
+ <base-component tr:type="org.apache.myfaces.trinidad.CoreTable" value="#{simpleList}" var="row" rows="3"
rowSelection="single">
<component tr:type="org.apache.myfaces.trinidad.CoreColumn">
<component tr:facet="header" tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="StringHeader"/>
<component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="#{row.string}"/>
</component>
- <component tr:type="org.apache.myfaces.trinidad.CoreColumn">
- <component tr:facet="header" tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="IntHeader"/>
- <component tr:type="org.apache.myfaces.trinidad.CoreOutputText" value="#{row.int}"/>
- </component>
</base-component>
+ <boolean-test name="autoSubmit" default="false"/>
</test>