Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectMany-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectMany-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/tableSelectMany-minimalScrRdr-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectMany-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>
@@ -219,11 +219,353 @@
>
StringHeader
</th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectMany_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:0"
+ name="mainId:_s"
+ title="Select"
+ type="checkbox"
+ value="0"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:0"
+ >
+ Select
+ </label>
+ <input
+ name="mainId:_us"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ >
+ First
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectMany_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:1"
+ name="mainId:_s"
+ title="Select"
+ type="checkbox"
+ value="1"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:1"
+ >
+ Select
+ </label>
+ <input
+ name="mainId:_us"
+ type="hidden"
+ value="1"
+ >
+
+ </input>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ >
+ Second
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectMany_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:2"
+ name="mainId:_s"
+ title="Select"
+ type="checkbox"
+ value="2"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:2"
+ >
+ Select
+ </label>
+ <input
+ name="mainId:_us"
+ type="hidden"
+ value="2"
+ >
+
+ </input>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ >
+ 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="0"
+ cellspacing="0"
+ class="af_table_sub-control-bar"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_uixt_mainId.multiSelect(true)"
+ href="uri-attr:#"
+ >
+ Select All
+ </a> | 
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_uixt_mainId.multiSelect(false)"
+ href="uri-attr:#"
+ >
+ Select None
+ </a>
+ </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"
>
- IntHeader
+ StringHeader
</th>
</tr>
<tr
@@ -261,11 +603,6 @@
>
First
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 1
- </td>
</tr>
<tr
>
@@ -302,11 +639,6 @@
>
Second
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 2
- </td>
</tr>
<tr
>
@@ -343,12 +675,247 @@
>
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
- class="af_column_cell-text OraTableBorder1111"
+ 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="0"
+ cellspacing="0"
+ class="af_table_sub-control-bar"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
>
- 3
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_uixt_mainId.multiSelect(true)"
+ href="uri-attr:#"
+ >
+ Select All
+ </a> | 
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_uixt_mainId.multiSelect(false)"
+ href="uri-attr:#"
+ >
+ Select None
+ </a>
</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
>
@@ -356,25 +923,31 @@
class="af_tableSelectMany_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:3"
+ id="mainId:0"
name="mainId:_s"
+ onclick="_adfspu('formId',1,'mainId','mainId');return true;"
title="Select"
type="checkbox"
- value="3"
+ value="0"
>
</input>
<label
class="p_OraHiddenLabel"
- for="mainId:3"
+ for="mainId:0"
>
Select
</label>
<input
name="mainId:_us"
type="hidden"
- value="3"
+ value="0"
>
</input>
@@ -382,12 +955,7 @@
<td
class="af_column_cell-text OraTableBorder1111"
>
- Four
- </td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 4
+ First
</td>
</tr>
<tr
@@ -398,24 +966,25 @@
>
<input
- id="mainId:4"
+ id="mainId:1"
name="mainId:_s"
+ onclick="_adfspu('formId',1,'mainId','mainId');return true;"
title="Select"
type="checkbox"
- value="4"
+ value="1"
>
</input>
<label
class="p_OraHiddenLabel"
- for="mainId:4"
+ for="mainId:1"
>
Select
</label>
<input
name="mainId:_us"
type="hidden"
- value="4"
+ value="1"
>
</input>
@@ -423,12 +992,44 @@
<td
class="af_column_cell-text OraTableBorder1111"
>
- Five
+ Second
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_tableSelectMany_cell-icon-format OraTableBorder1111"
+ >
+
+ <input
+ id="mainId:2"
+ name="mainId:_s"
+ onclick="_adfspu('formId',1,'mainId','mainId');return true;"
+ title="Select"
+ type="checkbox"
+ value="2"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId:2"
+ >
+ Select
+ </label>
+ <input
+ name="mainId:_us"
+ type="hidden"
+ value="2"
+ >
+
+ </input>
</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/golden/tableSelectOne-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimal-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-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimal-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
@@ -132,10 +132,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>
@@ -176,12 +176,6 @@
>
StringHeader
</th>
- <th
- class="af_column_header-text OraTableBorder0001"
- scope="col"
- >
- IntHeader
- </th>
</tr>
<tr
>
@@ -211,11 +205,6 @@
>
First
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 1
- </td>
</tr>
<tr
>
@@ -245,11 +234,6 @@
>
Second
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 2
- </td>
</tr>
<tr
>
@@ -279,10 +263,259 @@
>
Three
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _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
+ >
+ _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
@@ -293,17 +526,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>
@@ -311,12 +544,237 @@
<td
class="af_column_cell-text OraTableBorder1111"
>
- Four
+ Three
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _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
+ >
+ _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
+ >
+ 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
@@ -327,17 +785,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>
@@ -345,12 +804,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/golden/tableSelectOne-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalIE-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-minimalIE-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalIE-golden.xml Sun Apr 8 23:28:32 2007
@@ -90,12 +90,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
@@ -124,10 +124,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>
@@ -169,12 +169,6 @@
>
StringHeader
</th>
- <th
- class="af_column_header-text OraTableBorder0001"
- scope="col"
- >
- IntHeader
- </th>
</tr>
<tr
>
@@ -204,11 +198,6 @@
>
First
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 1
- </td>
</tr>
<tr
>
@@ -238,11 +227,6 @@
>
Second
</td>
- <td
- class="af_column_cell-text OraTableBorder1111"
- >
- 2
- </td>
</tr>
<tr
>
@@ -272,10 +256,252 @@
>
Three
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _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
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </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
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </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"
+ style="word-break:keep-all"
+ 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
@@ -286,17 +512,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>
@@ -304,12 +530,230 @@
<td
class="af_column_cell-text OraTableBorder1111"
>
- Four
+ Three
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _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
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </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
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </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"
+ style="word-break:keep-all"
+ 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
+ >
+ 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
@@ -320,17 +764,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>
@@ -338,12 +783,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>