You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2010/04/15 09:18:03 UTC

svn commit: r934307 - in /myfaces/trinidad/branches/trinidad-1.2.x: src/site/xdoc/ trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xh...

Author: ckormos
Date: Thu Apr 15 07:18:03 2010
New Revision: 934307

URL: http://svn.apache.org/viewvc?rev=934307&view=rev
Log:
Patch applied for [TRINIDAD-1785] - able and TreeTable selector links customization. Thanks to Cosmin Martinconi for providing the patch.

Added:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/collapseAll.png   (with props)
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/expandAll.png   (with props)
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-minus.png   (with props)
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-plus.png   (with props)
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectAll.png   (with props)
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectNone.png   (with props)
Modified:
    myfaces/trinidad/branches/trinidad-1.2.x/src/site/xdoc/skin-selectors.xml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css

Modified: myfaces/trinidad/branches/trinidad-1.2.x/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/src/site/xdoc/skin-selectors.xml?rev=934307&r1=934306&r2=934307&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/src/site/xdoc/skin-selectors.xml Thu Apr 15 07:18:03 2010
@@ -3692,6 +3692,14 @@
             <td>af|table::next-disabled-icon</td>
             <td>The next icon disabled.</td>
           </tr>
+          <tr>
+            <td>af|table::select-all-icon</td>
+            <td>The select-all link icon.</td>
+          </tr>
+          <tr>
+            <td>af|table::select-none-icon</td>
+            <td>The select-none link icon.</td>
+          </tr>
         </table>
       </subsection>
       <a name="train"></a>
@@ -4166,6 +4174,14 @@
             <td>The collapse-all link icon.</td>
           </tr>
           <tr>
+            <td>af|treeTable::select-all-icon</td>
+            <td>The select-all link icon.</td>
+          </tr>
+          <tr>
+            <td>af|treeTable::select-none-icon</td>
+            <td>The select-none link icon.</td>
+          </tr>            
+          <tr>
             <td>af|treeTable::node-icon</td>
             <td>This icon selector is used in the case the Node class has a getNodeType()
               method that returns the node type as string. The nodetype gets added to this

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java?rev=934307&r1=934306&r2=934307&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java Thu Apr 15 07:18:03 2010
@@ -36,6 +36,7 @@ import org.apache.myfaces.trinidad.compo
 import org.apache.myfaces.trinidad.context.RenderingContext;
 import org.apache.myfaces.trinidad.render.CoreRenderer;
 import org.apache.myfaces.trinidad.render.XhtmlConstants;
+import org.apache.myfaces.trinidad.skin.Icon;
 import org.apache.myfaces.trinidad.util.IntegerUtils;
 import org.apache.myfaces.trinidadinternal.io.RepeatIdResponseWriter;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
@@ -226,7 +227,16 @@ public class DesktopTableRenderer extend
     renderStyleClass(context, arc, SkinSelectors.NAV_BAR_ALINK_STYLE_CLASS);
     writer.writeAttribute("onclick", onclick, null);
     writer.writeURIAttribute("href", "#", null);
-    writer.writeText(arc.getTranslatedString(translationKey), null);
+
+    Icon icon = arc.getIcon(getControlLinkIconName(translationKey));
+    if (icon != null)
+    {
+      OutputUtils.renderIcon(context, arc, icon, arc.getTranslatedString(translationKey),
+                             null);
+    } else
+    {
+      writer.writeText(arc.getTranslatedString(translationKey), null);
+    }
     writer.endElement("a");
 
     if (hasDivider)
@@ -1100,6 +1110,15 @@ public class DesktopTableRenderer extend
     }
   }
 
+  protected String getControlLinkIconName(String translationKey)
+  {
+    if (translationKey == null)
+      return null;
+
+    return translationKey.equals(_SELECT_ALL_TEXT_KEY) ? SkinSelectors.AF_TABLE_SELECT_ALL_ICON_NAME
+                                                       : SkinSelectors.AF_TABLE_SELECT_NONE_ICON_NAME;
+  }
+
   protected String getSummary(FacesBean bean)
   {
     return toString(bean.getProperty(_summaryKey));
@@ -1216,9 +1235,9 @@ public class DesktopTableRenderer extend
 
   private static final String _HIDE_ALL_DETAILS_TEXT_KEY = "af_table.HIDE_ALL_DETAILS";
 
-  private static final String _SELECT_ALL_TEXT_KEY = "af_tableSelectMany.SELECT_ALL";
+  protected static final String _SELECT_ALL_TEXT_KEY = "af_tableSelectMany.SELECT_ALL";
 
-  private static final String _SELECT_NONE_TEXT_KEY = "af_tableSelectMany.SELECT_NONE";
+  protected static final String _SELECT_NONE_TEXT_KEY = "af_tableSelectMany.SELECT_NONE";
 
   public static final String LINKS_DIVIDER_TEXT = "\u00a0|\u00a0";
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java?rev=934307&r1=934306&r2=934307&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Thu Apr 15 07:18:03 2010
@@ -394,6 +394,16 @@ public class TreeTableRenderer extends D
     //rowData.setRowCount(rows);
   }
 
