incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r482380 - in /incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main: java/org/apache/myfaces/trinidadinternal/renderkit/core/ java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/ resources/META-INF/adf/styles/
Date Mon, 04 Dec 2006 21:55:05 GMT
Author: jwaldman
Date: Mon Dec  4 13:55:04 2006
New Revision: 482380

URL: http://svn.apache.org/viewvc?view=rev&rev=482380
Log:
Add the full skin selector -> portlet style class name map in SimplePortletSkin.java

Modified:
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-portlet.xss

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?view=diff&rev=482380&r1=482379&r2=482380
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
Mon Dec  4 13:55:04 2006
@@ -240,6 +240,8 @@
     if (styleClass == null) return null;
 
     styleClass = getSkinResourceMappedKey(styleClass);
+    // Most likely the _styleMap is a shortened style class map. In the case of portlets,
+    // it is a full name-> portlet style class map.
     String shortenedStyle = null;
     if (_styleMap != null)
     {
@@ -254,7 +256,7 @@
       // namespace character '|' is not in the name.
       // we do the same thing in CSSUtils when we write the full selector
       // to the CSS file.
-      styleClass = StyleUtils.convertToValidSelector(styleClass.toString());
+      styleClass = StyleUtils.convertToValidSelector(styleClass);
     }
     return styleClass;
   }

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java?view=diff&rev=482380&r1=482379&r2=482380
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
Mon Dec  4 13:55:04 2006
@@ -13,6 +13,7 @@
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
 import org.apache.myfaces.trinidadinternal.renderkit.core.skin.BaseDesktopSkin;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
+import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.simple.desktop.SimpleDesktopConstants;
 
@@ -101,10 +102,103 @@
   }
 
 
-  private static final Map<String, String> _STYLES_MAP = new HashMap<String, String>();
+  private static final Map<String, String> _STYLES_MAP = new HashMap<String, String>(350);
   private static final String _NULL_STYLE = new String();
   private static final String _PORTLET_FONT = "portlet-font";
   private static final String _PORTLET_FONT_DIM = "portlet-font-dim";
