incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r433804 [1/22] - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ main/java/org/apache/myfaces/trinidadinternal/style/cache/ main/java/org/apache/myfaces/trinidadin...
Date Tue, 22 Aug 2006 23:44:50 GMT
Author: awiner
Date: Tue Aug 22 16:44:47 2006
New Revision: 433804

URL: http://svn.apache.org/viewvc?rev=433804&view=rev
Log:
- For .css generation, instead of having a hardcoded list of "fake" pseudo-classes to map to selectors (e.g. :read-only to .pAFReadOnly), use a hardcoded list of the pseudo-classes that are built-in to CSS 2, and map everything else.  The code does not yet handle CSS 2 pseudo-elements, or make any decision about what to do with the many coming CSS 3 pseudo-classes.  This change does expose opportunities for component developers to create state pseudo-classes specific to their components.

- Fix navigationPane styles to not do double "::" - e.g., ::bar::bar-enabled should just be ::bar-enabled (this was actually triggering some wackiness in the .css generation code)

- Fix navigationPane styles to change navigationPaneTab to navigationPane::tab

- Update golden files accordingly.

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimal-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalIE-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalIERtl-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalInacc-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalPPC-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalSaf-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalScrRdr-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimal-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalIE-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalIERtl-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalInacc-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalPPC-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalSaf-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalScrRdr-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimal-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalIE-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalIERtl-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalInacc-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalPPC-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalScrRdr-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimal-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIE-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalIERtl-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalInacc-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalPPC-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalSaf-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalScrRdr-golden.xml

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=433804&r1=433803&r2=433804&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Tue Aug 22 16:44:47 2006
@@ -436,17 +436,17 @@
    
    // ============================ Style classes ============================ //
    public static final String AF_NAVIGATION_LEVEL_BAR_ACTIVE_DISABLED_STYLE_CLASS =
-     "af|navigationPane::bar::bar-active-disabled";
+     "af|navigationPane::bar-active-disabled";
    public static final String AF_NAVIGATION_LEVEL_BAR_ACTIVE_ENABLED_STYLE_CLASS =
-     "af|navigationPane::bar::bar-active-enabled";
+     "af|navigationPane::bar-active-enabled";
    public static final String AF_NAVIGATION_LEVEL_BAR_CONTENT_STYLE_CLASS =
-     "af|navigationPane::bar::bar-content";
+     "af|navigationPane::bar-content";
    public static final String AF_NAVIGATION_LEVEL_BAR_INACTIVE_DISABLED_STYLE_CLASS =
-     "af|navigationPane::bar::bar-inactive-disabled";
+     "af|navigationPane::bar-inactive-disabled";
    public static final String AF_NAVIGATION_LEVEL_BAR_INACTIVE_ENABLED_STYLE_CLASS =
-     "af|navigationPane::bar::bar-inactive-enabled";
+     "af|navigationPane::bar-inactive-enabled";
    public static final String AF_NAVIGATION_LEVEL_BAR_SEPARATOR_STYLE_CLASS =
-     "af|navigationPane::bar::bar-separator";
+     "af|navigationPane::bar-separator";
    public static final String AF_NAVIGATION_LEVEL_BAR_STYLE_CLASS =
      "af|navigationPane::bar";
    public static final String AF_NAVIGATION_LEVEL_BUTTONS_ACTIVE_DISABLED_STYLE_CLASS =
@@ -490,42 +490,40 @@
    //                                                                         //
    
    // ============================ Style classes ============================ //
-   // -= Simon =-
-   // FIXME: Is af|navigationPaneTabs ok? Shouldn't it be af|navigationPane::tabs?
    public static final String AF_NAVIGATION_LEVEL_TABS_ACTIVE_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-active";
+     "af|navigationPane::tabs-active";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_END_CONTENT_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-end-content";
+     "af|navigationPane::tabs-bottom-end-content";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_END_JOIN_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-end-join";
+     "af|navigationPane::tabs-bottom-end-join";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_END_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-end";
+     "af|navigationPane::tabs-bottom-end";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_MID_CONTENT_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-mid-content";
+     "af|navigationPane::tabs-bottom-mid-content";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_MID_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-mid";
+     "af|navigationPane::tabs-bottom-mid";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_START_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-start";
+     "af|navigationPane::tabs-bottom-start";
    public static final String AF_NAVIGATION_LEVEL_TABS_BOTTOM_START_CONTENT_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-bottom-start-content";