+  protected String getControlLinkIconName(String translationKey)
+  {
+    if (translationKey == null)
+      return null;
+
+    return translationKey.equals(_SELECT_ALL_TEXT_KEY) ? SkinSelectors.AF_TREE_TABLE_SELECT_ALL_ICON_NAME
+                                                       : SkinSelectors.AF_TREE_TABLE_SELECT_NONE_ICON_NAME;
+  }
+
+
   protected SpecialColumnRenderer getFocusColumnRenderer()
   {
     return _FOCUS;

Modified: myfaces/trinidad/branches/trinidad-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/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=934307&r1=934306&r2=934307&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Thu Apr 15 07:18:03 2010
@@ -1357,6 +1357,10 @@ public final class SkinSelectors
      "af|table::disclosed-icon";
    public static final String AF_TABLE_SD_UNDISCLOSED_ICON_NAME =
      "af|table::undisclosed-icon";
+   public static final String AF_TABLE_SELECT_ALL_ICON_NAME =
+     "af|table::select-all-icon";
+   public static final String AF_TABLE_SELECT_NONE_ICON_NAME =
+     "af|table::select-none-icon";
 
    //                                                                         //
    //                                                                         //
@@ -1547,6 +1551,10 @@ public final class SkinSelectors
      "af|treeTable::expand-all-icon";
    public static final String AF_TREE_TABLE_COLLAPSE_ALL_ICON_NAME =
      "af|treeTable::collapse-all-icon";
+   public static final String AF_TREE_TABLE_SELECT_ALL_ICON_NAME =
+     "af|treeTable::select-all-icon";
+   public static final String AF_TREE_TABLE_SELECT_NONE_ICON_NAME =
+     "af|treeTable::select-none-icon";    
    public static final String AF_TREE_TABLE_NODE_ICON =
      "af|treeTable::node-icon";
 

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/collapseAll.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/collapseAll.png?rev=934307&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/collapseAll.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/expandAll.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/expandAll.png?rev=934307&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/expandAll.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-minus.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-minus.png?rev=934307&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-minus.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-plus.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-plus.png?rev=934307&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/nav-plus.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectAll.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectAll.png?rev=934307&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectAll.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectNone.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectNone.png?rev=934307&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/selectNone.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css?rev=934307&r1=934306&r2=934307&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css Thu Apr 15 07:18:03 2010
@@ -591,6 +591,8 @@
     width: 20px;
     height: 20px;
     font-size: 0;
+    line-height: 0;
+    color: transparent;
     overflow: hidden;
 }
 