+  
+  // all these map to portlet-form-label
+  private static final String[] _FORM_LABEL_SELECTORS = new String[]
+  {
+    SkinSelectors.AF_LABEL_TEXT_STYLE_CLASS,
+    "af|outputLabel",
+    "af|inputChoice::label",
+    "af|inputColor::label",
+    "af|inputDate::label",         
+    "af|inputFile::label",
+    "af|inputListOfValues::label",     
+    "af|inputNumberSpinbox::label",
+    "af|inputText::label",
+    "af|panelLabelAndMessage::label",    
+    "af|selectBooleanCheckbox::label",
+    "af|selectBooleanRadio::label",
+    "af|selectManyCheckbox::label",
+    "af|selectManyListbox::label", 
+    "af|selectOneChoice::label",
+    "af|selectOneListbox::label", 
+    "af|selectOneRadio::label", 
+    XhtmlLafConstants.AF_MENU_CHOICE_LABEL_STYLE_CLASS,
+    SkinSelectors.SHUTTLE_HEADER_STYLE_CLASS,
+  };
+  
+  // all these map to portlet-form-input-field
+  private static final String[] _FORM_INPUT_SELECTORS = new String[]
+  {
+    "af|inputChoice::content",
+    "af|inputFile::content",
+    "af|inputNumberSpinbox::content",
+    "af|inputText::content",
+    "af|inputColor::content",
+    SkinSelectors.AF_SELECT_INPUT_DATE_CONTENT_STYLE_CLASS,
+    "af|inputListOfValues::content", 
+    "af|panelLabelAndMessage::content", 
+  };  
+   
+  // portlet-form-button
+  private static final String[] _PORTLET_FORM_BUTTON = new String[]
+  {
+    SkinSelectors.AF_COMMAND_BUTTON_STYLE_CLASS,
+    SkinSelectors.AF_GO_BUTTON_STYLE_CLASS,
+    SkinSelectors.AF_RESET_BUTTON_STYLE_CLASS,
+    SkinSelectors.AF_NAVIGATION_LEVEL_CHOICE_BUTTON_STYLE_CLASS
+  };
+
+
+  // all these map to portlet-table-text
+  // portlet-table-text: Any text in a table cell
+  private static final String[] _TABLE_TEXT_SELECTORS = new String[]
+  {
+    SkinSelectors.AF_TABLE_CONTROL_BAR_TOP_STYLE,
+    SkinSelectors.AF_TREE_TABLE_CONTROL_BAR_TOP_STYLE,
+    SkinSelectors.AF_TABLE_CONTROL_BAR_BOTTOM_STYLE,
+    SkinSelectors.AF_TREE_TABLE_CONTROL_BAR_BOTTOM_STYLE,
+    SkinSelectors.AF_TABLE_SUB_CONTROL_BAR_STYLE,
+    SkinSelectors.AF_TREE_TABLE_SUB_CONTROL_BAR_STYLE,
+    "OraHGridLocatorHeader",
+    SimpleDesktopConstants.AF_MENU_TABS_STYLE_CLASS,
+    SimpleDesktopConstants.AF_MENU_BAR_STYLE_CLASS,
+    SimpleDesktopConstants.AF_PANEL_SIDE_BAR_STYLE_CLASS,
+  };
+  
+  // These map to 'portlet-table-body' + itself (add portlet-table-body to the style class
)
+  private static final String[] _TABLE_BODY_PLUS_ITSELF = new String[]
+  {
+    SkinSelectors.AF_COLUMN_CELL_NUMBER_STYLE, 
+    SkinSelectors.AF_COLUMN_CELL_ICON_FORMAT_STYLE,
+    SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_FORMAT_STYLE,
+    SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_FORMAT_STYLE,
+    SkinSelectors.TABLE_SELECT_CELL_STYLE,           
+  };
+  
+  // These map to 'portlet-table-alternate' + itself (add portlet-table-alternate to the
style class )
+  private static final String[] _TABLE_ALT_PLUS_ITSELF = new String[]
+  {
+    SkinSelectors.AF_COLUMN_CELL_ICON_BAND_STYLE, 
+    SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_BAND_STYLE,
+    SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_BAND_STYLE,
+    SkinSelectors.AF_COLUMN_CELL_NUMBER_BAND_STYLE,
+    SkinSelectors.TABLE_BAND_SELECT_CELL_STYLE,           
+  };
+  
+  // These map to 'portlet-table-header' + itself (add portlet-table-header to the style
class )
+  private static final String[] _TABLE_HDR_PLUS_ITSELF = new String[]
+  {
+      SkinSelectors.AF_COLUMN_HEADER_NUMBER_STYLE,   
+      SkinSelectors.AF_COLUMN_HEADER_ICON_STYLE,
+      SkinSelectors.AF_COLUMN_ROW_HEADER_TEXT_STYLE,
+  };
+
+
 
   static
   {
@@ -115,324 +209,224 @@
     // make the component look decent.
     // I blank out the parts I don't want in porlet-desktop.xss
 
-    // Begin table mappings
-    // --------------------
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_CONTROL_BAR_TOP_STYLE,
-      "portlet-table-text");
-    _STYLES_MAP.put(SkinSelectors.AF_TREE_TABLE_CONTROL_BAR_TOP_STYLE,
-      "portlet-table-text");
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_CONTROL_BAR_BOTTOM_STYLE,
-      "portlet-table-text");
-    _STYLES_MAP.put(SkinSelectors.AF_TREE_TABLE_CONTROL_BAR_BOTTOM_STYLE,
-      "portlet-table-text");
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_SUB_CONTROL_BAR_STYLE,
-      "portlet-table-text");
-    _STYLES_MAP.put(SkinSelectors.AF_TREE_TABLE_SUB_CONTROL_BAR_STYLE,
-      "portlet-table-text");
-    _STYLES_MAP.put("OraHGridLocatorHeader",
-      "portlet-table-text");
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_TEXT_STYLE,
-      "portlet-table-body");
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_TEXT_BAND_STYLE,
-      "portlet-table-alternate");
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_NUMBER_STYLE,
-      "portlet-table-body " +
-      SkinSelectors.AF_COLUMN_CELL_NUMBER_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_NUMBER_BAND_STYLE,
-      "portlet-table-alternate " +
-      SkinSelectors.AF_COLUMN_CELL_NUMBER_BAND_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_ICON_FORMAT_STYLE,
-      "portlet-table-body " +
-      SkinSelectors.AF_COLUMN_CELL_ICON_FORMAT_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_FORMAT_STYLE,
-      "portlet-table-body " +
-      SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_FORMAT_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_FORMAT_STYLE,
-      "portlet-table-body " +
-      SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_FORMAT_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.TABLE_SELECT_CELL_STYLE,
-      "portlet-table-body " +
-      SkinSelectors.TABLE_SELECT_CELL_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_ICON_BAND_STYLE,
-      "portlet-table-alternate " +
-      SkinSelectors.AF_COLUMN_CELL_ICON_BAND_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_BAND_STYLE,
-      "portlet-table-alternate " +
-      SkinSelectors.AF_TABLE_SELECT_ONE_CELL_ICON_BAND_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_BAND_STYLE,
-      "portlet-table-alternate " +
-      SkinSelectors.AF_TABLE_SELECT_MANY_CELL_ICON_BAND_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.TABLE_BAND_SELECT_CELL_STYLE,
-      "portlet-table-alternate " +
-      SkinSelectors.TABLE_BAND_SELECT_CELL_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_HEADER_TEXT_STYLE,
-      "portlet-table-header");
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_HEADER_NUMBER_STYLE,
-      "portlet-table-header " +
-      SkinSelectors.AF_COLUMN_HEADER_NUMBER_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_HEADER_ICON_STYLE,
-      "portlet-table-header " +
-      SkinSelectors.AF_COLUMN_HEADER_ICON_STYLE);
-
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_ROW_HEADER_TEXT_STYLE,
-      "portlet-table-header " +
-      SkinSelectors.AF_COLUMN_ROW_HEADER_TEXT_STYLE);
-
-
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_DETAIL_STYLE,
-      "portlet-table-body");
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_NUMBER_STYLE,
-      "portlet-table-body");
-    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_TEXT_STYLE,
-      "portlet-table-body");
-    _STYLES_MAP.put(SkinSelectors.AF_TABLE_COLUMN_FOOTER_STYLE,
-      "portlet-table-footer");
-
-
-
-    _STYLES_MAP.put(SkinSelectors.NAV_BAR_ILINK_STYLE_CLASS,
-      _PORTLET_FONT_DIM);
-    _STYLES_MAP.put(SkinSelectors.NAV_BAR_ALINK_STYLE_CLASS,
-      _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.NAV_BAR_VIEW_STYLE_CLASS,
-      _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0001_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0010_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0011_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0100_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0101_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0110_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0111_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1000_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1001_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1010_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1011_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1100_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1101_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1110_STYLE,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1111_STYLE,
-      _NULL_STYLE);
-
-    // selectInputDate and chooseDate have tables
-    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_HEADER_STYLE_CLASS,
-      "portlet-table-header");
-    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_HEADER_STYLE_CLASS,
-      "portlet-table-header");
-    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_CONTENT_STYLE_CLASS,
-      "portlet-table-body");
-    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_CONTENT_STYLE_CLASS,
-      "portlet-table-body");
-    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_DISABLED_STYLE_CLASS,
-      _PORTLET_FONT_DIM);
-    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_ENABLED_STYLE_CLASS,
-      _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_DISABLED_STYLE_CLASS,
-      _PORTLET_FONT_DIM);
-    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_ENABLED_STYLE_CLASS,
-      _PORTLET_FONT);
-    // keep boldness
-    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_SELECTED_STYLE_CLASS,
-      "portlet-font " +
-      SkinSelectors.AF_CHOOSE_DATE_SELECTED_STYLE_CLASS);
-    // keep boldness
-    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_SELECTED_STYLE_CLASS,
-      "portlet-font " +
-      SkinSelectors.AF_SELECT_INPUT_DATE_SELECTED_STYLE_CLASS);
-
-    // End table mappings
-    // -------------------
 
     // Begin form control mappings
     // ---------------------------
