You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2007/02/07 22:08:37 UTC
svn commit: r504714 [1/4] - in
/incubator/adffaces/trunk/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
test/resources/org/apache/myfa...
Author: awiner
Date: Wed Feb 7 14:08:35 2007
New Revision: 504714
URL: http://svn.apache.org/viewvc?view=rev&rev=504714
Log:
ADFFACES-369: ColumnRenderer ignores styleClass attribute.
- Also add code to handle inlineStyle
- And update golden file tests to test support for both of these
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/table.xml
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java?view=diff&rev=504714&r1=504713&r2=504714
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java Wed Feb 7 14:08:35 2007
@@ -286,6 +286,7 @@
final String cellClass;
final String borderStyleClass;
+
if (isRowHeader)
{
writer.startElement(XhtmlConstants.TABLE_HEADER_ELEMENT, column);
@@ -313,11 +314,13 @@
borderStyleClass = CellUtils.getDataBorderStyle(arc, tContext);
} // endif (isRowHeader)
- renderStyleClasses(context, arc, new String[]{cellClass, borderStyleClass});
+ FacesBean bean = getFacesBean(column);
+ String userStyleClass = getStyleClass(bean);
+ String userInlineStyle = getInlineStyle(bean);
+
+ renderStyleClasses(context, arc, new String[]{userStyleClass, cellClass, borderStyleClass});
- // =-=AEW Hook for BIBeans, likely will not be used in the future
- String inlineStyle = getTableDataInlineStyle(null);
- writer.writeAttribute("style", inlineStyle, null);
+ writer.writeAttribute("style", userInlineStyle, null);
if (colData.getNoWrap(physicalIndex))
writer.writeAttribute(XhtmlConstants.NOWRAP_ATTRIBUTE, Boolean.TRUE, null);
@@ -339,15 +342,6 @@
int index)
{
return tContext.getColumnWidth(index);
- }
-
- // needed for BIBeans. Contact: Max Starets
- /**
- * @todo Are they going to keep using this?
- */
- protected String getTableDataInlineStyle(String defaultInlineStyle)
- {
- return defaultInlineStyle;
}
/**
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml?view=diff&rev=504714&r1=504713&r2=504714
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml Wed Feb 7 14:08:35 2007
@@ -2333,6 +2333,929 @@
</input>
</div>
+<!--AttributeTest[styleClass,null]-->
+
+ <div
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_table_control-bar-top"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ width="100%"
+ >
+
+ </td>
+ <td
+ align="right"
+ valign="middle"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ id="mainId-nb"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-5 of 6
+ </option>
+ <option
+ value="6"
+ >
+ 6-6 of 6
+ </option>
+ </select>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId-nb__xc_c"
+ >
+ Select record set
+ </label>
+ <script
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ href="uri-attr:#"
+ >
+ Next 1
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="1"
+ cellspacing="0"
+ class="af_table_content"
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <th
+ class="af_column_header-text"
+ id="_idXXX"
+ nowrap="nowrap"
+ width="1%"
+ >
+ Details
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:test-id"
+ onclick="return _tableSort('formId',1,'mainId','string');"
+ >
+ StringHeader
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:separate-id"
+ onclick="return _tableSort('formId',1,'mainId','int');"
+ >
+ IntHeader
+ </th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd0"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ First
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 1
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd1"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Second
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 2
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd2"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Three
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 3
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd3"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Four
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 4
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd4"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Five
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 5
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _uixt_mainId=new CollectionComponent('formId','mainId');
+ </script>
+ <input
+ name="mainId:rangeStart"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </div>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <div
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_table_control-bar-top"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ width="100%"
+ >
+
+ </td>
+ <td
+ align="right"
+ valign="middle"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ id="mainId-nb"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-5 of 6
+ </option>
+ <option
+ value="6"
+ >
+ 6-6 of 6
+ </option>
+ </select>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId-nb__xc_c"
+ >
+ Select record set
+ </label>
+ <script
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <img
+ alt=""
+ height="1"
+ width="5"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ href="uri-attr:#"
+ >
+ Next 1
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="1"
+ cellspacing="0"
+ class="af_table_content"
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <th
+ class="af_column_header-text"
+ id="_idXXX"
+ nowrap="nowrap"
+ width="1%"
+ >
+ Details
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:test-id"
+ onclick="return _tableSort('formId',1,'mainId','string');"
+ >
+ StringHeader
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:separate-id"
+ onclick="return _tableSort('formId',1,'mainId','int');"
+ >
+ IntHeader
+ </th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd0"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ First
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 1
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd1"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Second
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 2
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd2"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Three
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 3
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd3"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Four
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 4
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd4"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Five
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 5
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _uixt_mainId=new CollectionComponent('formId','mainId');
+ </script>
+ <input
+ name="mainId:rangeStart"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </div>
<!--AttributeTest[allDetailsEnabled,false]-->
<div
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml?view=diff&rev=504714&r1=504713&r2=504714
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml Wed Feb 7 14:08:35 2007
@@ -2298,6 +2298,915 @@
</input>
</div>
+<!--AttributeTest[styleClass,null]-->
+
+ <div
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_table_control-bar-top"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ width="100%"
+ >
+
+ </td>
+ <td
+ align="right"
+ valign="middle"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ id="mainId-nb"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-5 of 6
+ </option>
+ <option
+ value="6"
+ >
+ 6-6 of 6
+ </option>
+ </select>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId-nb__xc_c"
+ >
+ Select record set
+ </label>
+ <script
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ href="uri-attr:#"
+ >
+ Next 1
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="1"
+ cellspacing="0"
+ class="af_table_content"
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <th
+ class="af_column_header-text"
+ id="_idXXX"
+ nowrap="nowrap"
+ style="word-break:keep-all"
+ width="1%"
+ >
+ Details
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:test-id"
+ onclick="return _tableSort('formId',1,'mainId','string');"
+ >
+ StringHeader
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:separate-id"
+ onclick="return _tableSort('formId',1,'mainId','int');"
+ >
+ IntHeader
+ </th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd0"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ First
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 1
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd1"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Second
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 2
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd2"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Three
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 3
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd3"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Four
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 4
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd4"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Five
+ </td>
+ <td
+ class="test-styleClass af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ >
+ 5
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _uixt_mainId=new CollectionComponent('formId','mainId');
+ </script>
+ <input
+ name="mainId:rangeStart"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </div>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <div
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_table_control-bar-top"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ width="100%"
+ >
+
+ </td>
+ <td
+ align="right"
+ valign="middle"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ id="mainId-nb"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <span
+ class="OraNavBarInactiveLink"
+ >
+ Previous
+ </span>
+ </td>
+ <td
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <select
+ class="AFFieldText"
+ id="mainId-nb__xc_c"
+ onchange="_navChoiceSubmit(this, 'formId','goto','mainId',1)"
+ onfocus="this._lastValue = this.selectedIndex"
+ title="Select record set"
+ >
+
+ <option
+ value="all"
+ >
+ Show All 6
+ </option>
+ <option
+ selected="selected"
+ value="1"
+ >
+ 1-5 of 6
+ </option>
+ <option
+ value="6"
+ >
+ 6-6 of 6
+ </option>
+ </select>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId-nb__xc_c"
+ >
+ Select record set
+ </label>
+ <script
+ >
+ _setSelectIndexById("mainId-nb__xc_c",1)
+ </script>
+ </td>
+ <td
+ >
+
+ <script
+ >
+ t(5,1)
+ </script>
+ </td>
+ <td
+ nowrap="nowrap"
+ valign="middle"
+ >
+
+ <a
+ class="OraNavBarActiveLink"
+ onclick="_navSubmit('formId', 'goto', 'mainId',1,'6');return false"
+ href="uri-attr:#"
+ >
+ Next 1
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ >
+
+ <table
+ border="0"
+ cellpadding="1"
+ cellspacing="0"
+ class="af_table_content"
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <th
+ class="af_column_header-text"
+ id="_idXXX"
+ nowrap="nowrap"
+ style="word-break:keep-all"
+ width="1%"
+ >
+ Details
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:test-id"
+ onclick="return _tableSort('formId',1,'mainId','string');"
+ >
+ StringHeader
+ </th>
+ <th
+ class="af_column_sortable-header-text OraSortableHeaderBorder"
+ id="mainId:separate-id"
+ onclick="return _tableSort('formId',1,'mainId','int');"
+ >
+ IntHeader
+ </th>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd0"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd0','0')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ First
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 1
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd1"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd1','1')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Second
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 2
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd2"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd2','2')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Three
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 3
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd3"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd3','3')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Four
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 4
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="_idXXX"
+ nowrap="nowrap"
+ >
+
+ <div
+ >
+
+ <a
+ id="mainIddd4"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+
+ <span
+ class="p_OraHideShowDisclosedSymbol"
+ title="Select to show information"
+ >
+ ►
+ </span>
+ </a>
+ <a
+ class="OraLink"
+ onclick="return _submitHideShow('formId',1,'show','mainId','mainIddd4','4')"
+ href="uri-attr:#"
+ >
+ Show
+ </a>
+ </div>
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:test-id"
+ >
+ Five
+ </td>
+ <td
+ class="af_column_cell-text OraTableBorder1111"
+ headers="mainId:separate-id"
+ style="test-inlineStyle"
+ >
+ 5
+ <div
+ >
+
+ </div>Introduced for separateRows attribute check
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <script
+ >
+ _uixt_mainId=new CollectionComponent('formId','mainId');
+ </script>
+ <input
+ name="mainId:rangeStart"
+ type="hidden"
+ value="0"
+ >
+
+ </input>
+ </div>
<!--AttributeTest[allDetailsEnabled,false]-->
<div