You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/02/20 11:34:00 UTC
svn commit: r629408 - in /myfaces/trinidad/trunk_1.2.x: src/site/xdoc/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
trinidad-impl/src/main/resources/META-INF/adf/styles/
trinidad-impl/src/test/resources/org/apac...
Author: matzew
Date: Wed Feb 20 02:33:56 2008
New Revision: 629408
URL: http://svn.apache.org/viewvc?rev=629408&view=rev
Log:
TRINIDAD-944
thx to Christi Toth for the patch
Modified:
myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIERtl-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalScrRdr-golden.xml
Modified: myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml Wed Feb 20 02:33:56 2008
@@ -681,7 +681,21 @@
<td style="white-space: nowrap">af|column::sortable-header-icon-format</td>
<td>Styles the icon sortable column headers.</td>
</tr>
- <tr>
+ <tr>
+ <td>af|column::sorted-header-text</td>
+ <td>Styles the currently sorted column header.
+ You can style the borders with this selector as well.</td>
+ </tr>
+ <tr>
+ <td>af|column::sorted-header-number</td>
+ <td>Styles the numeric sorted column header.
+ This includes the af|column::sorted-header-text selector.</td>
+ </tr>
+ <tr>
+ <td style="white-space: nowrap">af|column::sorted-header-icon-format</td>
+ <td>Styles the icon of the sorted column header.</td>
+ </tr>
+ <tr>
<td>.AFTableCellDataText:alias</td>
<td>Specifies the font family, font size and color for table data
text. This is included in the af|column::cell* selectors.</td>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java Wed Feb 20 02:33:56 2008
@@ -417,7 +417,7 @@
isNoWrap,
true); //isColHeader
- String styleClass = _getHeaderStyleClass(tContext, sortable);
+ String styleClass = getSortableHeaderStyleClass(tContext, sortability);
String borderStyleClass =
CellUtils.getHeaderBorderStyle(tContext,
arc,
@@ -785,8 +785,15 @@
_getNodeList(tContext, true).currentNode = parentNode;
}
- private String _getHeaderStyleClass(TableRenderingContext tContext,
- boolean isSortable)
+ /**
+ * Returns the skinning selector for the header
+ * taking into account the if the column is sortable or is sorted
+ * @param tContext the TableRenderingContext
+ * @param sortability the value returned by getSortability()
+ * @return the skinning selector for the header
+ */
+ protected String getSortableHeaderStyleClass(TableRenderingContext tContext,
+ int sortability)
{
ColumnData colData = tContext.getColumnData();
// if we are a columnGroup header, then we must be centered:
@@ -795,17 +802,25 @@
return SkinSelectors.AF_COLUMN_HEADER_ICON_STYLE;
}
- if (isSortable)
+ switch (sortability)
{
- return ColumnData.selectFormat(
- tContext,
- SkinSelectors.AF_COLUMN_SORTABLE_HEADER_STYLE_CLASS,
- SkinSelectors.AF_COLUMN_SORTABLE_HEADER_NUMBER_STYLE_CLASS,
- SkinSelectors.AF_COLUMN_SORTABLE_HEADER_ICON_STYLE_CLASS);
- }
- else
- {
- return getHeaderStyleClass(tContext);
+ //not sortable column
+ case SORT_NO:
+ return getHeaderStyleClass(tContext);
+ //sortable column (but not sorted)
+ case SORT_SORTABLE:
+ return ColumnData.selectFormat(
+ tContext,
+ SkinSelectors.AF_COLUMN_SORTABLE_HEADER_STYLE_CLASS,
+ SkinSelectors.AF_COLUMN_SORTABLE_HEADER_NUMBER_STYLE_CLASS,
+ SkinSelectors.AF_COLUMN_SORTABLE_HEADER_ICON_STYLE_CLASS);
+ //sorted column
+ default:
+ return ColumnData.selectFormat(
+ tContext,
+ SkinSelectors.AF_COLUMN_SORTED_HEADER_STYLE_CLASS,
+ SkinSelectors.AF_COLUMN_SORTED_HEADER_NUMBER_STYLE_CLASS,
+ SkinSelectors.AF_COLUMN_SORTED_HEADER_ICON_STYLE_CLASS);
}
}
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Wed Feb 20 02:33:56 2008
@@ -329,6 +329,12 @@
"af|column::total-number";
public static final String AF_COLUMN_TOTAL_TEXT_STYLE =
"af|column::total-text";
+ public static final String AF_COLUMN_SORTED_HEADER_STYLE_CLASS =
+ "af|column::sorted-header-text";
+ public static final String AF_COLUMN_SORTED_HEADER_NUMBER_STYLE_CLASS =
+ "af|column::sorted-header-number";
+ public static final String AF_COLUMN_SORTED_HEADER_ICON_STYLE_CLASS =
+ "af|column::sorted-header-icon-format";
// ================================ Icons ================================ //
public static final String AF_COLUMN_SORTED_ASCEND_ICON_NAME =
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Wed Feb 20 02:33:56 2008
@@ -2506,6 +2506,7 @@
<includeStyle name="AFTableCellDataVerticalAlign"/>
</style>
+ <!-- for sortable columns -->
<style selector="af|column::sortable-header-text">
<includeStyle selector="af|column::header-text"/>
<property name="cursor">pointer</property>
@@ -2520,6 +2521,22 @@
<style selector="af|column::sortable-header-icon-format">
<includeStyle selector="af|column::sortable-header-text"/>
+ <includeStyle name="AFCenterTextAlign"/>
+ </style>
+
+ <!-- for the currently sorted column -->
+ <style selector="af|column::sorted-header-text">
+ <includeStyle selector="af|column::sortable-header-text"/>
+ <includeStyle selector="AFVeryDarkAccentBackground"/>
+ </style>
+
+ <style selector="af|column::sorted-header-number">
+ <includeStyle selector="af|column::sorted-header-text"/>
+ <includeStyle name="AFRightTextAlign"/>
+ </style>
+
+ <style selector="af|column::sorted-header-icon-format">
+ <includeStyle selector="af|column::sorted-header-text"/>
<includeStyle name="AFCenterTextAlign"/>
</style>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimal-golden.xml Wed Feb 20 02:33:56 2008
@@ -8669,7 +8669,7 @@
StringHeader
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','int','ascending');"
@@ -9132,7 +9132,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','string','descending');"
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIE-golden.xml Wed Feb 20 02:33:56 2008
@@ -8574,7 +8574,7 @@
StringHeader
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','int','ascending');"
@@ -9032,7 +9032,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','string','descending');"
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIERtl-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalIERtl-golden.xml Wed Feb 20 02:33:56 2008
@@ -8574,7 +8574,7 @@
StringHeader
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','int','ascending');"
@@ -9032,7 +9032,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','string','descending');"
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml Wed Feb 20 02:33:56 2008
@@ -8183,7 +8183,7 @@
StringHeader
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','int','ascending');"
@@ -8619,7 +8619,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','string','descending');"
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml Wed Feb 20 02:33:56 2008
@@ -7871,7 +7871,7 @@
</a>
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
>
@@ -8268,7 +8268,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalSaf-golden.xml Wed Feb 20 02:33:56 2008
@@ -8555,7 +8555,7 @@
StringHeader
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','int','ascending');"
@@ -9012,7 +9012,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','string','descending');"
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalScrRdr-golden.xml?rev=629408&r1=629407&r2=629408&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalScrRdr-golden.xml Wed Feb 20 02:33:56 2008
@@ -8669,7 +8669,7 @@
StringHeader
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:separate-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','int','ascending');"
@@ -9132,7 +9132,7 @@
Details
</th>
<th
- class="af_column_sortable-header-text"
+ class="af_column_sorted-header-text"
id="mainId:test-id"
nowrap="nowrap"
onclick="return _tableSort('formId',1,'mainId','string','descending');"