+     "af|navigationPane::tabs-bottom-start-content";
    public static final String AF_NAVIGATION_LEVEL_TABS_END_JOIN_TO_INACTIVE_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-end-join-to-inactive";
+     "af|navigationPane::tabs-end-join-to-inactive";
    public static final String AF_NAVIGATION_LEVEL_TABS_END_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-end";
+     "af|navigationPane::tabs-end";
    public static final String AF_NAVIGATION_LEVEL_TABS_INACTIVE_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-inactive";
+     "af|navigationPane::tabs-inactive";
    public static final String AF_NAVIGATION_LEVEL_TABS_MID_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-mid";
+     "af|navigationPane::tabs-mid";
    public static final String AF_NAVIGATION_LEVEL_TABS_START_JOIN_FROM_ACTIVE_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-start-join-from-active";
+     "af|navigationPane::tabs-start-join-from-active";
    public static final String AF_NAVIGATION_LEVEL_TABS_START_JOIN_FROM_INACTIVE_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-start-join-from-inactive";
+     "af|navigationPane::tabs-start-join-from-inactive";
    public static final String AF_NAVIGATION_LEVEL_TABS_START_JOIN_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-start-join";
+     "af|navigationPane::tabs-start-join";
    public static final String AF_NAVIGATION_LEVEL_TABS_START_STYLE_CLASS =
-     "af|navigationPaneTabs::tabs-start";
+     "af|navigationPane::tabs-start";
    public static final String AF_NAVIGATION_LEVEL_TABS_STYLE_CLASS =
-     "af|navigationPaneTabs";
+     "af|navigationPane::tabs";
 
    
    //                                                                         //

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=433804&r1=433803&r2=433804&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Tue Aug 22 16:44:47 2006
@@ -1557,12 +1557,14 @@
     _STYLE_KEY_MAP.put("af|panelTabbed::tab-selected-link",
         "af|panelTabbed::tab-selected A");
 
+    /*
     _STYLE_KEY_MAP.put(":read-only",
                        ".p_AFReadOnly");
     _STYLE_KEY_MAP.put(":disabled",
                        ".p_AFDisabled");
     _STYLE_KEY_MAP.put(":error",
                        ".p_AFError");
+    */
   }
   private static final String AF_STYLE_NAMESPACE = "af|";
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java?rev=433804&r1=433803&r2=433804&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java Tue Aug 22 16:44:47 2006
@@ -20,6 +20,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.Vector;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,6 +32,8 @@
 
 import java.util.List;
 
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+
 import org.apache.myfaces.trinidadinternal.style.StyleContext;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.PropertyNode;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleNode;
@@ -697,7 +701,16 @@
     // get the part after the ::.
     // colonIndex will be 0 if there is no ::.
     if (colonIndex != -1)
+    {
+      if (_LOG.isWarning() &&
+          (wholeAfSelector.lastIndexOf("::") != colonIndex))
+      {
+        _LOG.warning("Consecutive sub-element (::) syntax used in selector " +
+                     selector + ".  This is not supported.");
+      }
+
       colonIndex += 2;
+    }
     else
       colonIndex = 0;
     String afterDoubleColon = wholeAfSelector.substring(colonIndex);
@@ -726,35 +739,36 @@
       pieces.setMain(mainSelector);    
       String afterMain = wholeAfSelector.substring(colonIndex + endIndex-1);
       // afterMain includes the : or the .
-       // if I get a :, I know I'm in a pseudo-class. Keep getting characters
-       // until I'm at the end, or I get another : or .
-       boolean inPseudoClass = false;
-       StringBuffer pseudoClassBuffer = new StringBuffer();
-       for (int i=0; i < afterMain.length(); i++)
-       {
-         char x = afterMain.charAt(i);
-         if (x == '.')
-         {
-           inPseudoClass = false;
-           pieces.setEnd(afterMain.substring(i));
-           break;
-         }
-         else if (x == ':')
-         {
-           if (inPseudoClass)
-           {
-             // if I'm in a pseudo-class already, and I get a ':', that means
-             // i've got another pseudo-class. End the first one.
-              pieces.addPseudoClass(pseudoClassBuffer.toString());
-             pseudoClassBuffer = new StringBuffer();           
-           }
-           inPseudoClass = true;
-           pseudoClassBuffer.append(x);
-         }
-         else
-           pseudoClassBuffer.append(x);
-       }
-       pieces.addPseudoClass(pseudoClassBuffer.toString());
+      // if I get a :, I know I'm in a pseudo-class. Keep getting characters
+      // until I'm at the end, or I get another : or .
+      boolean inPseudoClass = false;
+      StringBuffer pseudoClassBuffer = new StringBuffer();
+      for (int i=0; i < afterMain.length(); i++)
+      {
+        char x = afterMain.charAt(i);
+        if (x == '.')
+        {
+          inPseudoClass = false;
+          pieces.setEnd(afterMain.substring(i));
+          break;
+        }
+        else if (x == ':')
+        {
+          if (inPseudoClass)
+          {
+            // if I'm in a pseudo-class already, and I get a ':', that means
+            // i've got another pseudo-class. End the first one.
+            pieces.addPseudoClass(pseudoClassBuffer.toString());
+            pseudoClassBuffer = new StringBuffer();           
+          }
+          inPseudoClass = true;
+          pseudoClassBuffer.append(x);
+        }
+        else
+          pseudoClassBuffer.append(x);
+      }
+      if (pseudoClassBuffer.length() > 0)
+        pieces.addPseudoClass(pseudoClassBuffer.toString());
     }
 
     // piece back together the string
@@ -781,11 +795,8 @@
     List <String> pseudoClasses = pieces.getPseudoClasses();
     for (String pseudoClass : pseudoClasses )
     {
-      String mappedPseudoClass = map.get(pseudoClass);
-      if (mappedPseudoClass != null)
-        buffer.append(mappedPseudoClass);
-      else
-        buffer.append(pseudoClass);      
+      String mappedPseudoClass = _convertPseudoClass(pseudoClass);
+      buffer.append(mappedPseudoClass);
     }
 
     String endPiece = pieces.getEnd();
@@ -1077,4 +1088,38 @@
       new PropertyNodeComparator();
   }
   
+  static private String _convertPseudoClass(String pseudoClass)
+  {
+    if (_BUILT_IN_PSEUDO_CLASSES.contains(pseudoClass))
+      return pseudoClass;
+    StringBuilder builder = new StringBuilder(pseudoClass.length() + 3);
+    builder.append(".p_AF");
+
+    for (String content : pseudoClass.substring(1).split("-"))
+    {
+      if (content.length() > 0)
+      {
+        builder.append(Character.toUpperCase(content.charAt(0)));
+        builder.append(content.substring(1));
+      }
+    }
+
+    return builder.toString();
+  }
+
+
+  // =-=AEW Do we care about built-in pseudo-elements???
+  static private final Set<String> _BUILT_IN_PSEUDO_CLASSES =
+    new HashSet<String>();
+  static
+  {
+    _BUILT_IN_PSEUDO_CLASSES.add(":first-child");
+    _BUILT_IN_PSEUDO_CLASSES.add(":link");
+    _BUILT_IN_PSEUDO_CLASSES.add(":visited");
+    _BUILT_IN_PSEUDO_CLASSES.add(":hover");
+    _BUILT_IN_PSEUDO_CLASSES.add(":active");
+    _BUILT_IN_PSEUDO_CLASSES.add(":focus");
+  }
+
+  private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(CSSGenerationUtils.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?rev=433804&r1=433803&r2=433804&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Tue Aug 22 16:44:47 2006
@@ -1057,63 +1057,63 @@
     <property name="padding-left">6px</property>
     <property name="padding-right">6px</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-disabled">
+  <style selector="af|navigationPane::bar-active-disabled">
     <property name="cursor">default</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-enabled">
+  <style selector="af|navigationPane::bar-active-enabled">
     <property name="cursor">pointer</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-disabled">
+  <style selector="af|navigationPane::bar-inactive-disabled">
     <property name="cursor">default</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-enabled">
+  <style selector="af|navigationPane::bar-inactive-enabled">
     <property name="cursor">pointer</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-enabled af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content">
     <property name="color">black</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-enabled af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-inactive-enabled af|navigationPane::bar-content">
     <property name="color">black</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-enabled af|navigationPane::bar::bar-content a">
+  <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content a">
     <property name="color">black</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-enabled af|navigationPane::bar::bar-content a">
+  <style selector="af|navigationPane::bar-inactive-enabled af|navigationPane::bar-content a">
     <property name="color">black</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-enabled af|navigationPane::bar::bar-content a:hover">
+  <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content a:hover">
     <property name="text-decoration">underline</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-enabled af|navigationPane::bar::bar-content a:hover">
+  <style selector="af|navigationPane::bar-inactive-enabled af|navigationPane::bar-content a:hover">
     <property name="text-decoration">underline</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-disabled af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-active-disabled af|navigationPane::bar-content">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-disabled af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-inactive-disabled af|navigationPane::bar-content">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-disabled af|navigationPane::bar::bar-content a">
+  <style selector="af|navigationPane::bar-active-disabled af|navigationPane::bar-content a">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-inactive-disabled af|navigationPane::bar::bar-content a">
+  <style selector="af|navigationPane::bar-inactive-disabled af|navigationPane::bar-content a">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-enabled af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-active-enabled af|navigationPane::bar-content">
     <property name="font-weight">bold</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-active-disabled af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-active-disabled af|navigationPane::bar-content">
     <property name="font-weight">bold</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-content">
+  <style selector="af|navigationPane::bar-content">
     <includeStyle name="AFDefaultFont"/>
     <property name="padding-top">3px</property>
     <property name="padding-bottom">3px</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-content a">
+  <style selector="af|navigationPane::bar-content a">
     <property name="text-decoration">none</property>
   </style>
-  <style selector="af|navigationPane::bar::bar-separator">
+  <style selector="af|navigationPane::bar-separator">
     <includeStyle name="AFDefaultFont"/>
     <property name="padding-left">6px</property>
     <property name="padding-right">6px</property>
@@ -1229,7 +1229,7 @@
     <property name="background-position">center</property>
     <property name="background-repeat">no-repeat</property>
   </style>
-  <style selector="af|navigationPaneTabs">
+  <style selector="af|navigationPane::tabs">
     <property name="height">26px</property>
     <property name="overflow">hidden</property>
   </style>
@@ -1239,198 +1239,199 @@
   <style name=".p_AFOverlappingTabBottomHeight">
     <property name="height">4px</property>
   </style> 
-  <style selector="af|navigationPaneTabs::tabs-active">
+  <style selector="af|navigationPane::tabs-active">
     <property name="cursor">pointer</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive">
+  <style selector="af|navigationPane::tabs-inactive">
     <property name="cursor">pointer</property>
   </style>
-  <style selector="af|navigationPaneTabs af|navigationPaneTabs::tabs-active:disabled">
+  <style selector="af|navigationPane af|navigationPane::tabs-active:disabled">
     <property name="cursor">default</property>
   </style>
-  <style selector="af|navigationPaneTabs af|navigationPaneTabs::tabs-inactive:disabled">
+  <style selector="af|navigationPane af|navigationPane::tabs-inactive:disabled">
     <property name="cursor">default</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start">
+  <style selector="af|navigationPane::tabs-start">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start-join">
+  <style selector="af|navigationPane::tabs-start-join">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start-join-from-active">
+  <style selector="af|navigationPane::tabs-start-join-from-active">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start-join-from-inactive">
+  <style selector="af|navigationPane::tabs-start-join-from-inactive">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-mid">
+  <style selector="af|navigationPane::tabs-mid">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-end-join-to-inactive">
+  <style selector="af|navigationPane::tabs-end-join-to-inactive">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-end">
+  <style selector="af|navigationPane::tabs-end">
     <includeStyle name=".p_AFOverlappingTabTopHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-start">
+  <style selector="af|navigationPane::tabs-bottom-start">
     <includeStyle name=".p_AFOverlappingTabBottomHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-start-content">
+  <style selector="af|navigationPane::tabs-bottom-start-content">
     <includeStyle name=".p_AFOverlappingTabBottomHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-mid">
+  <style selector="af|navigationPane::tabs-bottom-mid">
     <includeStyle name=".p_AFOverlappingTabBottomHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-mid-content">
+  <style selector="af|navigationPane::tabs-bottom-mid-content">
     <includeStyle name=".p_AFOverlappingTabBottomHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-end">
+  <style selector="af|navigationPane::tabs-bottom-end">
     <includeStyle name=".p_AFOverlappingTabBottomHeight"/>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-end-content">
+  <style selector="af|navigationPane::tabs-bottom-end-content">
     <includeStyle name=".p_AFOverlappingTabBottomHeight"/>
   </style>
   <!-- =-= mcc TODO the following tab styles need corresponding RTL versions, images too -->
-  <style selector="af|navigationPaneTabs::tabs-start">
+  <!-- =-= aew TODO the following tab styles should all be transferred out of base-desktop.xss and into another style sheet! base-desktop.xss should only have primitive styles -->
+  <style selector="af|navigationPane::tabs-start">
     <property name="width">26px</property>
     <property name="background-position">top right</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start-join">
+  <style selector="af|navigationPane::tabs-start-join">
     <property name="width">26px</property>
     <property name="background-position">top right</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-start">
+  <style selector="af|navigationPane::tabs-bottom-start">
     <property name="background-repeat">repeat-x</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-start-content">
+  <style selector="af|navigationPane::tabs-bottom-start-content">
     <property name="width">17px</property>
     <property name="background-repeat">no-repeat</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start-join-from-active">
+  <style selector="af|navigationPane::tabs-start-join-from-active">
     <property name="width">14px</property>
     <property name="background-repeat">no-repeat</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-start-join-from-inactive">
+  <style selector="af|navigationPane::tabs-start-join-from-inactive">
     <property name="width">14px</property>
     <property name="background-repeat">no-repeat</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-end-join-to-inactive">
+  <style selector="af|navigationPane::tabs-end-join-to-inactive">
     <property name="width">12px</property>
     <property name="background-repeat">no-repeat</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-mid">
+  <style selector="af|navigationPane::tabs-mid">
     <includeStyle name="AFDefaultFont"/>
     <property name="padding-left">3px</property>
     <property name="color">#000000</property>
     <property name="white-space">nowrap</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-mid A">
+  <style selector="af|navigationPane::tabs-mid A">
     <includeStyle name="AFDefaultFont"/>
     <property name="color">#000000</property>
     <property name="text-decoration">none</property>
   </style>
-  <style selector="af|navigationPaneTabs af|navigationPaneTabs::tabs-active:disabled af|navigationPaneTabs::tabs-mid">
+  <style selector="af|navigationPane af|navigationPane::tabs-active:disabled af|navigationPane::tabs-mid">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPaneTabs af|navigationPaneTabs::tabs-inactive:disabled af|navigationPaneTabs::tabs-mid">
+  <style selector="af|navigationPane af|navigationPane::tabs-inactive:disabled af|navigationPane::tabs-mid">
     <property name="color">gray</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-mid">
+  <style selector="af|navigationPane::tabs-bottom-mid">
     <property name="background-repeat">repeat-x</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-end">
+  <style selector="af|navigationPane::tabs-end">
     <property name="width">15px</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-end">
+  <style selector="af|navigationPane::tabs-bottom-end">
     <property name="background-repeat">repeat-x</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-end-join">
+  <style selector="af|navigationPane::tabs-bottom-end-join">
     <property name="background-repeat">repeat-x</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-bottom-end-content">
+  <style selector="af|navigationPane::tabs-bottom-end-content">
     <property name="width">100%</property>
     <property name="background-repeat">no-repeat</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-start">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-start">
     <property name="background-image">url('../../images/tab3-start-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-start-join">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-start-join">
     <property name="background-image">url('../../images/tab3-start-join-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-start-join">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-start-join">
     <property name="background-image">url('../../images/tab3-start-join-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-bottom-start">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-start">
     <property name="background-image">url('../../images/tab3-bot-mid-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-bottom-start-content">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-start-content">
     <property name="background-image">url('../../images/tab3-bot-start-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-mid">
+  <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|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-mid A">
+  <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|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-bottom-mid">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-mid">
     <property name="background-image">url('../../images/tab3-bot-mid-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-end-join-to-inactive">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-end-join-to-inactive">
     <property name="background-image">url('../../images/tab3-end-join-selected-to-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-end">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-end">
     <property name="background-image">url('../../images/tab3-end-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-bottom-end">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-end">
     <property name="background-image">url('../../images/tab3-bot-mid-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-bottom-end-join">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-end-join">
     <property name="background-image">url('../../images/tab3-bot-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-active af|navigationPaneTabs::tabs-bottom-end-content">
+  <style selector="af|navigationPane::tabs-active af|navigationPane::tabs-bottom-end-content">
     <property name="background-image">url('../../images/tab3-bot-end-selected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-start">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-start">
     <property name="background-image">url('../../images/tab3-start-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-bottom-start">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-start">
     <property name="background-image">url('../../images/tab3-bot-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-bottom-start-content">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-start-content">
     <property name="background-image">none</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-start-join-from-active">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-start-join-from-active">
     <property name="background-image">url('../../images/tab3-start-join-selected-to-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-start-join-from-inactive">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-start-join-from-inactive">
     <property name="background-image">url('../../images/tab3-start-join-deselected-to-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-mid">
+  <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>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-mid A">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-mid A">
     <property name="color">#000000</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-bottom-mid">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-mid">
     <property name="background-image">url('../../images/tab3-bot-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-end-join-to-inactive">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-end-join-to-inactive">
     <property name="background-image">url('../../images/tab3-end-join-deselected-to-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-end">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-end">
     <property name="background-image">url('../../images/tab3-end-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-bottom-end">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-end">
     <property name="background-image">url('../../images/tab3-bot-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-bottom-end-join">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-end-join">
     <property name="background-image">url('../../images/tab3-bot-deselected.gif')</property>
   </style>
-  <style selector="af|navigationPaneTabs::tabs-inactive af|navigationPaneTabs::tabs-bottom-end-content">
+  <style selector="af|navigationPane::tabs-inactive af|navigationPane::tabs-bottom-end-content">
     <property name="background-image">none</property>
   </style>
   <!-- =-= mcc TODO Doc the navigationLevel style classes -->
@@ -3823,7 +3824,7 @@
     <property name="width">100%</property>
   </style>
 
-  <style selector="af|navigationPaneTabs">
+  <style selector="af|navigationPane">
     <property name="height">25px</property>
   </style>
 </styleSheet>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimal-golden.xml?rev=433804&r1=433803&r2=433804&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimal-golden.xml Tue Aug 22 16:44:47 2006
@@ -8,7 +8,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -24,7 +24,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -41,7 +41,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -53,7 +53,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -69,7 +69,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -86,7 +86,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -98,7 +98,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -114,7 +114,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -142,7 +142,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -158,7 +158,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -175,7 +175,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -187,7 +187,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -203,7 +203,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -220,7 +220,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -232,7 +232,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -248,7 +248,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -277,7 +277,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -293,7 +293,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -310,7 +310,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -322,7 +322,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -338,7 +338,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -355,7 +355,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -367,7 +367,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -383,7 +383,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -412,7 +412,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -428,7 +428,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -445,7 +445,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -457,7 +457,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -473,7 +473,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -490,7 +490,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -502,7 +502,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -518,7 +518,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -547,7 +547,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -563,7 +563,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -580,7 +580,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -592,7 +592,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -608,7 +608,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -625,7 +625,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -637,7 +637,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -653,7 +653,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -682,7 +682,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -698,7 +698,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -715,7 +715,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -727,7 +727,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -743,7 +743,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -760,7 +760,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -772,7 +772,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -788,7 +788,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -817,7 +817,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -833,7 +833,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -850,7 +850,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -862,7 +862,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -878,7 +878,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -895,7 +895,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -907,7 +907,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -923,7 +923,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -952,7 +952,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -968,7 +968,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -985,7 +985,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -997,7 +997,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1013,7 +1013,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1030,7 +1030,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1042,7 +1042,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1058,7 +1058,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1087,7 +1087,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1103,7 +1103,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1120,7 +1120,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1132,7 +1132,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1148,7 +1148,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1165,7 +1165,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1177,7 +1177,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1193,7 +1193,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1222,7 +1222,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1238,7 +1238,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1255,7 +1255,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1267,7 +1267,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1283,7 +1283,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1300,7 +1300,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1312,7 +1312,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1328,7 +1328,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1357,7 +1357,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1373,7 +1373,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1390,7 +1390,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1402,7 +1402,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1418,7 +1418,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1435,7 +1435,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1447,7 +1447,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1463,7 +1463,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1492,7 +1492,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1508,7 +1508,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1525,7 +1525,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1537,7 +1537,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1553,7 +1553,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1570,7 +1570,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1582,7 +1582,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1598,7 +1598,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1627,7 +1627,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1643,7 +1643,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1660,7 +1660,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1672,7 +1672,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1688,7 +1688,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a
@@ -1705,7 +1705,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-separator"
+                     class="af_navigationPane_bar-separator"
                     >
                   |
                 </div>
@@ -1717,7 +1717,7 @@
              border="0"
              cellpadding="0"
              cellspacing="0"
-             class="af_navigationPane_bar_bar-inactive-enabled"
+             class="af_navigationPane_bar-inactive-enabled"
              style="display: inline;"
              summary=""
             >
@@ -1733,7 +1733,7 @@
                   >
                 
                 <div
-                     class="af_navigationPane_bar_bar-content"
+                     class="af_navigationPane_bar-content"
                     >
                   
                   <a



Mime
View raw message