-    // portlet-form-label
-    //  (text used for the descriptive label of the whole form
-    //    not the label for fields)
-    // portlet-form-input-field
-    //  (Text of the user-input in an input field.)
-    // portlet-form-field-label
-    //  (Text for a separator of fields (e.g., checkboxes))
-    // portlet-form-field (Text for a field (not input field. e.g., checkboxes))
+    // portlet-form-label -   Text used for the descriptive label 
+    //                        of the whole form not the label for fields
+    // portlet-form-input-field - Text of the user-input in an input field.
+    // portlet-form-field-label - Text for a separator of fields (e.g., checkboxes)
+    // portlet-form-field       - Text for a field (not input field. e.g., checkboxes)
     // Currently UNUSED
     // portlet-form-button (text on a button)
-    // portlet-icon-label ??????????????????????
-    //  (Text that appears beside a context depended action icon)
-    // portlet-dlg-icon-label ??????????????????
-    //  (Text that appears beside a 'standard' icon (OK, Cancel))
-
+    // portlet-icon-label (Text that appears beside a context depended action icon)  
+    // portlet-dlg-icon-label (Text that appears beside a 'standard' icon (OK, Cancel)) 
+    
     // TODO: put some style class on the <input> for checkboxes so I can
-    // map it to portlet-form-field.
-    // TODO: map commandButton to portlet-form-button
-     _STYLES_MAP.put(SkinSelectors.AF_LABEL_TEXT_STYLE_CLASS,
-       "portlet-form-label");
-       /* =-=jmw11/06 TODO This doesn't seem to be used anymore
-    _STYLES_MAP.put(SkinSelectors.AF_LABEL_CELL_STYLE_CLASS,
-      "portlet-form-label");
-      ***/
-    _STYLES_MAP.put(SkinSelectors.AF_FIELD_TEXT_STYLE_CLASS,
-      "portlet-form-field-label");
-    _STYLES_MAP.put(SkinSelectors.AF_FIELD_TEXT_DISABLED_STYLE_CLASS,
-      "portlet-form-field-label");
-    _STYLES_MAP.put("af|inputText::content",
-      "portlet-form-input-field");
-    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_CHOICE_LABEL_STYLE_CLASS,
-      "portlet-form-label");
-    _STYLES_MAP.put(SkinSelectors.SHUTTLE_HEADER_STYLE_CLASS,
-      "portlet-form-label");
-    _STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_FORM_LABEL_CELL_STYLE_CLASS,
-      "portlet-form-label");
-      /** =-=jmw TODO Nov/06. Test panelForm Layouts portlet styles */
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_PANEL_FORM_STYLE_CLASS,
-      _NULL_STYLE);
+    // map it to portlet-form-field????
+    // TODO: I use portlet-font for the text in a choice. Is this right?
+    
+    
+    for (int i=0; i < _FORM_LABEL_SELECTORS.length; i++)
+     _STYLES_MAP.put(_FORM_LABEL_SELECTORS[i], "portlet-form-label");
+     
+    for (int i=0; i < _FORM_INPUT_SELECTORS.length; i++)
+     _STYLES_MAP.put(_FORM_INPUT_SELECTORS[i], "portlet-form-input-field"); 
+     
+    for (int i=0; i < _PORTLET_FORM_BUTTON.length; i++)
+     _STYLES_MAP.put(_PORTLET_FORM_BUTTON[i], "portlet-form-button");      
+    
+    _STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_FORM_LABEL_CELL_STYLE_CLASS, _NULL_STYLE);
+    
     // End form control mappings
     // -------------------------
 
