Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalScrRdr-golden.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalScrRdr-golden.xml?view=diff&rev=484885&r1=484884&r2=484885 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalScrRdr-golden.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalScrRdr-golden.xml Fri Dec 8 17:34:01 2006 @@ -96,7 +96,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -106,12 +106,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -133,13 +133,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -169,8 +169,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -189,14 +187,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -303,7 +299,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -313,12 +309,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -340,13 +336,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -376,8 +372,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'myid:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -396,14 +390,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'myid:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -511,7 +503,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -521,12 +513,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -548,13 +540,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -584,8 +576,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -604,14 +594,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -718,7 +706,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -728,12 +716,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -755,13 +743,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -791,8 +779,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -811,14 +797,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -926,7 +910,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -936,12 +920,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -963,13 +947,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -999,8 +983,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -1019,14 +1001,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -1134,7 +1114,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -1144,12 +1124,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -1171,13 +1151,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -1207,8 +1187,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -1227,14 +1205,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -1342,7 +1318,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -1352,12 +1328,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -1379,13 +1355,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -1415,8 +1391,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -1435,14 +1409,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -1550,7 +1522,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -1560,12 +1532,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -1587,13 +1559,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -1623,8 +1595,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -1643,14 +1613,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -1758,7 +1726,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -1768,12 +1736,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -1795,13 +1763,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -1831,8 +1799,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -1851,14 +1817,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -1966,7 +1930,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -1976,12 +1940,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -2003,13 +1967,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -2039,8 +2003,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -2059,14 +2021,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -2174,7 +2134,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -2184,12 +2144,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -2211,13 +2171,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -2247,8 +2207,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -2267,14 +2225,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -2382,7 +2338,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -2392,12 +2348,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -2419,13 +2375,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -2455,8 +2411,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -2475,14 +2429,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -2590,7 +2542,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -2600,12 +2552,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -2627,13 +2579,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -2663,8 +2615,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -2683,14 +2633,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a> @@ -2798,7 +2746,7 @@ </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > @@ -2808,12 +2756,12 @@ </table> </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" > </td> @@ -2835,13 +2783,13 @@ > <td - class="af_train_join p_AFUnvisited" + class="af_train_join p_AFDisabled" style="width: 50%" > </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-icon-cell" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-icon-cell" > </td> @@ -2871,8 +2819,6 @@ <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:0:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > First </a> @@ -2891,14 +2837,12 @@ </a> </td> <td - class="p_AFUnvisited af_train_stop af_train_stop-content" + class="p_AFUnvisited p_AFReadOnly af_train_stop af_train_stop-content" colspan="3" > <a class="af_train_link" - onclick="submitForm('formId',1,{source:'mainId:2:_idXXX'});return false;" - href="uri-attr:encoded-action-url:#" > Third </a>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandNavigationItem.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandNavigationItem.xml?view=diff&rev=484885&r1=484884&r2=484885 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandNavigationItem.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandNavigationItem.xml Fri Dec 8 17:34:01 2006 @@ -8,7 +8,6 @@ <attribute-test name="icon" value="/help.gif" matchesBase="true"/> <boolean-test name="immediate"/> <!--attribute-test name="partialTriggers" value="x y" matchesBase="true"/--> - <boolean-test name="readOnly"/> <!--boolean-test name="selected"/--> <attribute-test name="textAndAccessKey" value="C&ommandMenuItemText" matchesBase="true"/> <!--enum-test name="type" default="default"/--> Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/train.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/train.xml?view=diff&rev=484885&r1=484884&r2=484885 ============================================================================== --- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/train.xml (original) +++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/train.xml Fri Dec 8 17:34:01 2006 @@ -4,9 +4,8 @@ value="#{pageList}" var="foo"> <component tr:type="org.apache.myfaces.trinidad.CoreCommandNavigationItem" tr:facet="nodeStamp" - text="#{foo.label}"/> - <!--the el below doesn't work--> - <!--readOnly="#{pageList.readOnly}"/--> + text="#{foo.label}" + disabled="#{pageList.readOnly}"/> </base-component>
