summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-03-23 03:09:32 (EDT)
committerManik Kishore2012-06-19 07:23:17 (EDT)
commit44142318b9a57cf2f45ffbb8c79ac2208ca0af65 (patch)
tree018e56e03c96a92303752ddaf1b71ba8bad116cd
parentdaa5f0b2497a8b036ac937ddf50e29066a3346fd (diff)
downloadorg.eclipse.stardust.ui.web-44142318b9a57cf2f45ffbb8c79ac2208ca0af65.zip
org.eclipse.stardust.ui.web-44142318b9a57cf2f45ffbb8c79ac2208ca0af65.tar.gz
org.eclipse.stardust.ui.web-44142318b9a57cf2f45ffbb8c79ac2208ca0af65.tar.bz2
Jira-ID: CRNT-23609
1)Added method isAtleastOneFilterVisible() to verifiy if Filter Column in visible in DataTable.java 2)Added style in portalComponentStyle.css for genericTableHdr to set vertical-align:top; for column headers. 3)Added panelGroup in columnHeader in genericDataTable.xhtml to align Non Filterable columns. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54805 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/table/DataTable.java20
-rw-r--r--portal-common/src/main/resources/META-INF/tags/genericDataTable.xhtml9
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/css/portalComponentStyle.css17
3 files changed, 41 insertions, 5 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/table/DataTable.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/table/DataTable.java
index c434b93..08248c9 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/table/DataTable.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/table/DataTable.java
@@ -419,6 +419,26 @@ public class DataTable<T extends IRowModel> implements IDataTable<T>, ITableData
}
/**
+ * Method to validate any Filter Column visible , used for aligning Non Filterable
+ * column Header
+ *
+ * @return
+ */
+ public boolean isAtleastOneFilterVisible()
+ {
+ if (null != columnModel)
+ {
+ List<ColumnPreference> colPref = columnModel.getRenderableLeafColumns();
+ for (ColumnPreference pref : colPref)
+ {
+ if (pref.isVisible() && pref.getColumnDataFilterPopup() != null)
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
*
*/
public void resetExportFiles()
diff --git a/portal-common/src/main/resources/META-INF/tags/genericDataTable.xhtml b/portal-common/src/main/resources/META-INF/tags/genericDataTable.xhtml
index e566ea3..0e118e2 100644
--- a/portal-common/src/main/resources/META-INF/tags/genericDataTable.xhtml
+++ b/portal-common/src/main/resources/META-INF/tags/genericDataTable.xhtml
@@ -244,7 +244,7 @@
</c:if>
<c:choose>
<c:when test="#{sortSupported and colPref.sortable}">
- <ice:commandSortHeader columnName="#{colPref.columnProperty}">
+ <ice:commandSortHeader columnName="#{colPref.columnProperty}" styleClass="iceCmdSrtHdr">
<pc:automationTag value="auto-DT-Col-Sorter" standAlone="false" />
<c:choose>
<c:when test="#{(selectColumn eq colPref.columnName) and (colPref.columnRenderType eq 'READ_WRITE')}">
@@ -319,10 +319,15 @@
<c:if test="#{renderColumnHeaders and not columnModel.columnGropuing}">
<f:facet name="header">
<ice:panelGrid columns="1" width="100%">
- <ice:panelGroup rendered="#{table.showFilterAtColumns and item.columnDataFilterPopup != null}">
+ <ice:panelGroup rendered="#{table.showFilterAtColumns and item.columnDataFilterPopup != null}" style="vertical-align:top;">
<pc:tableFilter bean="#{bean}" filterPopup="#{item.columnDataFilterPopup}"
anchorStyle="border: none" showAnchorTitle="false" /> <!-- disabled="#{emptyData}" -->
</ice:panelGroup>
+ <ice:panelGroup rendered="#{table.atleastOneFilterVisible and item.columnDataFilterPopup == null}">
+ <ice:panelGroup styleClass="clearing" />
+ <ice:outputText />
+ <ice:panelGroup styleClass="clearing" />
+ </ice:panelGroup>
<ice:panelGroup>
<c:choose>
<c:when test="#{sortSupported and item.sortable}">
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/portalComponentStyle.css b/portal-common/src/main/resources/META-INF/xhtml/css/portalComponentStyle.css
index ec19912..37cb465 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/css/portalComponentStyle.css
+++ b/portal-common/src/main/resources/META-INF/xhtml/css/portalComponentStyle.css
@@ -66,16 +66,27 @@
.genericTableSortColHdr
{
background: transparent url("./css-images/colHeader-Sort.png") no-repeat scroll right center;
- height: 20px;
+ height: 16px;
width: 10px;
padding-left: 4px;
}
+.genericTableHdr{
+ text-align: center;
+ font: 11px tahoma;
+ color: #484848;
+ padding: 5px;
+ font-weight: bold;
+ background: #FFF url( './css-images/table_col_header.gif' ) repeat-x bottom left;
+ border: 1px solid #d9d9d9;
+ vertical-align:top;
+}
+
/* Overrides the ICEfaces Default Styles in connection with above style */
.iceCmdSrtHdrAsc
{
background: transparent url("./css-images/colHeader-Sort-Acending.png") no-repeat scroll right center;
- height: 20px;
+ height: 16px;
width: 10px;
padding-left: 4px;
}
@@ -83,7 +94,7 @@
.iceCmdSrtHdrDesc
{
background: transparent url("./css-images/colHeader-Sort-Decending.png") no-repeat scroll right center;
- height: 20px;
+ height: 16px;
width: 10px;
padding-left: 4px;
}