-    // Begin message mappings
-      _STYLES_MAP.put(SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS,
-       "portlet-msg-error");
-      _STYLES_MAP.put(SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS,
-         "portlet-msg-info");
-      _STYLES_MAP.put(XhtmlLafConstants.PROCESS_STATUS_STYLE_CLASS,
-        "portlet-msg-status");
-      _STYLES_MAP.put(XhtmlLafConstants.TIP_TEXT_STYLE_CLASS,
-        "portlet-msg-info");
-      _STYLES_MAP.put(XhtmlLafConstants.TIP_LABEL_STYLE_CLASS,
-        "portlet-msg-info");
-      _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_MESSAGE_TEXT_STYLE_CLASS,
-       "portlet-msg-error");
-      _STYLES_MAP.put(XhtmlLafConstants.ERROR_ICON_STYLE_CLASS,
-        "portlet-msg-error");
-      _STYLES_MAP.put(XhtmlLafConstants.AF_MESSAGES_HEADER_STYLE_CLASS,
-        "portlet-msg-error" );
-
-       _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_MESSAGE_TEXT_STYLE_CLASS,
-         "portlet-msg-error");
-       _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_LIST_STYLE_CLASS,
-         "portlet-msg-error");
-      _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_BODY_STYLE_CLASS,
-        _NULL_STYLE);
-      _STYLES_MAP.put(XhtmlLafConstants.AF_MESSAGES_ERROR_STYLE_CLASS,
-         "portlet-msg-error");
-      // just to give it the same background color as table's header.
-      _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_STYLE_CLASS,
-         "portlet-table-header");
+    // Begin message mappings:
+    // portlet-msg-error, portlet-msg-alert, portlet-msg-info, portlet-msg-status
+    // ------------------------- //
+    _STYLES_MAP.put(SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS, "portlet-msg-error");
+    _STYLES_MAP.put(SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS, "portlet-msg-info");
+    _STYLES_MAP.put(XhtmlLafConstants.PROCESS_STATUS_STYLE_CLASS, "portlet-msg-status");
+    _STYLES_MAP.put(XhtmlLafConstants.TIP_TEXT_STYLE_CLASS, "portlet-msg-info");
+    _STYLES_MAP.put(XhtmlLafConstants.TIP_LABEL_STYLE_CLASS, "portlet-msg-info");
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_MESSAGE_TEXT_STYLE_CLASS,"portlet-msg-error");
+    _STYLES_MAP.put(XhtmlLafConstants.ERROR_ICON_STYLE_CLASS, "portlet-msg-error");
+    _STYLES_MAP.put(XhtmlLafConstants.INFO_ICON_STYLE_CLASS, "portlet-msg-info");
+    _STYLES_MAP.put(XhtmlLafConstants.WARNING_ICON_STYLE_CLASS, "portlet-msg-alert");
+    _STYLES_MAP.put(XhtmlLafConstants.AF_MESSAGES_HEADER_STYLE_CLASS, "portlet-msg-error"
);
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_MESSAGE_TEXT_STYLE_CLASS,"portlet-msg-error");
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_LIST_STYLE_CLASS, "portlet-msg-error");
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_BODY_STYLE_CLASS, _NULL_STYLE);
+    _STYLES_MAP.put(XhtmlLafConstants.AF_MESSAGES_ERROR_STYLE_CLASS,"portlet-msg-error");
+    // just to give it the same background color as table's header.
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_MESSAGES_STYLE_CLASS, "portlet-table-header");
+    // End message mappings      //
+    // ------------------------- //
 
-    // End message mappings
-    // -------------------------
+    // Begin table mappings
+    // --------------------
+     for (int i=0; i < _TABLE_TEXT_SELECTORS.length; i++)
+       _STYLES_MAP.put(_TABLE_TEXT_SELECTORS[i], "portlet-table-text"); 
+       
+    _STYLES_MAP.put(SkinSelectors.AF_TABLE_COLUMN_FOOTER_STYLE, "portlet-table-footer");
      
+    _STYLES_MAP.put(SkinSelectors.AF_TABLE_DETAIL_STYLE, "portlet-table-body");       
+    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_TEXT_STYLE, "portlet-table-body");
+    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_NUMBER_STYLE, "portlet-table-body");
+    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_TOTAL_TEXT_STYLE, "portlet-table-body");    
+    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_CELL_TEXT_BAND_STYLE, "portlet-table-alternate");
+    _STYLES_MAP.put(SkinSelectors.AF_COLUMN_HEADER_TEXT_STYLE, "portlet-table-header");
+    // selectInputDate and chooseDate have tables
+    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_HEADER_STYLE_CLASS, "portlet-table-header");
+    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_HEADER_STYLE_CLASS, "portlet-table-header");
+    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_CONTENT_STYLE_CLASS, "portlet-table-body");
 
+
+    // add portlet-table-body + itself
+     for (int i=0; i < _TABLE_BODY_PLUS_ITSELF.length; i++)
+     {
+       _STYLES_MAP.put(_TABLE_BODY_PLUS_ITSELF[i], "portlet-table-text " + 
+          StyleUtils.convertToValidSelector(_TABLE_BODY_PLUS_ITSELF[i]));
+     }
+    
+    // add portlet-table-alternate + itself
+     for (int i=0; i < _TABLE_ALT_PLUS_ITSELF.length; i++)
+     {
+       _STYLES_MAP.put(_TABLE_ALT_PLUS_ITSELF[i], "portlet-table-text " + 
+          StyleUtils.convertToValidSelector(_TABLE_ALT_PLUS_ITSELF[i])); 
+     }
+     
+    // add portlet-table-header + itself
+     for (int i=0; i < _TABLE_HDR_PLUS_ITSELF.length; i++)
+     {
+       _STYLES_MAP.put(_TABLE_HDR_PLUS_ITSELF[i], "portlet-table-text " + 
+       StyleUtils.convertToValidSelector(_TABLE_HDR_PLUS_ITSELF[i]));   
+     }
+
+    // Since we null'd out the properties, there is no reason to output this
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0001_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0010_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0011_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0100_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0101_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0110_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_0111_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1000_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1001_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1010_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1011_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1100_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1101_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1110_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SkinSelectors.TABLE_BORDER_1111_STYLE, _NULL_STYLE);
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_PANEL_SIDE_BAR_BODY_STYLE_CLASS, _NULL_STYLE);
+    // End table mappings
+    // -------------------
 
     // portlet-font-dim mappings
-     _STYLES_MAP.put("AFInstructionTextDisabled",
-         _PORTLET_FONT_DIM);
-    _STYLES_MAP.put("AFFieldTextDisabled",
-        _PORTLET_FONT_DIM);
-    _STYLES_MAP.put("AFFieldTextLTRDisabled",
-        _PORTLET_FONT_DIM);
-     _STYLES_MAP.put("AFPhoneFieldTextDisabled",
-        _PORTLET_FONT_DIM);
-    _STYLES_MAP.put("AFPostalCodeFieldTextDisabled",
-        _PORTLET_FONT_DIM);
-    _STYLES_MAP.put("AFAddressFieldTextDisabled",
-       _PORTLET_FONT_DIM);
+    // -------------------
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_SELECTED_STEP_STYLE_CLASS, _PORTLET_FONT);

+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_STEP_STYLE_CLASS, _PORTLET_FONT); 
+    _STYLES_MAP.put(SkinSelectors.NAV_BAR_ILINK_STYLE_CLASS, _PORTLET_FONT_DIM);    
+     _STYLES_MAP.put("AFInstructionTextDisabled", _PORTLET_FONT_DIM);
+    _STYLES_MAP.put("AFFieldTextDisabled", _PORTLET_FONT_DIM);
+    _STYLES_MAP.put("AFFieldTextLTRDisabled", _PORTLET_FONT_DIM);
+     _STYLES_MAP.put("AFPhoneFieldTextDisabled", _PORTLET_FONT_DIM);
+    _STYLES_MAP.put("AFPostalCodeFieldTextDisabled", _PORTLET_FONT_DIM);
+    _STYLES_MAP.put("AFAddressFieldTextDisabled", _PORTLET_FONT_DIM);
+
+
+    _STYLES_MAP.put(SkinSelectors.IN_CONTEXT_TEXT_STYLE_CLASS, _PORTLET_FONT_DIM);
+     _STYLES_MAP.put(SkinSelectors.LINK_DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
+     _STYLES_MAP.put(XhtmlLafConstants.DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
+    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
+    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_DISABLED_STYLE_CLASS, _PORTLET_FONT_DIM);
+     
     // We want to keep certain aspects of these styles, so we blank
     // out the aspects we don't want in portlet-desktop.xss:
     // keep boldness
-    _STYLES_MAP.put("AFDataTextDisabled",
-        "portlet-font-dim AFDataTextDisabled");
+    _STYLES_MAP.put("AFDataTextDisabled", "portlet-font-dim AFDataTextDisabled");
     // keep boldness and alignment
-    _STYLES_MAP.put("AFDataNumberDisabled",
-        "portlet-font-dim AFDataNumberDisabled");
-    _STYLES_MAP.put("AFFieldNumberDisabled",
-        "portlet-font-dim AFFieldNumberDisabled");
-
-    _STYLES_MAP.put(SkinSelectors.IN_CONTEXT_TEXT_STYLE_CLASS,
-        _PORTLET_FONT_DIM);
-     _STYLES_MAP.put(SkinSelectors.LINK_DISABLED_STYLE_CLASS,
-        _PORTLET_FONT_DIM);
-     _STYLES_MAP.put(XhtmlLafConstants.DISABLED_STYLE_CLASS,
-        _PORTLET_FONT_DIM);
-    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS,
-        _PORTLET_FONT_DIM);
-    // end portlet-font-dim mappings
+    _STYLES_MAP.put("AFDataNumberDisabled", "portlet-font-dim AFDataNumberDisabled");
+    _STYLES_MAP.put("AFFieldNumberDisabled", "portlet-font-dim AFFieldNumberDisabled"); 
+    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS,"portlet-font-dim
" +
+    StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
    
 
+    
+    // end portlet-font-dim mappings
+    // -------------------
 
      // begin portlet-font mappings
-    _STYLES_MAP.put(SkinSelectors.INSTRUCTION_TEXT_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put("AFFieldText",
-        _PORTLET_FONT);
-    _STYLES_MAP.put("AFFieldTextLTR",
-        _PORTLET_FONT);
-    _STYLES_MAP.put("AFPhoneFieldText",
-        _PORTLET_FONT);
-    _STYLES_MAP.put("AFPostalCodeFieldText",
-        _PORTLET_FONT);
-    _STYLES_MAP.put("AFAddressFieldText",
-        _PORTLET_FONT);
+    // -------------------
+    
+    _STYLES_MAP.put(SkinSelectors.INSTRUCTION_TEXT_STYLE_CLASS,_PORTLET_FONT);
+    _STYLES_MAP.put("AFFieldText", _PORTLET_FONT);
+    _STYLES_MAP.put("AFFieldTextLTR", _PORTLET_FONT);
+    _STYLES_MAP.put("AFPhoneFieldText",_PORTLET_FONT);
+    _STYLES_MAP.put("AFPostalCodeFieldText",_PORTLET_FONT);
+    _STYLES_MAP.put("AFAddressFieldText", _PORTLET_FONT);
     // We want to keep certain aspects of these styles:
     // keep boldness
     _STYLES_MAP.put(XhtmlLafConstants.DATA_TEXT_STYLE_CLASS,
-        "portlet-font " +
-        XhtmlLafConstants.DATA_TEXT_STYLE_CLASS);
+        "portlet-font " + XhtmlLafConstants.DATA_TEXT_STYLE_CLASS);
     // keep boldness and alignment
-    _STYLES_MAP.put("AFDataNumber",
-        "portlet-font AFDataNumber");
-    _STYLES_MAP.put("AFFieldNumber",
-        "portlet-font AFFieldNumber");
-
-
-     _STYLES_MAP.put(SkinSelectors.PAGE_STAMP_TEXT_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.AF_TREE_TABLE_MP_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_SELECTED_STEP_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_SELECTED_STYLE_CLASS,
-        _PORTLET_FONT);
-    _STYLES_MAP.put(SkinSelectors.AF_PANEL_LIST_STYLE_CLASS,
-      _PORTLET_FONT);
-
-    _STYLES_MAP.put(SkinSelectors.LINK_STYLE_CLASS,
-     _PORTLET_FONT);
-
-    _STYLES_MAP.put(XhtmlLafConstants.LINK_TEXT_STYLE_CLASS,
-     _PORTLET_FONT);
-
+    _STYLES_MAP.put("AFDataNumber", "portlet-font AFDataNumber");
+    _STYLES_MAP.put("AFFieldNumber", "portlet-font AFFieldNumber");
 
+    _STYLES_MAP.put("af|selectOneChoice::content",_PORTLET_FONT); 
+    _STYLES_MAP.put("af|selectOneListbox::content",_PORTLET_FONT);     
+    _STYLES_MAP.put("af|selectManyShuttle::content",_PORTLET_FONT);     
+    _STYLES_MAP.put("af|selectOrderShuttle::content",_PORTLET_FONT);     
+    
+    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_ENABLED_STYLE_CLASS,_PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.NAV_BAR_ALINK_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.NAV_BAR_VIEW_STYLE_CLASS, _PORTLET_FONT); 
+    _STYLES_MAP.put(SkinSelectors.PAGE_STAMP_TEXT_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.AF_TREE_TABLE_MP_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_STYLE_CLASS,_PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_PATH_SELECTED_STEP_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.AF_PANEL_LIST_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.AF_TRAIN_LINK_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.LINK_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(XhtmlLafConstants.LINK_TEXT_STYLE_CLASS, _PORTLET_FONT);
+    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_ENABLED_STYLE_CLASS, _PORTLET_FONT);
+ 
+    // keep boldness
+    _STYLES_MAP.put(SkinSelectors.AF_CHOOSE_DATE_SELECTED_STYLE_CLASS,
+      "portlet-font " +
+      StyleUtils.convertToValidSelector(SkinSelectors.AF_CHOOSE_DATE_SELECTED_STYLE_CLASS));
+      
+    // keep boldness
+    _STYLES_MAP.put(SkinSelectors.AF_SELECT_INPUT_DATE_SELECTED_STYLE_CLASS,
+      "portlet-font " +
+      StyleUtils.convertToValidSelector(SkinSelectors.AF_SELECT_INPUT_DATE_SELECTED_STYLE_CLASS));
+      
+    // navigationPane components.
+    // these contains contextual selectors which will break unless we keep the class in tact
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_TABS_MID_STYLE_CLASS, "portlet-font
" +
+    StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_TABS_MID_STYLE_CLASS));
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_LIST_CONTENT_STYLE_CLASS, "portlet-font
" +
+    StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_LIST_CONTENT_STYLE_CLASS));
    
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_BUTTONS_CONTENT_STYLE_CLASS, "portlet-font
" +
+    StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_BUTTONS_CONTENT_STYLE_CLASS));
    
+    _STYLES_MAP.put(SkinSelectors.AF_NAVIGATION_LEVEL_BAR_CONTENT_STYLE_CLASS, "portlet-font
" +
+    StyleUtils.convertToValidSelector(SkinSelectors.AF_NAVIGATION_LEVEL_BAR_CONTENT_STYLE_CLASS));
    
+    // may need padding + nowrap, so we keep the style
+    _STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_PAGE_PRIVACY_STYLE_CLASS, "portlet-font "
+
+    StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_PANEL_PAGE_PRIVACY_STYLE_CLASS));
+    _STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_PAGE_ABOUT_STYLE_CLASS, "portlet-font " +
+    StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_PANEL_PAGE_ABOUT_STYLE_CLASS));
+    _STYLES_MAP.put(XhtmlLafConstants.AF_PANEL_PAGE_COPYRIGHT_STYLE_CLASS, "portlet-font
" +
+    StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_PANEL_PAGE_COPYRIGHT_STYLE_CLASS));
+    // keep padding; delete color
+    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS,"portlet-font
" +
+    StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
+    _STYLES_MAP.put(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS,"portlet-font
" +
+    StyleUtils.convertToValidSelector(XhtmlLafConstants.AF_MENU_BUTTONS_TEXT_DISABLED_STYLE_CLASS));
+   
     // end portlet-font
+    // -------------------
 
-    // begin section
-    // we render our headers by using the same style class on headers
+    // begin portlet-section--header
+    // TODO?? Is this worth it?? we render our headers by using the same style class on headers
     // and subheaders, and we style them in the css file using the
     // H1/H2 selectors, like H1.af_panelHeader, H2.af_panelHeader.
     // for portlet we need to have distinctive style classes for headers and
@@ -442,74 +436,62 @@
     // header classes (e.g., AF_PANEL_HEADER_STYLE_CLAS) to null and
     // map AFHeaderAlias to portlet-section-header and map
     // AFSubheaderAlias to portlet-section-subheader.
-    _STYLES_MAP.put(SkinSelectors.AF_PANEL_HEADER_STYLE_CLASS,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SkinSelectors.AF_PANEL_HEADER_ERROR_STYLE_CLASS,
-      "portlet-section-header");
-      /** =-=jmw TODO Fix the renderer...
-    _STYLES_MAP.put(SkinSelectors.AF_HEADER_ALIAS_STYLE_CLASS,
+    
+    // For now, we just render portlet-section-header for the header
+    _STYLES_MAP.put(SkinSelectors.AF_PANEL_HEADER_STYLE_CLASS, "portlet-section-header");
+    _STYLES_MAP.put(SkinSelectors.AF_PANEL_HEADER_ERROR_STYLE_CLASS, "portlet-section-header");
+    _STYLES_MAP.put(SkinSelectors.AF_SHOW_DETAIL_HEADER_STYLE_CLASS, "portlet-section-header");
+    _STYLES_MAP.put(SimpleDesktopConstants.AF_PANEL_BOX_HEADER_STYLE_CLASS,
+      "portlet-section-subheader " +
+      StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_PANEL_BOX_HEADER_STYLE_CLASS));
+    _STYLES_MAP.put(SkinSelectors.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS,
       "portlet-section-header");
-    _STYLES_MAP.put(SkinSelectors.AF_SUBHEADER_ALIAS_STYLE_CLASS,
-      "portlet-section-subheader");
-      ***/
+      
+    // end portlet-section-header
 
-    _STYLES_MAP.put(SkinSelectors.AF_SHOW_DETAIL_HEADER_STYLE_CLASS,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_PANEL_BOX_HEADER_STYLE_CLASS,
-      "portlet-section-header " +
-      SimpleDesktopConstants.AF_PANEL_BOX_HEADER_STYLE_CLASS);
-    // end section
-
-    // begin menu
-    //
-    // use portlet-table styles instead of portlet-menu styles. This
-    // was requested by the portal team
-    //
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_STYLE_CLASS,
-       "portlet-table-text");
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS,
-      "portlet-table-selected " +
-        SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_ENABLED_STYLE_CLASS,
-      "portlet-table-alternate "+
-      SimpleDesktopConstants.AF_MENU_TABS_ENABLED_STYLE_CLASS);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_DISABLED_STYLE_CLASS,
-      "portlet-table-alternate " +
-      SimpleDesktopConstants.AF_MENU_TABS_DISABLED_STYLE_CLASS);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_SEPARATOR_STYLE_CLASS,
-      "portlet-table-alternate");
-
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_STYLE_CLASS,
-      "portlet-table-text");
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_BODY_STYLE_CLASS,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_TITLE_STYLE_CLASS,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_EMPTY_STYLE_CLASS,
-      _NULL_STYLE);
-    // Note: This is kind of strange. We are porting menuBar to menuTabs
-    // so that the background and font won't both be white when running
-    // a portal inside an ADF Faces page.
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_SELECTED_STYLE_CLASS,
+
+
+      // af:menuTabs and af:menuBar is still used within the page component.
+     //
+     // use portlet-table styles instead of portlet-menu styles. This
+     // was requested by the portal team
+     //
+     // tabs might be styled, so leave them alone for padding and such.
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS, 
       "portlet-table-selected " +
-      SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_ENABLED_STYLE_CLASS,
-      "portlet-table-alternate "+
-      SimpleDesktopConstants.AF_MENU_TABS_ENABLED_STYLE_CLASS);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_DISABLED_STYLE_CLASS,
-      "portlet-table-alternate " +
-      SimpleDesktopConstants.AF_MENU_TABS_DISABLED_STYLE_CLASS);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_SEPARATOR_STYLE_CLASS,
-      "portlet-table-alternate");
-
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_PANEL_SIDE_BAR_BODY_STYLE_CLASS,
-      _NULL_STYLE);
-    _STYLES_MAP.put(SimpleDesktopConstants.AF_PANEL_SIDE_BAR_STYLE_CLASS,
-      "portlet-table-text");
-    // end menu
+         StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_TABS_SELECTED_STYLE_CLASS));
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_ENABLED_STYLE_CLASS,
+       "portlet-table-alternate "+
+       StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_TABS_ENABLED_STYLE_CLASS));
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_DISABLED_STYLE_CLASS,
+       "portlet-table-alternate " +
+       StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_TABS_DISABLED_STYLE_CLASS));
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_TABS_SEPARATOR_STYLE_CLASS,
+       "portlet-table-alternate");
+
+
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_BODY_STYLE_CLASS,
+       _NULL_STYLE);
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_TITLE_STYLE_CLASS,
+       _NULL_STYLE);
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_EMPTY_STYLE_CLASS,
+       _NULL_STYLE);
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_SELECTED_STYLE_CLASS,
+       "portlet-table-selected " +
+       StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_BAR_SELECTED_STYLE_CLASS));
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_ENABLED_STYLE_CLASS,
+       "portlet-table-alternate "+
+       StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_BAR_ENABLED_STYLE_CLASS));
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_DISABLED_STYLE_CLASS,
+       "portlet-table-alternate " +
+       StyleUtils.convertToValidSelector(SimpleDesktopConstants.AF_MENU_BAR_DISABLED_STYLE_CLASS));
+     _STYLES_MAP.put(SimpleDesktopConstants.AF_MENU_BAR_SEPARATOR_STYLE_CLASS,
+       "portlet-table-alternate");
 
-  }
 
+     // end menu 
+
+  }
 
 
-}
+}
\ No newline at end of file

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?view=diff&rev=482380&r1=482379&r2=482380
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
Mon Dec  4 13:55:04 2006
@@ -1162,16 +1162,16 @@
     <property name="cursor">pointer</property>
   </style>
   <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content">
-    <property name="color">black</property>
+    <includeStyle name="AFTextForeground"/>
   </style>
   <style selector="af|navigationPane::bar-inactive-enabled af|navigationPane::bar-content">
-    <property name="color">black</property>
+    <includeStyle name="AFTextForeground"/>  
   </style>
   <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content
a">
-    <property name="color">black</property>
+    <includeStyle name="AFTextForeground"/>  
   </style>
   <style selector="af|navigationPane::bar-inactive-enabled af|navigationPane::bar-content
a">
-    <property name="color">black</property>
+    <includeStyle name="AFTextForeground"/>
   </style>
   <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content
a:hover">
     <property name="text-decoration">underline</property>
@@ -1337,11 +1337,13 @@
   <style selector="af|navigationPane::tabs-inactive">
     <property name="cursor">pointer</property>
   </style>
-  <style selector="af|navigationPane af|navigationPane::tabs-active:disabled">
+  <style selector="af|navigationPane::tabs-active:disabled">
     <property name="cursor">default</property>
+    <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPane af|navigationPane::tabs-inactive:disabled">
+  <style selector="af|navigationPane::tabs-inactive:disabled">
     <property name="cursor">default</property>
+    <property name="color">gray</property>
   </style>
   <style selector="af|navigationPane::tabs-start">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
@@ -1414,18 +1416,18 @@
   <style selector="af|navigationPane::tabs-mid">
     <includeStyle name="AFDefaultFont"/>
     <property name="padding-left">3px</property>
-    <property name="color">#000000</property>
+    <includeStyle name="AFTextForeground"/>
     <property name="white-space">nowrap</property>
   </style>
   <style selector="af|navigationPane::tabs-mid A">
     <includeStyle name="AFDefaultFont"/>
-    <property name="color">#000000</property>
+    <includeStyle name="AFTextForeground"/>
     <property name="text-decoration">none</property>
   </style>
-  <style selector="af|navigationPane af|navigationPane::tabs-active:disabled af|navigationPane::tabs-mid">
+  <style selector="af|navigationPane::tabs-active:disabled af|navigationPane::tabs-mid">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPane af|navigationPane::tabs-inactive:disabled af|navigationPane::tabs-mid">
+  <style selector="af|navigationPane::tabs-inactive:disabled af|navigationPane::tabs-mid">
     <property name="color">gray</property>
   </style>
   <style selector="af|navigationPane::tabs-bottom-mid">
@@ -1462,11 +1464,9 @@
   <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-mid">
     <property name="background-image">url('../../images/tab3-mid-selected.gif')</property>
     <property name="font-weight">bold</property>
-    <property name="color">#585955</property>
   </style>
   <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-mid A">
     <property name="font-weight">bold</property>
-    <property name="color">#585955</property>
   </style>
   <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-mid">
     <property name="background-image">url('../../images/tab3-bot-mid-selected.gif')</property>
@@ -1503,10 +1503,10 @@
   </style>
   <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-mid">
     <property name="background-image">url('../../images/tab3-mid-deselected.gif')</property>
-    <property name="color">#000000</property>
+    <includeStyle name="AFTextForeground"/>
   </style>
   <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-mid A">
-    <property name="color">#000000</property>
+    <includeStyle name="AFTextForeground"/>
   </style>
   <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-mid">
     <property name="background-image">url('../../images/tab3-bot-deselected.gif')</property>

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-portlet.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-portlet.xss?view=diff&rev=482380&r1=482379&r2=482380
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-portlet.xss
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-portlet.xss
Mon Dec  4 13:55:04 2006
@@ -103,6 +103,9 @@
   <style name="MediumExtraAccentForeground">
     <property name="color"/>
   </style>
+  <style name="AFDarkBackground">
+    <property name="background-color">#606060</property> 
+  </style>
   <!-- for now, we keep the default colors, but we might want to change -->
   <!-- our background-color/border-color scheme from green to something -->
   <!-- else. If we do that, we override AFDarkBackground, etc. The accent -->
@@ -169,8 +172,15 @@
   
   <style name="AFHeaderText" resetProperties="true"/>
 
-  <style selector="af|menuTabs::enabled-link" resetProperties="true"/>
-  <style selector="af|menuTabs::selected-link" resetProperties="true"/>
+  <!-- get rid of color; keep padding -->
+  <style selector="af|menuButtons::text-selected">
+    <property name="color"/> 
+    <property name="font-weight">bold</property>
+  </style> 
+  <style selector="af|menuButtons::text-disabled">
+    <property name="color"/>  
+  </style>  
+
   <!-- keep borders and padding only, portlet-menu-item(-selected) can
        add styles -->
   <style selector="af|menuTabs::enabled">
@@ -210,7 +220,9 @@
 
   <style selector="af|processTrain::visited-link" resetProperties="true" />
   <style selector="af|processTrain::unvisited-link" resetProperties="true" />
-  
+  <!-- panelBox has pretty mellow background colors, so we'll keep them. -->
+  <!-- another possibility is to inhibit the background-color and use also render a portlet-table
+   style to pick up the background color for that -->
   <style name="AFPanelBox">
     <includeStyle name="AFMediumBorder"/>
     <property name="border-style">solid</property>
@@ -239,9 +251,14 @@
   <!-- Adjust the header padding and text size/weight -->
   <style selector="af|panelBox::header">
     <property name="padding">0px 3px</property>
-    <includeStyle name="AFMediumFont"/>
+    <includeStyle name="AFMediumFont"/> <!--  TODO inhibit font -->
     <property name="font-weight">bold</property>
   </style>
+  <!-- inhibit medium background and text -->
+    <style selector="af|panelBox::light af|panelBox::header">
+      <property name="color"/>  
+      <property name="background-color"/>  
+    </style>
 
   <!-- Add padding around the body of all content containers -->
   <style selector="af|panelBox::body">



Mime
View raw message