@@ -601,7 +603,7 @@
 }
 @agent ie and (version: 5), ie and (version: 6) {
     .CBIconLook:alias {
-        background: transparent url(/skins/casablanca/images/icons/iconsNormal_8bit.png) no-repeat top left;
+        background: transparent url(/adf/images/casablanca/icons/iconsNormal_8bit.png) no-repeat top left;
     }
 }
 .CBIconLookHover:alias {
@@ -1204,6 +1206,7 @@
 .CBTableSubControlBar:alias {
     -tr-rule-ref: selector(".CBTableControlBar:alias");
     border-width: 1px 1px 0 1px;
+    padding: 4px;
 }
 /* fix a Webkit problem */
 @agent webkit {
@@ -1231,7 +1234,40 @@
 .CBTableBody:alias {
     -tr-rule-ref: selector(".CBTextCellLookCommon:alias");
 }
-
+/* Table icons */
+/* We don't use ":alias" sufix because didn't work, probably its a bug */
+.CBTableSelectAllIcon{
+    -tr-rule-ref: selector(".CBIconLook:alias");
+    -tr-rule-ref: selector(".CBIconSelectAll:alias");
+}
+.CBTableSelectAllIconHover {
+    -tr-rule-ref: selector(".CBIconLookHover:alias");
+    -tr-rule-ref: selector(".CBIconSelectAll:alias");
+}
+.CBTableSelectNoneIcon {
+    -tr-rule-ref: selector(".CBIconLook:alias");
+    -tr-rule-ref: selector(".CBIconSelectNone:alias");
+}
+.CBTableSelectNoneIconHover {
+    -tr-rule-ref: selector(".CBIconLookHover:alias");
+    -tr-rule-ref: selector(".CBIconSelectNone:alias");
+}
+.CBTableSelectExpandAllIcon {
+    -tr-rule-ref: selector(".CBIconLook:alias");
+    -tr-rule-ref: selector(".CBIconExpandAll:alias");
+}
+.CBTableSelectExpandAllIconHover {
+    -tr-rule-ref: selector(".CBIconLookHover:alias");
+    -tr-rule-ref: selector(".CBIconExpandAll:alias");
+}
+.CBTableSelectCollapseAllIcon {
+    -tr-rule-ref: selector(".CBIconLook:alias");
+    -tr-rule-ref: selector(".CBIconCollapseAll:alias");
+}
+.CBTableSelectCollapseAllIconHover {
+    -tr-rule-ref: selector(".CBIconLookHover:alias");
+    -tr-rule-ref: selector(".CBIconCollapseAll:alias");
+}
 /* Train Control ---------------------------------------------------------------------------------------------------- */
 .CBTrain:alias {
     background: white url(/adf/images/casablanca/backgrounds/trainConnector.png) repeat-x center left;    
@@ -3603,7 +3639,6 @@ af|table::control-bar-bottom {
 }
 af|table::sub-control-bar {
     -tr-rule-ref: selector(".CBTableSubControlBar");
-    padding: 8px 3px;
 }
 .OraHGridLocatorHeader {
     -tr-rule-ref: selector(".CBTablePathBar");
@@ -3612,12 +3647,12 @@ af|table::sub-control-bar {
 /* active navigation buttons */
 af|table::sub-control-bar .OraLink,                                                     
 af|table::sub-control-bar af|showDetail::prompt-link {
-   -tr-rule-ref: selector(".CBTableBarButton") ;
+    -tr-rule-ref: selector(".CBTableBarButton") ;
 }
 /* active hover navigation buttons */
 af|table::sub-control-bar .OraLink:hover,
 af|table::sub-control-bar af|showDetail::prompt-link:hover {
-   -tr-rule-ref: selector(".CBTableBarButtonHover");
+    -tr-rule-ref: selector(".CBTableBarButtonHover");
 }
 /* inactive navigation buttons */
 af|table::control-bar-top table td span,
@@ -3633,11 +3668,22 @@ af|column::header-text {
 /* sub control bar link like buttons */
 af|table::sub-control-bar .OraNavBarActiveLink,
 af|table::sub-control-bar af|showDetail::prompt-link {
-   -tr-rule-ref: selector(".CBTableBarButton");
+    -tr-rule-ref: selector(".CBTableBarButton");
+}
+af|table::sub-control-bar .OraNavBarActiveLink {
+    float: left;
+    display: block;
+    margin-right: 2px;
 }
 af|table::sub-control-bar .OraNavBarActiveLink:hover,
 af|table::sub-control-bar af|showDetail::prompt-link:hover {
-   -tr-rule-ref: selector(".CBTableBarButtonHover");
+    -tr-rule-ref: selector(".CBTableBarButtonHover");
+}
+af|table::select-all-icon {
+    content:url(/adf/images/casablanca/icons/selectAll.png);
+}
+af|table::select-none-icon {
+    content:url(/adf/images/casablanca/icons/selectNone.png);
 }
 .AFTableCellDataBorderColor:alias, TableCellHeaderBorderColor, af|column::header-text,
 af|table::content {
@@ -3692,6 +3738,14 @@ af|table::content af|table::column-foote
     display: table-cell;
     -tr-rule-ref: selector(".CBTableFooterCell");
 }
+/* Clear some legacy stuff */
+af|table::control-bar-top tbody tr td,
+af|table::control-bar-bottom tbody tr td,
+af|table::sub-control-bar tbody tr td {
+    font-size: 0px;
+    line-height: 0px;
+    color: transparent; /* Fix a WebKit problem */
+}
 
 /* Tree table component --------------------------------------------------------------------------------------------- */
 /* CasaBlanca styles */
@@ -3748,7 +3802,6 @@ af|table::content af|table::column-foote
 }
 .CBTreeTableSubControlBar {
     -tr-rule-ref: selector(".CBTableSubControlBar:alias");
-    padding: 8px 3px;
 }
 .CBTreeTablePathBar {
     -tr-rule-ref: selector(".CBTablePathBar:alias");
@@ -3756,6 +3809,9 @@ af|table::content af|table::column-foote
 .CBTreeTableBody {
     -tr-rule-ref: selector(".CBTableBody:alias");
 }
+.CBTreeTableExpansionButton {
+    top: -2px; /* overwrite the default position */
+}
 .CBTreeTableBarButton {
     -tr-rule-ref: selector(".CBButton:alias") ;
     display: inline;
@@ -3777,6 +3833,7 @@ af|treeTable::control-bar-bottom {
 }
 af|treeTable::sub-control-bar {
     -tr-rule-ref: selector(".CBTreeTableSubControlBar");
+    padding: 4px;
 }
 /* inactive navigation like buttons */
 af|treeTable::control-bar-top table td span,
@@ -3787,15 +3844,41 @@ af|treeTable::sub-control-bar table td s
 /* sub control bar link like buttons */
 af|treeTable::sub-control-bar .OraNavBarActiveLink,
 af|treeTable::sub-control-bar af|showDetail::prompt-link {
-   -tr-rule-ref: selector(".CBTreeTableBarButton");
+    -tr-rule-ref: selector(".CBTreeTableBarButton");
+}
+af|treeTable::sub-control-bar .OraNavBarActiveLink {
+    float: left;
+    display: block;
+    margin-right: 2px;
 }
 af|treeTable::sub-control-bar .OraNavBarActiveLink:hover,
 af|treeTable::sub-control-bar af|showDetail::prompt-link:hover {
-   -tr-rule-ref: selector(".CBTreeTableBarButtonHover");
+    -tr-rule-ref: selector(".CBTreeTableBarButtonHover");
+}
+af|treeTable::select-all-icon {
+    content:url(/adf/images/casablanca/icons/selectAll.png);
+}
+af|treeTable::select-none-icon {
+    content:url(/adf/images/casablanca/icons/selectNone.png);
+}
+af|treeTable::collapse-all-icon {
+    content:url(/adf/images/casablanca/icons/collapseAll.png);
+}
+af|treeTable::expand-all-icon {
+    content:url(/adf/images/casablanca/icons/expandAll.png);
+}
+af|treeTable::expanded-icon {
+    content:url(/adf/images/casablanca/icons/nav-minus.png);
+}
+af|treeTable::collapsed-icon {
+    content:url(/adf/images/casablanca/icons/nav-plus.png);
 }
 af|treeTable::content {
     -tr-rule-ref: selector(".CBTreeTableBody");
 }
+af|treeTable::expansion {       
+    -tr-rule-ref: selector(".CBTreeTableExpansionButton");
+}
 af|treeTable::content af|column::cell-text, af|treeTable::content af|column::cell-number,
 af|treeTable::content af|column::cell-icon-format, af|treeTable::content af|tableSelectOne::cell-icon-format,
 af|treeTable::content af|tableSelectMany::cell-icon-format {
@@ -3845,11 +3928,25 @@ af|treeTable::content af|treeTable::colu
     display: table-cell;
     -tr-rule-ref: selector(".CBTreeTableFooterCell");
 }
+/* Clear some legacy stuff */
+af|treeTable::control-bar-top tbody tr td,
+af|treeTable::control-bar-bottom tbody tr td,
+af|treeTable::sub-control-bar tbody tr td {
+    font-size: 0px;
+    line-height: 0px;
+    color: transparent; /* Fix a WebKit problem */
+}
 
 /* Tree component --------------------------------------------------------------------------------------------------- */
 /* No any class hooks for some particular overwritings.
 /* We will go on the Navigation Tree component styles
  */
+af|tree::expanded-icon {
+    content:url(/adf/images/casablanca/icons/nav-minus.png);
+}
+af|tree::collapsed-icon {
+    content:url(/adf/images/casablanca/icons/nav-plus.png);
+}
 
 /* Layouts ---------------------------------------------------------------------------------------------------------- */
 /* Define styles used in: