You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2010/06/15 22:52:41 UTC

svn commit: r955044 [1/2] - in /myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ test/resources/org/apache/...

Author: gcrawford
Date: Tue Jun 15 20:52:40 2010
New Revision: 955044

URL: http://svn.apache.org/viewvc?rev=955044&view=rev
Log:
TRINIDAD-1814 Hidden labels aren't supported for Safari

Modified:
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseDate-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputFile-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBarBig-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectMany-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/tableSelectOne-minimalSaf-golden.xml
    myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalSaf-golden.xml

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java Tue Jun 15 20:52:40 2010
@@ -65,6 +65,10 @@ public class HiddenLabelUtils
       // Mozilla does support the label hack
       case TrinidadAgent.APPLICATION_GECKO:
         return true;
+       
+      // Safari does support the label hack
+      case TrinidadAgent.APPLICATION_SAFARI:
+        return true;
 
       // Assume everyone else doesn't.
       case TrinidadAgent.APPLICATION_NETSCAPE:

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java Tue Jun 15 20:52:40 2010
@@ -75,6 +75,10 @@ public class HiddenLabelUtils
         // Make sure we don't change the VE to Gecko
         assert(agent.getCapability(TrinidadAgent.CAP_IS_JDEV_VE) == null);
         return true;
+       
+      // Safari does support the label hack
+      case TrinidadAgent.APPLICATION_SAFARI:
+        return true;
 
       // Assume everyone else doesn't.
       case TrinidadAgent.APPLICATION_NETSCAPE:

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseDate-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseDate-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseDate-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/chooseDate-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -102,7 +102,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -268,6 +274,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -846,7 +858,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="dateidmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="dateidyear"
@@ -1012,6 +1030,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="dateidyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -1591,7 +1615,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -1757,6 +1787,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -2336,7 +2372,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -2502,6 +2544,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -3081,7 +3129,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -3247,6 +3301,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -3826,7 +3886,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -3992,6 +4058,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -4571,7 +4643,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -4737,6 +4815,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -5316,7 +5400,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -5482,6 +5572,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -6061,7 +6157,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -6227,6 +6329,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -6806,7 +6914,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -6972,6 +7086,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -7551,7 +7671,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -7717,6 +7843,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -8296,7 +8428,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -8462,6 +8600,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -9041,7 +9185,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -9207,6 +9357,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -9786,7 +9942,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -9952,6 +10114,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"
@@ -10531,7 +10699,13 @@
                   >
                 December
               </option>
-            </select>&#160;
+            </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdmonth"
+                >
+              Choose month
+            </label>&#160;
             <select
                  class="AFFieldText"
                  id="mainIdyear"
@@ -10697,6 +10871,12 @@
                 After 2019
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainIdyear"
+                >
+              Choose year
+            </label>
           </td>
           <td
                align="right"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/columnGroup-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -103,6 +103,12 @@
                               6-6 of 6
                             </option>
                           </select>
+                          <label
+                               class="p_OraHiddenLabel"
+                               for="mainId-nb__xc_c"
+                              >
+                            Select record set
+                          </label>
                           <script
                                type="text/javascript"
                               >

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/editableTable-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -103,6 +103,12 @@
                               6-6 of 6
                             </option>
                           </select>
+                          <label
+                               class="p_OraHiddenLabel"
+                               for="mainId-nb__xc_c"
+                              >
+                            Select record set
+                          </label>
                           <script
                                type="text/javascript"
                               >
@@ -189,6 +195,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:0:_idXXX"
+                        >
+                      testShort
+                    </label>
                   </td>
                   <td
                        class="af_column_cell-text OraTableBorder1111"
@@ -203,6 +215,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:0:_idXXX"
+                        >
+                      testLabel
+                    </label>
                   </td>
                 </tr>
                 <tr
@@ -223,6 +241,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:1:_idXXX"
+                        >
+                      testShort
+                    </label>
                   </td>
                   <td
                        class="af_column_cell-text OraTableBorder1111"
@@ -237,6 +261,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:1:_idXXX"
+                        >
+                      testLabel
+                    </label>
                   </td>
                 </tr>
                 <tr
@@ -257,6 +287,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:2:_idXXX"
+                        >
+                      testShort
+                    </label>
                   </td>
                   <td
                        class="af_column_cell-text OraTableBorder1111"
@@ -271,6 +307,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:2:_idXXX"
+                        >
+                      testLabel
+                    </label>
                   </td>
                 </tr>
                 <tr
@@ -291,6 +333,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:3:_idXXX"
+                        >
+                      testShort
+                    </label>
                   </td>
                   <td
                        class="af_column_cell-text OraTableBorder1111"
@@ -305,6 +353,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:3:_idXXX"
+                        >
+                      testLabel
+                    </label>
                   </td>
                 </tr>
                 <tr
@@ -325,6 +379,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:4:_idXXX"
+                        >
+                      testShort
+                    </label>
                   </td>
                   <td
                        class="af_column_cell-text OraTableBorder1111"
@@ -339,6 +399,12 @@
                         >
                       
                     </input>
+                    <label
+                         class="p_OraHiddenLabel"
+                         for="mainId:4:_idXXX"
+                        >
+                      testLabel
+                    </label>
                   </td>
                 </tr>
               </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -1453,6 +1453,12 @@
                 >
               
             </input>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
             <img
                  alt=""
                  height="1"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -297,6 +297,12 @@
             >
           
         </input>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-label
+        </label>
         <img
              alt=""
              height="1"
@@ -547,6 +553,12 @@
             >
           
         </input>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-shortDesc
+        </label>
         <img
              alt=""
              height="1"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -1087,6 +1087,12 @@
                 >
               
             </input>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
             <img
                  alt=""
                  height="1"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -138,6 +138,12 @@
             >
           
         </input>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-label
+        </label>
         <img
              alt=""
              height="1"
@@ -321,6 +327,12 @@
             >
           
         </input>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-shortDesc
+        </label>
         <img
              alt=""
              height="1"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputFile-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputFile-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputFile-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputFile-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -832,6 +832,12 @@
                 >
               
             </input>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
           </td>
         </tr>
       </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputListOfValues-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -1355,6 +1355,12 @@
                 >
               
             </input>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              shortDesc_val
+            </label>
             <img
                  alt=""
                  height="1"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -2431,6 +2431,12 @@
                       >
                     
                   </input>
+                  <label
+                       class="p_OraHiddenLabel"
+                       for="mainId"
+                      >
+                    shortDesc_val
+                  </label>
                 </td>
                 <td
                      align="center"

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -925,6 +925,12 @@
                 >
               
             </input>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              shortDesc_val
+            </label>
           </td>
         </tr>
       </table>
@@ -1124,6 +1130,12 @@
                 >
               
             </input>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
           </td>
         </tr>
       </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -367,6 +367,12 @@
                 >
               Text
             </textarea>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              shortDesc_val
+            </label>
           </td>
         </tr>
       </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -9,7 +9,12 @@
       <span
            id="mainId"
           >
-        This is some &lt;Text&gt;
+        
+        <span
+             class="p_OraHiddenLabel"
+            >
+          test-description
+        </span>This is some &lt;Text&gt;
       </span>
 <!--AttributeTest[escape,false]-->
 This is some <Text>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -37,7 +37,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -141,7 +146,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -247,7 +257,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -351,7 +366,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -459,7 +479,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -564,7 +589,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -672,7 +702,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -777,7 +812,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -884,7 +924,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -988,7 +1033,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1094,7 +1144,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1205,7 +1260,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1309,7 +1369,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1420,7 +1485,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1528,7 +1598,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1633,7 +1708,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1741,7 +1821,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1846,7 +1931,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -1954,7 +2044,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2059,7 +2154,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2167,7 +2267,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2272,7 +2377,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2380,7 +2490,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2485,7 +2600,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2593,7 +2713,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2698,7 +2823,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2806,7 +2936,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -2911,7 +3046,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -3019,7 +3159,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -3124,7 +3269,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -3232,7 +3382,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -3337,7 +3492,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -3445,7 +3605,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td
@@ -3550,7 +3715,12 @@
                    id="uri-attr:_idXXX"
                    name="uri-attr:_idXXX"
                   >
-                1
+                
+                <span
+                     class="p_OraHiddenLabel"
+                    >
+                  Selected
+                </span>1
               </a>
             </td>
             <td

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/processChoiceBar-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -185,6 +185,12 @@
                 Third
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              my short desc
+            </label>
           </td>
           <td
               >

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -901,6 +901,12 @@
                   >
                 
               </input>
+              <label
+                   class="p_OraHiddenLabel"
+                   for="mainId"
+                  >
+                test-shortDesc
+              </label>
             </span>
           </td>
         </tr>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -172,6 +172,12 @@
               >
             
           </input>
+          <label
+               class="p_OraHiddenLabel"
+               for="mainId"
+              >
+            test-label
+          </label>
         </span>
       </span>
 <!--AttributeTest[readOnly,false]-->
@@ -361,6 +367,12 @@
               >
             
           </input>
+          <label
+               class="p_OraHiddenLabel"
+               for="mainId"
+              >
+            test-shortDesc
+          </label>
         </span>
       </span>
 <!--AttributeTest[onblur,null]-->

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -900,6 +900,12 @@
                   >
                 
               </input>
+              <label
+                   class="p_OraHiddenLabel"
+                   for="mainId"
+                  >
+                test-shortDesc
+              </label>
             </span>
           </td>
         </tr>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -150,6 +150,12 @@
               >
             
           </input>
+          <label
+               class="p_OraHiddenLabel"
+               for="mainId"
+              >
+            test-label
+          </label>
         </span>
       </span>
 <!--AttributeTest[group,secondGroup]-->
@@ -360,6 +366,12 @@
               >
             
           </input>
+          <label
+               class="p_OraHiddenLabel"
+               for="mainId"
+              >
+            test-shortDesc
+          </label>
         </span>
       </span>
 <!--AttributeTest[onblur,null]-->

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -2059,63 +2059,53 @@
                  title="test-shortDesc"
                 >
               
-              <fieldset
-                   style="border:none;margin:0px;padding:0px;"
+              <input
+                   id="mainId:_0"
+                   name="mainId"
+                   type="checkbox"
+                   value="0"
                   >
                 
-                <legend
-                     class="p_OraHiddenLabel"
-                    >
-                  test-shortDesc
-                </legend>
-                <input
-                     id="mainId:_0"
-                     name="mainId"
-                     type="checkbox"
-                     value="0"
-                    >
-                  
-                </input>
-                <label
-                     for="mainId:_0"
-                    >
-                  item2
-                </label>
-                <br
-                    >
-                  
-                </br>
-                <input
-                     id="mainId:_1"
-                     name="mainId"
-                     type="checkbox"
-                     value="1"
-                    >
-                  
-                </input>
-                <label
-                     for="mainId:_1"
-                    >
-                  item4
-                </label>
-                <br
-                    >
-                  
-                </br>
-                <input
-                     id="mainId:_2"
-                     name="mainId"
-                     type="checkbox"
-                     value="2"
-                    >
-                  
-                </input>
-                <label
-                     for="mainId:_2"
-                    >
-                  item8
-                </label>
-              </fieldset>
+              </input>
+              <label
+                   for="mainId:_0"
+                  >
+                item2
+              </label>
+              <br
+                  >
+                
+              </br>
+              <input
+                   id="mainId:_1"
+                   name="mainId"
+                   type="checkbox"
+                   value="1"
+                  >
+                
+              </input>
+              <label
+                   for="mainId:_1"
+                  >
+                item4
+              </label>
+              <br
+                  >
+                
+              </br>
+              <input
+                   id="mainId:_2"
+                   name="mainId"
+                   type="checkbox"
+                   value="2"
+                  >
+                
+              </input>
+              <label
+                   for="mainId:_2"
+                  >
+                item8
+              </label>
             </span>
           </td>
         </tr>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -1264,6 +1264,12 @@
                 item8
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
           </td>
         </tr>
       </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -295,6 +295,12 @@
             item8
           </option>
         </select>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-label
+        </label>
       </span>
 <!--AttributeTest[readOnly,false]-->
 
@@ -468,6 +474,12 @@
             item8
           </option>
         </select>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-shortDesc
+        </label>
       </span>
 <!--AttributeTest[onblur,null]-->
 

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -2248,6 +2248,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:leading:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -2552,6 +2558,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:trailing:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -2834,6 +2846,12 @@
                                   _______________
                                 </option>
                               </select>
+                              <label
+                                   class="p_OraHiddenLabel"
+                                   for="mainId:leading"
+                                  >
+                                test-leadingHeader
+                              </label>
                             </span>
                           </td>
                         </tr>
@@ -6465,6 +6483,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:leading:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -6770,6 +6794,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:trailing:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -7292,6 +7322,12 @@
                                   _______________
                                 </option>
                               </select>
+                              <label
+                                   class="p_OraHiddenLabel"
+                                   for="mainId:trailing"
+                                  >
+                                test-trailingHeader
+                              </label>
                             </span>
                           </td>
                         </tr>
@@ -8931,6 +8967,12 @@
           </td>
         </tr>
       </table>
+      <label
+           class="p_OraHiddenLabel"
+           for="mainId"
+          >
+        test-shortDesc
+      </label>
 <!--AttributeTest[styleClass,null]-->
 
       <table

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -1302,6 +1302,12 @@
                 item8
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
           </td>
         </tr>
       </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -305,6 +305,12 @@
             item8
           </option>
         </select>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-label
+        </label>
       </span>
 <!--AttributeTest[readOnly,false]-->
 
@@ -459,6 +465,12 @@
             item8
           </option>
         </select>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-shortDesc
+        </label>
       </span>
 <!--AttributeTest[onblur,null]-->
 

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -1301,6 +1301,12 @@
                 item8
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId"
+                >
+              test-shortDesc
+            </label>
           </td>
         </tr>
       </table>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -274,6 +274,12 @@
             item8
           </option>
         </select>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-label
+        </label>
       </span>
 <!--AttributeTest[readOnly,false]-->
 
@@ -502,6 +508,12 @@
             item8
           </option>
         </select>
+        <label
+             class="p_OraHiddenLabel"
+             for="mainId"
+            >
+          test-shortDesc
+        </label>
       </span>
 <!--AttributeTest[onblur,null]-->
 

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -2120,63 +2120,53 @@
                  title="test-shortDesc"
                 >
               
-              <fieldset
-                   style="border:none;margin:0px;padding:0px;"
+              <input
+                   id="mainId:_0"
+                   name="mainId"
+                   type="radio"
+                   value="0"
                   >
                 
-                <legend
-                     class="p_OraHiddenLabel"
-                    >
-                  test-shortDesc
-                </legend>
-                <input
-                     id="mainId:_0"
-                     name="mainId"
-                     type="radio"
-                     value="0"
-                    >
-                  
-                </input>
-                <label
-                     for="mainId:_0"
-                    >
-                  item2
-                </label>
-                <br
-                    >
-                  
-                </br>
-                <input
-                     id="mainId:_1"
-                     name="mainId"
-                     type="radio"
-                     value="1"
-                    >
-                  
-                </input>
-                <label
-                     for="mainId:_1"
-                    >
-                  item4
-                </label>
-                <br
-                    >
-                  
-                </br>
-                <input
-                     id="mainId:_2"
-                     name="mainId"
-                     type="radio"
-                     value="2"
-                    >
-                  
-                </input>
-                <label
-                     for="mainId:_2"
-                    >
-                  item8
-                </label>
-              </fieldset>
+              </input>
+              <label
+                   for="mainId:_0"
+                  >
+                item2
+              </label>
+              <br
+                  >
+                
+              </br>
+              <input
+                   id="mainId:_1"
+                   name="mainId"
+                   type="radio"
+                   value="1"
+                  >
+                
+              </input>
+              <label
+                   for="mainId:_1"
+                  >
+                item4
+              </label>
+              <br
+                  >
+                
+              </br>
+              <input
+                   id="mainId:_2"
+                   name="mainId"
+                   type="radio"
+                   value="2"
+                  >
+                
+              </input>
+              <label
+                   for="mainId:_2"
+                  >
+                item8
+              </label>
             </span>
           </td>
         </tr>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -871,63 +871,53 @@
              title="test-shortDesc"
             >
           
-          <fieldset
-               style="border:none;margin:0px;padding:0px;"
+          <input
+               id="mainId:_0"
+               name="mainId"
+               type="radio"
+               value="0"
               >
             
-            <legend
-                 class="p_OraHiddenLabel"
-                >
-              test-shortDesc
-            </legend>
-            <input
-                 id="mainId:_0"
-                 name="mainId"
-                 type="radio"
-                 value="0"
-                >
-              
-            </input>
-            <label
-                 for="mainId:_0"
-                >
-              item2
-            </label>
-            <br
-                >
-              
-            </br>
-            <input
-                 id="mainId:_1"
-                 name="mainId"
-                 type="radio"
-                 value="1"
-                >
-              
-            </input>
-            <label
-                 for="mainId:_1"
-                >
-              item4
-            </label>
-            <br
-                >
-              
-            </br>
-            <input
-                 id="mainId:_2"
-                 name="mainId"
-                 type="radio"
-                 value="2"
-                >
-              
-            </input>
-            <label
-                 for="mainId:_2"
-                >
-              item8
-            </label>
-          </fieldset>
+          </input>
+          <label
+               for="mainId:_0"
+              >
+            item2
+          </label>
+          <br
+              >
+            
+          </br>
+          <input
+               id="mainId:_1"
+               name="mainId"
+               type="radio"
+               value="1"
+              >
+            
+          </input>
+          <label
+               for="mainId:_1"
+              >
+            item4
+          </label>
+          <br
+              >
+            
+          </br>
+          <input
+               id="mainId:_2"
+               name="mainId"
+               type="radio"
+               value="2"
+              >
+            
+          </input>
+          <label
+               for="mainId:_2"
+              >
+            item8
+          </label>
         </span>
       </span>
 <!--AttributeTest[styleClass,null]-->

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -2460,6 +2460,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:leading:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -2818,6 +2824,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:trailing:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -3100,6 +3112,12 @@
                                   _______________
                                 </option>
                               </select>
+                              <label
+                                   class="p_OraHiddenLabel"
+                                   for="mainId:leading"
+                                  >
+                                test-leadingHeader
+                              </label>
                             </span>
                           </td>
                         </tr>
@@ -7105,6 +7123,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:leading:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -7464,6 +7488,12 @@
                                 >
                               
                             </textarea>
+                            <label
+                                 class="p_OraHiddenLabel"
+                                 for="mainId:trailing:desc"
+                                >
+                              Description
+                            </label>
                           </td>
                           <td
                               >
@@ -7986,6 +8016,12 @@
                                   _______________
                                 </option>
                               </select>
+                              <label
+                                   class="p_OraHiddenLabel"
+                                   for="mainId:trailing"
+                                  >
+                                test-trailingHeader
+                              </label>
                             </span>
                           </td>
                           <td
@@ -9276,4 +9312,10 @@
           </td>
         </tr>
       </table>
+      <label
+           class="p_OraHiddenLabel"
+           for="mainId"
+          >
+        test-shortDesc
+      </label>
 </results>

Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalSaf-golden.xml?rev=955044&r1=955043&r2=955044&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectRangeChoiceBar-minimalSaf-golden.xml Tue Jun 15 20:52:40 2010
@@ -147,6 +147,12 @@
                 2-4 of 4
               </option>
             </select>
+            <label
+                 class="p_OraHiddenLabel"
+                 for="mainId__xc_c"
+                >
+              Select record set
+            </label>
             <script
                  type="text/javascript"
                 >