incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r433524 [1/3] - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/agent/ main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ main/resources/META-INF/adf/styles/ main/resou...
Date Tue, 22 Aug 2006 05:25:21 GMT
Author: awiner
Date: Mon Aug 21 22:25:20 2006
New Revision: 433524

URL: http://svn.apache.org/viewvc?rev=433524&view=rev
Log:
Merge Joseph Rozier's patches for ADFFACES-130, ADFFACES-131, and ADFFACES-134, fixing up Blackberry appearance and removing hardcoded agent sizes for PDAs

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/blaf.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-pda.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/oracle-desktop.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/oracle-pda.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/pocketPC.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-desktop.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-pda.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netfront.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Mon Aug 21 22:25:20 2006
@@ -31,10 +31,13 @@
 public class AgentFactoryImpl implements AgentFactory
 {
 
-  public Agent createAgent(String userAgent, String accept)
+
+  public Agent createAgent(Map<String, String> headerMap)
   {
+    // this method primarily exists for use during testing
+    
     AgentImpl agent = new AgentImpl();
-    _populateAgentImpl(userAgent,accept,agent);
+    _populateAgentImpl(headerMap,agent);
     return agent;
   }
 
@@ -62,6 +65,7 @@
 
   private void _populateAgentImpl(Map<String, String> headerMap, AgentImpl agent)
   {
+    
     String userAgent = headerMap.get("User-Agent");
 
     if ((userAgent != null) && userAgent.startsWith("PTG"))
@@ -71,23 +75,8 @@
       return;
     }
 
-    // determine the agent from the headers
-    _populateAgentImpl(userAgent, headerMap.get("Accept"), agent);
-  }
+    String accept = headerMap.get("Accept");
 
-  private void _populateAgentImpl(
-      String userAgent, 
-      String accept, 
-      AgentImpl agent)
-  {
-    /* for testing PocketPC */
-
-    //PPC 02
-    //userAgent = "Mozilla/2.0 (compatible; MSIE 3.02; Windows CE; PPC; 240x320)";
-    // PPC 03
-    //userAgent = "Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; PPC; 240x320)";
-    // Web Pro
-    //userAgent = "Mozilla/4.76 (compatible; MSIE 6.0; U; Windows 95; PalmSource; PalmOS; WebPro; Tungsten Proxyless 1.1 320x320x16)";
     // See if the agent wants WML - if so, we're talking WAP.
     if ((accept != null) &&
         accept.regionMatches(true, 0, "vnd.wap.wml", 0, 11))
@@ -101,6 +90,7 @@
       _populateNullAgentImpl(userAgent, agent);
       return;
     }
+    
     //the useragent string for telnet and PDA design time will start with
     //OracleJDevMobile because in each of these cases we know we have an
     //exact match in the device repository for the agent name.  This is
@@ -141,6 +131,8 @@
       return;
     }
 
+    // Web Pro
+    //userAgent = "Mozilla/4.76 (compatible; MSIE 6.0; U; Windows 95; PalmSource; PalmOS; WebPro; Tungsten Proxyless 1.1 320x320x16)";
     if ( (userAgent.indexOf( "WebPro") != -1 &&
           userAgent.indexOf("Palm")!= -1)||
          userAgent.indexOf("Blazer/3.") != -1)
@@ -159,9 +151,16 @@
     }
 */
 
+    //PPC 02
+    //userAgent = "Mozilla/2.0 (compatible; MSIE 3.02; Windows CE; PPC; 240x320)";
+    // PPC 03
+    //userAgent = "Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; PPC; 240x320)";
     if (userAgent.indexOf("Windows CE") != -1)
     {
-      _populatePocketPCAgentImpl(userAgent,agent);
+      // for PocketPC and Windows Mobile, try to grab the header UA-pixels to 
+      // determine width/height
+      String uaPixels = headerMap.get("UA-pixels");
+      _populatePocketPCAgentImpl(userAgent,uaPixels,agent);
       return;
     }
 
@@ -326,7 +325,7 @@
   /**
    * populates data from a PocketPC IE request
    */
-  private void _populatePocketPCAgentImpl(String agent,AgentImpl agentObj)
+  private void _populatePocketPCAgentImpl(String agent,String uaPixels,AgentImpl agentObj)
   {
     int start = agent.indexOf("MSIE");
     String version = null;
@@ -339,6 +338,41 @@
     agentObj.setAgent(Agent.AGENT_IE);
     agentObj.setAgentVersion(version);
     agentObj.setPlatform(Agent.PLATFORM_PPC);
+    
+    if(uaPixels != null && uaPixels.length() > 0)
+    {
+      // UA-pixels is defined as <width>x<height>
+      // UA-pixels was proposed here
+      // http://www.watersprings.org/pub/id/draft-mutz-http-attributes-00.txt
+      // and it is used by Pocket IE and IE Mobile; see
+      // http://blogs.msdn.com/iemobile/archive/2006/08/03/Detecting_IE_Mobile.aspx
+      Integer width = null;
+      Integer height = null;
+
+      String[] parts = uaPixels.split("x");
+      if(parts.length == 2)
+      {
+        try
+        {
+          width = new Integer(parts[0]);
+          height = new Integer(parts[1]);
+        }
+        catch(NumberFormatException ex)
+        {
+          _LOG.fine(ex);
+        }
+      }
+      
+      if(width != null && height != null)
+      {
+        agentObj.__addRequestCapability(TrinidadAgent.CAP_WIDTH,width);
+        agentObj.__addRequestCapability(TrinidadAgent.CAP_HEIGHT,height);
+      }
+      else
+      {
+        _LOG.fine("When creating the Agent, the UA-pixels value \"{0}\" could not be parsed.", uaPixels);
+      }
+    }
   }
   
     /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java Mon Aug 21 22:25:20 2006
@@ -362,6 +362,8 @@
   @Override
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
+    Integer columnsInteger = null;
+    
     Converter converter = getConverter(bean);
 
     // Ignoring the "default" converter code is intentional;  we'll just
@@ -369,10 +371,15 @@
     if (converter instanceof ColorConverter)
     {
       int columns = ((ColorConverter) converter).getColumns(FacesContext.getCurrentInstance());
-      return IntegerUtils.getInteger(columns);
+      columnsInteger = IntegerUtils.getInteger(columns);
     }
-
-    return _DEFAULT_COLUMNS;
+    else
+    {
+      columnsInteger = _DEFAULT_COLUMNS;
+    }
+    
+    columnsInteger = getColumnsAdjustedForAgent(arc,bean,columnsInteger);
+    return columnsInteger;
   }
 
   @Override

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java Mon Aug 21 22:25:20 2006
@@ -390,6 +390,9 @@
   @Override
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
+  
+    Integer columnsInteger = null;
+    
     Converter converter = getConverter(bean);
 
     // Ignoring the "default" converter code is intentional;  we'll just
@@ -399,10 +402,16 @@
     {
       int columns = ((org.apache.myfaces.trinidadinternal.convert.DateTimeConverter)
               converter).getColumns();
-      return IntegerUtils.getInteger(columns);
+      columnsInteger = IntegerUtils.getInteger(columns);
     }
-
-    return _DEFAULT_COLUMNS;
+    else
+    {
+      columnsInteger = _DEFAULT_COLUMNS;
+    }
+    
+    columnsInteger = getColumnsAdjustedForAgent(arc,bean,columnsInteger);
+    
+    return columnsInteger;
   }
 
   @Override

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputNumberSpinboxRenderer.java Mon Aug 21 22:25:20 2006
@@ -107,7 +107,9 @@
 	RenderingContext arc,
 	FacesBean bean)
   {
-    return new Integer(1);
+    Integer columnsInteger = 
+      getColumnsAdjustedForAgent(arc,bean,_DEFAULT_COLUMNS);
+    return columnsInteger;
   }
 
   @Override
@@ -313,4 +315,6 @@
 
   private static String _SPINBOX_REPEAT_JS = "_spinboxRepeat";
   private static String _CLEAR_SPINBOX_JS = "_clearSpinbox();";
+  
+  private static Integer _DEFAULT_COLUMNS = new Integer(1);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Mon Aug 21 22:25:20 2006
@@ -28,6 +28,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreInputText;
 
+import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -265,12 +266,22 @@
 
   /**
    * Returns the default number of text input columns
+   * Note that this is often over-written by subclasses to provide
+   * their own defaults.
    * =-=AEW MOVE ONTO BEAN TYPE?
    */
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
+
+    // for efficiency, since we know the logic in getColumnsAdjustedForAgent
+    // only applies to certain PDA's, we'll only call that method if the
+    // agent type is PDA
     if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA)
-      return _DEFAULT_PDA_COLUMNS;
+    {
+      Integer toReturn =
+        getColumnsAdjustedForAgent(arc,bean,_DEFAULT_PDA_COLUMNS);
+      return toReturn;
+    }
 
     return _DEFAULT_COLUMNS;
   }
@@ -444,6 +455,58 @@
     }
   }
 
+  /**
+   * A method to adjust the columns for the given agent.  This may be used 
+   * internally and by subclasses to get around quirks in certain agents if
+   * the subclass does not want to do any agent-specific detection on its own.
+   * In general this method should NOT be used to adjust user-specified 
+   * columns.  Rather, it is primarily used to adjust the default values that 
+   * a renderer may specify.  Its use is NOT mandatory by subclasses, but serves
+   * as a convenience.
+   * @return
+   */
+  protected Integer getColumnsAdjustedForAgent(
+    RenderingContext arc, 
+    FacesBean bean,
+    Integer columns)
+  {
+
+    if(columns == null)  
+    {
+      return null;
+    }
+    
+    Agent agent = arc.getAgent();
+    
+    // for input type="text" on the BlackBerry Browser, the size attribute
+    // is not honored properly; it generally shows many more characters
+    // than specified; note that this only affects input type="text", not
+    // textareas
+    if(agent != null && Agent.AGENT_BLACKBERRY.equals(agent.getAgentName()))
+    {
+      boolean isTextArea = isTextArea(bean);
+      if(!isTextArea)
+      {
+        // the 1.7 factor provides a good approximation for various
+        // conditions on the BlackBerry--it won't be perfect in all situations
+        double colDouble = columns.doubleValue();
+        double colAdjust = Math.round(colDouble / 1.7);
+          
+        // if the columns was specified, we want to leave it as specified,
+        // but at a minimum value
+        if(colDouble > 0 && colAdjust == 0)
+        {
+          colAdjust = 1;
+        }
+          
+        columns = IntegerUtils.getInteger((int) colAdjust);
+      }
+    }
+    
+    return columns;
+  
+  }
+  
 
   private void _writeTextWithBreaks(
     FacesContext     context,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/blaf.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/blaf.xss?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/blaf.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/blaf.xss Mon Aug 21 22:25:20 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,95 +14,95 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-<!--
-   See oracle-desktop.xss for the styles used by the desktop implementation
-   of the Oracle Browser Look And Feel.  
-
-   Note: This file is only provided by backward compatibility.  However,
-   as of UIX 2.2.5, custom style sheets are no longer required to 
-   explicitly import the base look and feel's style sheet.  So, rather
-   than importing blaf.xss or oracle-desktop.xss, custom style sheets
-   should no longer be importing any style sheet at all.  The styles
-   defined in custom style sheets are automatically merged on top of
-   the look and feel's style sheet (ie. on top of oracle-desktop.xss).
--->
-
-<styleSheetDocument xmlns="http://myfaces.apache.org/uix/style">
-
-<!-- 
-  No need to import oracle-desktop.xss.  We'll automatically be
-  layered on top of the current LAF's style sheet.
--->
-
-
- <styleSheet>
-
-  <!--
-    The following styles are no longer used by UIX.  However, they
-    are defined by BLAF, so they are provided here for existing
-    applications which make use of these styles.
-  -->
-
-  <!-- 
-    BreadCrumbs: Use OraBreadCrumbs and OraBreadCrumbsSelected instead. 
-  -->
-
-  <style selector=".OraCrumbsSelected">
-    <includeStyle name="AFSmallFont"/>
-    <includeStyle name="AFTextForeground"/>
-    <property name="text-decoration">none</property>
-  </style>
-
-  <style selector=".OraCrumbsEnabled">
-    <includeStyle name="SmallLinkFont"/>
-    <includeStyle name="AFLinkForeground"/>
-  </style>
-
-  <!--
-    Button: UIX no longer uses (or never has used?) these styles.
-            Leaving here for applications that need these styles
-            for their own purposes.
-  -->
-  <style selector=".OraButtonText">
-    <includeStyle name="AFDefaultFont"/>
-    <includeStyle name="AFLightAccentBackground"/>
-    <includeStyle name="AFTextForeground"/>
-  </style>
-
-  <style selector=".OraButtonTextDisabled">
-    <includeStyle name="AFDefaultFont"/>
-    <includeStyle name="AFLightAccentBackground"/>
-    <includeStyle name="AFVeryDarkAccentForeground"/>
-  </style>
-
-  <!--
-    Level 3 Navigation
- 
-    These styles are not currently used by BLAF's sideBar/styledList.
-    Leaving here for backward compatibility, but these can probably
-    be removed altogether.
-  -->
-
-  <style selector=".OraNav3Selected">
-    <includeStyle name="AFDefaultBoldFont"/>
-    <includeStyle name="AFDarkBackground"/>
-    <includeStyle name="AFSelectedTextForeground"/>
-    <property name="text-decoration">none</property>
-  </style>
-
-  <style selector=".OraNav3Enabled">
-    <includeStyle name="AFDefaultFont"/>
-    <includeStyle name="AFDarkAccentBackground"/>
-    <includeStyle name="AFTextForeground"/>
-  </style>
-
-  <style selector=".OraNav3Disabled">
-    <includeStyle name="AFDefaultFont"/>
-    <includeStyle name="AFDarkAccentBackground"/>
-    <includeStyle name="AFMediumAccentForeground"/>
-    <property name="text-decoration">none</property>
-  </style>
-
- </styleSheet>
-</styleSheetDocument>
+
+<!--
+   See oracle-desktop.xss for the styles used by the desktop implementation
+   of the Oracle Browser Look And Feel.  
+
+   Note: This file is only provided by backward compatibility.  However,
+   as of UIX 2.2.5, custom style sheets are no longer required to 
+   explicitly import the base look and feel's style sheet.  So, rather
+   than importing blaf.xss or oracle-desktop.xss, custom style sheets
+   should no longer be importing any style sheet at all.  The styles
+   defined in custom style sheets are automatically merged on top of
+   the look and feel's style sheet (ie. on top of oracle-desktop.xss).
+-->
+
+<styleSheetDocument xmlns="http://myfaces.apache.org/uix/style">
+
+<!-- 
+  No need to import oracle-desktop.xss.  We'll automatically be
+  layered on top of the current LAF's style sheet.
+-->
+
+
+ <styleSheet>
+
+  <!--
+    The following styles are no longer used by UIX.  However, they
+    are defined by BLAF, so they are provided here for existing
+    applications which make use of these styles.
+  -->
+
+  <!-- 
+    BreadCrumbs: Use OraBreadCrumbs and OraBreadCrumbsSelected instead. 
+  -->
+
+  <style selector=".OraCrumbsSelected">
+    <includeStyle name="AFSmallFont"/>
+    <includeStyle name="AFTextForeground"/>
+    <property name="text-decoration">none</property>
+  </style>
+
+  <style selector=".OraCrumbsEnabled">
+    <includeStyle name="SmallLinkFont"/>
+    <includeStyle name="AFLinkForeground"/>
+  </style>
+
+  <!--
+    Button: UIX no longer uses (or never has used?) these styles.
+            Leaving here for applications that need these styles
+            for their own purposes.
+  -->
+  <style selector=".OraButtonText">
+    <includeStyle name="AFDefaultFont"/>
+    <includeStyle name="AFLightAccentBackground"/>
+    <includeStyle name="AFTextForeground"/>
+  </style>
+
+  <style selector=".OraButtonTextDisabled">
+    <includeStyle name="AFDefaultFont"/>
+    <includeStyle name="AFLightAccentBackground"/>
+    <includeStyle name="AFVeryDarkAccentForeground"/>
+  </style>
+
+  <!--
+    Level 3 Navigation
+ 
+    These styles are not currently used by BLAF's sideBar/styledList.
+    Leaving here for backward compatibility, but these can probably
+    be removed altogether.
+  -->
+
+  <style selector=".OraNav3Selected">
+    <includeStyle name="AFDefaultBoldFont"/>
+    <includeStyle name="AFDarkBackground"/>
+    <includeStyle name="AFSelectedTextForeground"/>
+    <property name="text-decoration">none</property>
+  </style>
+
+  <style selector=".OraNav3Enabled">
+    <includeStyle name="AFDefaultFont"/>
+    <includeStyle name="AFDarkAccentBackground"/>
+    <includeStyle name="AFTextForeground"/>
+  </style>
+
+  <style selector=".OraNav3Disabled">
+    <includeStyle name="AFDefaultFont"/>
+    <includeStyle name="AFDarkAccentBackground"/>
+    <includeStyle name="AFMediumAccentForeground"/>
+    <property name="text-decoration">none</property>
+  </style>
+
+ </styleSheet>
+</styleSheetDocument>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-desktop.xss Mon Aug 21 22:25:20 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,342 +14,342 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-<!--
-
-  minimal-desktop.xss defines the styles used by the desktop 
-  implementation of the Minimal Look And Feel.  The styles defined
-  here are layered on top of the styles defined by the Base 
-  Look And Feel (simple-desktop.xss).
-
--->
-
-<styleSheetDocument xmlns="http://myfaces.apache.org/uix/style"
-                    version="2.0">
-
-<styleSheet>
-
-  <!--
-    Button Styles
-  -->
-
-  <style selector="button">
-    <includeStyle name="AFLightAccentBackground"/>
-    <property name="padding">0px</property>
-    <property name="margin">1px</property>
-  </style>
-
-  <!--
-    ContentContainer Styles
-  -->
-
-  <!-- Add a 1 pixel border around the entire content container -->
-  
-  <style name="AFPanelBox">
-    <includeStyle name="AFMediumBorder"/>
-    <property name="border-style">solid</property>
-    <property name="border-width">1px</property>
-    <property name="margin">2px</property>
-  </style>
-
-  <!-- Use darker border for dark content containers -->
-  <style selector="af|panelBox::dark">
-    <includeStyle name="AFDarkBorder"/>
-  </style>
-
-  <style name="af|panelBox::content">
-    <includeStyle name="AFMediumBorder"/>
-    <property name="border-style">solid</property>
-    <property name="border-width">1px</property>
-    <property name="margin">2px</property>
-  </style>
-
-  <!-- Use darker border for dark content containers -->
-  <style selector="af|panelBox::content-dark">
-    <includeStyle name="AFDarkBorder"/>
-  </style>
-
-
-  <!-- Adjust the header padding and text size/weight -->
-  <style selector="af|panelBox::header">
-    <property name="padding">0px 3px</property>
-    <includeStyle name="AFMediumFont"/>
-    <property name="font-weight">bold</property>
-  </style>
-
-  <!-- Add padding around the body of all content containers -->
-  <style selector="af|panelBox::body">
-    <property name="padding">5px</property>
-
-    <!-- Add a minimum height so that empty content containers
-         occupy some space -->
-    <property name="height">20px</property>
-  </style>  
-
-  <!-- panelForm -->
-  <style selector="af|panelFormLayout::column">
-    <property name="vertical-align">top</property>
-  </style>
-  <style selector="af|panelFormLayout::separator">
-    <property name="background-color">gray</property>
-    <property name="height">1px</property>
-    <property name="font-size">1px</property>
-    <property name="margin-top">3px</property>
-    <property name="margin-bottom">3px</property>
-  </style>
-  <style selector="af|panelFormLayout::cell">
-    <property name="padding">1px 0px</property>
-  </style>
-
-  <!--
-    Footer Styles
-  -->
-
-  <style name="AFFooterMessageText">
-    <property name="padding">5px</property>
-  </style>
-
-  <!--
-    menuButtons Styles
-  -->
-  
-   <style name="AFMenuButtons">
-    <property name="padding">0px 2px 2px 2px</property>
-  </style>
-  
-  <!-- 
-    menuBar Styles
-  -->
-
-  <!-- Add some padding around the edges -->
-  <style selector="af|menuBar">
-    <property name="padding">0px</property>
-  </style>
-
-  <!-- 
-    Fix up the padding around the MenuBar items and
-    disable word wrapping 
-   -->
-  <style name="AFMenuBarItem">
-    <property name="padding">0px 0px 0px 5px</property>
-    <property name="white-space">nowrap</property> 
-  </style>
-
-  <!-- Remove the text decoration from all MenuBar links -->
-  <style name="AFMenuBarLink">
-    <property name="text-decoration">none</property>    
-  </style>
-
-  <!-- Make the selected link bold -->
-  <style name="af|menuBar::selected-link">
-    <property name="font-weight">bold</property>
-  </style>
-  
-  <!-- 
-    treeTable Styles
-  -->
-
-  <style selector="af|treeTable::expansion">
-    <property name="text-decoration">none</property>
-  </style>
-
-  <style selector="af|treeTable::focus">
-    <property name="text-decoration">none</property>
-  </style>
-
-  <!--
-    PanelHeader Styles
-  -->
-  <!-- jmw @todo, the three styles below are the same. Make it share? 
-       this can wait. Could I have styled AFHeaderText this way instead? This 
-       is more straightforward. -->
-  <style selector="af|panelHeader">
-    <includeStyle name="AFDarkAccentBorder"/>
-    <property name="border-width">0px 0px 1px 0px</property>
-    <property name="border-style">solid</property>
-    <property name="vertical-align">bottom</property>
-    <property name="margin-bottom">3px</property>
-    <property name="padding">0px 3px</property>
-  </style>
-  
-  <style selector="af|showDetailHeader">
-    <includeStyle name="AFDarkAccentBorder"/>
-    <property name="border-width">0px 0px 1px 0px</property>
-    <property name="border-style">solid</property>
-    <property name="vertical-align">bottom</property>
-    <property name="margin-bottom">3px</property>
-    <property name="padding">0px 3px</property>
-  </style>
-  
-  <style selector="af|messages::header">
-    <includeStyle name="AFDarkAccentBorder"/>
-    <property name="border-width">0px 0px 1px 0px</property>
-    <property name="border-style">solid</property>
-    <property name="vertical-align">bottom</property>
-    <property name="margin-bottom">3px</property>
-    <property name="padding">0px 3px</property>
-  </style>
-   
-
-   <style name="AFHeaderText">
-    <includeStyle name="AFDarkForeground"/>
-    <property name="font-weight">bold</property>
-    <property name="padding">0px</property>   
-    <property name="margin">0px</property> 
-  </style>
-  <!-- if the user sets the icon attribute on panelHeader, -->
-  <!-- this is the style for that icon -->
-  <style selector="af|panelHeader::icon-style">
-    <property name="margin-right">3px</property>
-  </style>
-
-  <!--
-    tr:messages Styles
-  -->
-
-  <style selector="af|messages">
-    <includeStyle name="AFVeryDarkAccentBorder"/>
-    <includeStyle name="AFMediumAccentBackground"/>
-    <property name="border-style">solid</property>
-    <property name="border-width">1px</property>
-    <property name="padding">0px</property>
-    <property name="margin">5px 0px 0px</property>
-  </style>
-
-  <!--
-    objectSeparator Styles
-  -->
-  <style selector="af|objectSeparator">
-    <includeStyle name="AFDarkBorder"/>
-    <property name="border-style">dashed none none</property>
-    <property name="border-width">1px 0px 0px</property>
-    <property name="height">1px</property>
-    <property name="margin">-3px 0px -3px 0px</property>
-    <property name="padding">0px</property>
-  </style>  
-
-  <!--
-  panelSideBar styles. minimal adds borders.
-  -->
-  <style selector="af|panelSideBar">
-    <property name="border-width">0px 1px 1px</property>
-    <property name="border-style">solid</property>
-    <property name="padding">0px</property>
-    <property name="margin">0px 5px 0px 0px</property>    
-  </style>
-  <!--
-    SortableHeader Styles
-  -->
-  <style selector=".AFSortableHeaderSortIcon">
-    <property name="padding-left">4px</property>
-    <property name="text-decoration">none</property>
-  </style>
-
-  <!--
-    TabBar Styles
-  -->
-
-  <!-- Add a border and padding to all tabBar items -->
-  <style name="AFTabBarItem">
-    <includeStyle name="AFVeryDarkAccentBorder"/>
-    <property name="border-style">solid</property>
-    <property name="border-width">1px 1px 0px 1px</property>
-    <property name="padding">2px 6px</property>
-  </style>
-
-  <!-- Remove the text decoration from all tabBar links -->
-  <style name="AFTabBarLink">
-    <property name="text-decoration">none</property>
-  </style>
-
-  <!-- Make the selected tab bold -->
-  <style selector="af|menuTabs::selected-link">
-    <property name="font-weight">bold</property>
-  </style>
-    
-  <!--
-    Table Styles
-  -->
-
-  <style selector="af|table::content">
-    <includeStyle name="AFVeryDarkAccentBorder"/>  
-    <includeStyle selector=".OraTableBorder1111"/>
-  </style>    
-
-  <style selector="af|treeTable::content">
-    <includeStyle name="AFVeryDarkAccentBorder"/>  
-    <includeStyle selector=".OraTableBorder1111"/>
-  </style> 
-  
-  <!-- 
-    Train Styles
-  -->
-
-  <!-- We override the AFTrainStation named style to add some
-       padding, and also to display the station indicator
-       using a top border -->
-  <style name="AFTrainStation">  
-    <property name="border-style">solid</property>
-    <property name="border-width">3px 0px 0px 0px</property>
-    <property name="padding">3pt</property>
-  </style>
-
-  <!-- panelTabbed styles -->
-  
-  <style name="AFPanelTabbed">
-    <includeStyle name="AFLightAccentBackground"/>
-    <includeStyle name="AFMediumBorder"/>
-    <property name="border-style">solid</property>
-    <includeStyle name="AFCenterTextAlign"/>
-    <property name="padding">2px 0px</property>  
-    <property name="margin">4px 0px</property>    
-  </style>
-  
-  <style selector="af|panelTabbed::orientation-top">
-    <includeStyle name="AFPanelTabbed"/>
-    <property name="border-width">1px 0px 0px</property>
-  </style>
-
-  <style selector="af|panelTabbed::orientation-bottom">
-    <includeStyle name="AFPanelTabbed"/>
-    <property name="border-width">0px 0px 1px</property>
-  </style>    
-
-
-  <!-- 
-    showOnePanel Styles
-  -->
-
-  <style selector="af|showOnePanel::header-disabled">
-    <property name="padding-left">18px</property>
-  </style>
-  
-  <style selector="af|showOnePanel::title-link">
-        <includeStyle name="AFDefaultBoldFont"/>
-  </style>
-    
-  <style selector="af|showOnePanel::title-disabled-link">
-        <includeStyle name="AFDefaultBoldFont"/>
-  </style>
-</styleSheet>
-
-<styleSheet direction="rtl">
-
-  <style selector="af|panelHeader::icon-style">
-    <property name="margin-left">3px</property>
-  </style>
-
-  <style selector=".AFSortableHeaderSortIcon">
-    <property name="padding-right">4px</property>
-  </style>
-
-</styleSheet>
-
-
-<styleSheet browsers="gecko">
-  <style selector="af|objectSeparator">
-    <property name="margin"/>
-  </style>
-</styleSheet>
-
-</styleSheetDocument>
+
+<!--
+
+  minimal-desktop.xss defines the styles used by the desktop 
+  implementation of the Minimal Look And Feel.  The styles defined
+  here are layered on top of the styles defined by the Base 
+  Look And Feel (simple-desktop.xss).
+
+-->
+
+<styleSheetDocument xmlns="http://myfaces.apache.org/uix/style"
+                    version="2.0">
+
+<styleSheet>
+
+  <!--
+    Button Styles
+  -->
+
+  <style selector="button">
+    <includeStyle name="AFLightAccentBackground"/>
+    <property name="padding">0px</property>
+    <property name="margin">1px</property>
+  </style>
+
+  <!--
+    ContentContainer Styles
+  -->
+
+  <!-- Add a 1 pixel border around the entire content container -->
+  
+  <style name="AFPanelBox">
+    <includeStyle name="AFMediumBorder"/>
+    <property name="border-style">solid</property>
+    <property name="border-width">1px</property>
+    <property name="margin">2px</property>
+  </style>
+
+  <!-- Use darker border for dark content containers -->
+  <style selector="af|panelBox::dark">
+    <includeStyle name="AFDarkBorder"/>
+  </style>
+
+  <style name="af|panelBox::content">
+    <includeStyle name="AFMediumBorder"/>
+    <property name="border-style">solid</property>
+    <property name="border-width">1px</property>
+    <property name="margin">2px</property>
+  </style>
+
+  <!-- Use darker border for dark content containers -->
+  <style selector="af|panelBox::content-dark">
+    <includeStyle name="AFDarkBorder"/>
+  </style>
+
+
+  <!-- Adjust the header padding and text size/weight -->
+  <style selector="af|panelBox::header">
+    <property name="padding">0px 3px</property>
+    <includeStyle name="AFMediumFont"/>
+    <property name="font-weight">bold</property>
+  </style>
+
+  <!-- Add padding around the body of all content containers -->
+  <style selector="af|panelBox::body">
+    <property name="padding">5px</property>
+
+    <!-- Add a minimum height so that empty content containers
+         occupy some space -->
+    <property name="height">20px</property>
+  </style>  
+
+  <!-- panelForm -->
+  <style selector="af|panelFormLayout::column">
+    <property name="vertical-align">top</property>
+  </style>
+  <style selector="af|panelFormLayout::separator">
+    <property name="background-color">gray</property>
+    <property name="height">1px</property>
+    <property name="font-size">1px</property>
+    <property name="margin-top">3px</property>
+    <property name="margin-bottom">3px</property>
+  </style>
+  <style selector="af|panelFormLayout::cell">
+    <property name="padding">1px 0px</property>
+  </style>
+
+  <!--
+    Footer Styles
+  -->
+
+  <style name="AFFooterMessageText">
+    <property name="padding">5px</property>
+  </style>
+
+  <!--
+    menuButtons Styles
+  -->
+  
+   <style name="AFMenuButtons">
+    <property name="padding">0px 2px 2px 2px</property>
+  </style>
+  
+  <!-- 
+    menuBar Styles
+  -->
+
+  <!-- Add some padding around the edges -->
+  <style selector="af|menuBar">
+    <property name="padding">0px</property>
+  </style>
+
+  <!-- 
+    Fix up the padding around the MenuBar items and
+    disable word wrapping 
+   -->
+  <style name="AFMenuBarItem">
+    <property name="padding">0px 0px 0px 5px</property>
+    <property name="white-space">nowrap</property> 
+  </style>
+
+  <!-- Remove the text decoration from all MenuBar links -->
+  <style name="AFMenuBarLink">
+    <property name="text-decoration">none</property>    
+  </style>
+
+  <!-- Make the selected link bold -->
+  <style name="af|menuBar::selected-link">
+    <property name="font-weight">bold</property>
+  </style>
+  
+  <!-- 
+    treeTable Styles
+  -->
+
+  <style selector="af|treeTable::expansion">
+    <property name="text-decoration">none</property>
+  </style>
+
+  <style selector="af|treeTable::focus">
+    <property name="text-decoration">none</property>
+  </style>
+
+  <!--
+    PanelHeader Styles
+  -->
+  <!-- jmw @todo, the three styles below are the same. Make it share? 
+       this can wait. Could I have styled AFHeaderText this way instead? This 
+       is more straightforward. -->
+  <style selector="af|panelHeader">
+    <includeStyle name="AFDarkAccentBorder"/>
+    <property name="border-width">0px 0px 1px 0px</property>
+    <property name="border-style">solid</property>
+    <property name="vertical-align">bottom</property>
+    <property name="margin-bottom">3px</property>
+    <property name="padding">0px 3px</property>
+  </style>
+  
+  <style selector="af|showDetailHeader">
+    <includeStyle name="AFDarkAccentBorder"/>
+    <property name="border-width">0px 0px 1px 0px</property>
+    <property name="border-style">solid</property>
+    <property name="vertical-align">bottom</property>
+    <property name="margin-bottom">3px</property>
+    <property name="padding">0px 3px</property>
+  </style>
+  
+  <style selector="af|messages::header">
+    <includeStyle name="AFDarkAccentBorder"/>
+    <property name="border-width">0px 0px 1px 0px</property>
+    <property name="border-style">solid</property>
+    <property name="vertical-align">bottom</property>
+    <property name="margin-bottom">3px</property>
+    <property name="padding">0px 3px</property>
+  </style>
+   
+
+   <style name="AFHeaderText">
+    <includeStyle name="AFDarkForeground"/>
+    <property name="font-weight">bold</property>
+    <property name="padding">0px</property>   
+    <property name="margin">0px</property> 
+  </style>
+  <!-- if the user sets the icon attribute on panelHeader, -->
+  <!-- this is the style for that icon -->
+  <style selector="af|panelHeader::icon-style">
+    <property name="margin-right">3px</property>
+  </style>
+
+  <!--
+    tr:messages Styles
+  -->
+
+  <style selector="af|messages">
+    <includeStyle name="AFVeryDarkAccentBorder"/>
+    <includeStyle name="AFMediumAccentBackground"/>
+    <property name="border-style">solid</property>
+    <property name="border-width">1px</property>
+    <property name="padding">0px</property>
+    <property name="margin">5px 0px 0px</property>
+  </style>
+
+  <!--
+    objectSeparator Styles
+  -->
+  <style selector="af|objectSeparator">
+    <includeStyle name="AFDarkBorder"/>
+    <property name="border-style">dashed none none</property>
+    <property name="border-width">1px 0px 0px</property>
+    <property name="height">1px</property>
+    <property name="margin">-3px 0px -3px 0px</property>
+    <property name="padding">0px</property>
+  </style>  
+
+  <!--
+  panelSideBar styles. minimal adds borders.
+  -->
+  <style selector="af|panelSideBar">
+    <property name="border-width">0px 1px 1px</property>
+    <property name="border-style">solid</property>
+    <property name="padding">0px</property>
+    <property name="margin">0px 5px 0px 0px</property>    
+  </style>
+  <!--
+    SortableHeader Styles
+  -->
+  <style selector=".AFSortableHeaderSortIcon">
+    <property name="padding-left">4px</property>
+    <property name="text-decoration">none</property>
+  </style>
+
+  <!--
+    TabBar Styles
+  -->
+
+  <!-- Add a border and padding to all tabBar items -->
+  <style name="AFTabBarItem">
+    <includeStyle name="AFVeryDarkAccentBorder"/>
+    <property name="border-style">solid</property>
+    <property name="border-width">1px 1px 0px 1px</property>
+    <property name="padding">2px 6px</property>
+  </style>
+
+  <!-- Remove the text decoration from all tabBar links -->
+  <style name="AFTabBarLink">
+    <property name="text-decoration">none</property>
+  </style>
+
+  <!-- Make the selected tab bold -->
+  <style selector="af|menuTabs::selected-link">
+    <property name="font-weight">bold</property>
+  </style>
+    
+  <!--
+    Table Styles
+  -->
+
+  <style selector="af|table::content">
+    <includeStyle name="AFVeryDarkAccentBorder"/>  
+    <includeStyle selector=".OraTableBorder1111"/>
+  </style>    
+
+  <style selector="af|treeTable::content">
+    <includeStyle name="AFVeryDarkAccentBorder"/>  
+    <includeStyle selector=".OraTableBorder1111"/>
+  </style> 
+  
+  <!-- 
+    Train Styles
+  -->
+
+  <!-- We override the AFTrainStation named style to add some
+       padding, and also to display the station indicator
+       using a top border -->
+  <style name="AFTrainStation">  
+    <property name="border-style">solid</property>
+    <property name="border-width">3px 0px 0px 0px</property>
+    <property name="padding">3pt</property>
+  </style>
+
+  <!-- panelTabbed styles -->
+  
+  <style name="AFPanelTabbed">
+    <includeStyle name="AFLightAccentBackground"/>
+    <includeStyle name="AFMediumBorder"/>
+    <property name="border-style">solid</property>
+    <includeStyle name="AFCenterTextAlign"/>
+    <property name="padding">2px 0px</property>  
+    <property name="margin">4px 0px</property>    
+  </style>
+  
+  <style selector="af|panelTabbed::orientation-top">
+    <includeStyle name="AFPanelTabbed"/>
+    <property name="border-width">1px 0px 0px</property>
+  </style>
+
+  <style selector="af|panelTabbed::orientation-bottom">
+    <includeStyle name="AFPanelTabbed"/>
+    <property name="border-width">0px 0px 1px</property>
+  </style>    
+
+
+  <!-- 
+    showOnePanel Styles
+  -->
+
+  <style selector="af|showOnePanel::header-disabled">
+    <property name="padding-left">18px</property>
+  </style>
+  
+  <style selector="af|showOnePanel::title-link">
+        <includeStyle name="AFDefaultBoldFont"/>
+  </style>
+    
+  <style selector="af|showOnePanel::title-disabled-link">
+        <includeStyle name="AFDefaultBoldFont"/>
+  </style>
+</styleSheet>
+
+<styleSheet direction="rtl">
+
+  <style selector="af|panelHeader::icon-style">
+    <property name="margin-left">3px</property>
+  </style>
+
+  <style selector=".AFSortableHeaderSortIcon">
+    <property name="padding-right">4px</property>
+  </style>
+
+</styleSheet>
+
+
+<styleSheet browsers="gecko">
+  <style selector="af|objectSeparator">
+    <property name="margin"/>
+  </style>
+</styleSheet>
+
+</styleSheetDocument>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-pda.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-pda.xss?rev=433524&r1=433523&r2=433524&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-pda.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/minimal-pda.xss Mon Aug 21 22:25:20 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,356 +14,406 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<styleSheetDocument xmlns="http://myfaces.apache.org/uix/style">
-  <import href="minimal-desktop.xss"/>
-
-  <!-- A custom style sheet which overrides AFDefaultFontFamily -->
-  <styleSheet>
-
-    <style name="AFLightAccentBackground">
-      <property name="background-color">#e9e8e8</property>
-    </style>
-
-   <!-- The default font family -->
-   <!-- Removing font family as this doesn't seem to make a 
-        difference and makes the stylesheet much bigger -->
-   <style name="AFDefaultFontFamily">
-     <property name="font-family"/>
-   </style>
-
-
-   <!-- The default font -->
-   <style name="AFDefaultFont">
-     <includeStyle name="AFDefaultFontFamily"/>
-     <property name="font-size">9pt</property>
-   </style>
- 
-   <!-- The default bold font -->
-   <style name="AFDefaultBoldFont">
-     <includeStyle name="AFDefaultFont"/>
-     <property name="font-weight">bold</property>
-   </style>
- 
-   <!-- A very small font -->
-   <style name="AFVerySmallFont">
-     <includeStyle name="AFDefaultFont"/>
-     <property name="font-size">-2pt</property>
-   </style>
- 
-   <!-- A small font -->
-   <style name="AFSmallFont">
-     <includeStyle name="AFDefaultFont"/>
-     <property name="font-size">-1pt</property>
-   </style>
- 
-   <!-- A medium font - just slightly bigger than default -->
-   <style name="AFMediumFont">
-     <includeStyle name="AFDefaultFont"/>
-     <property name="font-size">+1pt</property>
-   </style>
- 
-   <!-- A large font -->
-   <style name="AFLargeFont">
-     <includeStyle name="AFDefaultFont"/>
-     <property name="font-size">+2pt</property>
-   </style>
- 
-   <!-- A very large font -->
-   <style name="AFVeryLargeFont">
-     <includeStyle name="AFDefaultFont"/>
-     <property name="font-size">+3pt</property>
-   </style>
-
-    <!-- set the text style on the body so that it doesn' -->
-    <!-- have to be repeated -->
-    <style selector="BODY">
-      <includeStyle name="AFTextBackground"/>
-      <includeStyle name="AFDefaultFont"/>
-    </style>
-
-    <!-- styles used in af|panelPage::privacy, copyright, and about -->
-    <style name="AFFooterMessageText">
-      <property name="text-align">center</property>
-      <property name="padding"/>
-    </style>
-  
-    <style name="AFFooterMessageLink">
-      <includeStyle name="AFLinkForeground"/>
-    </style>
-  
-    <!-- Page Header Text -->
-    <style selector=".OraGlobalPageTitle">
-      <includeStyle name="AFLargeFont"/>
-      <includeStyle name="AFDarkForeground"/>
-    </style>
-    
-    <!-- Header Text -->
-    <!-- this is the same as simple-pda, so we don't need to define it here -->
-
-    
-
-    <!-- Page Sub Header Text TBD -->
-    <!-- Page Content Header TBD -->
-    <!-- Instruction Text == .AFInstructionText, OK -->
-    <!-- Text == AFDefaultFont OK -->
-    <!-- Subtext TBD -->
-
-    <!-- Label -->
-
-    <style selector=".AFLabelText"> 
-      <includeStyle name="AFVerySmallFont"/>
-      <property name="font-weight">bold</property>
-    </style>
-
-    <style selector=".AFLabelTextDisabled"> 
-      <includeStyle name="AFVerySmallFont"/>
-      <property name="font-weight">bold</property>
-    </style>
-
-    <!-- Link == A:link, OraLinkText, OK -->
-    <!-- Column Header == af|column::header-text, OK -->
-    <!-- Error! == OraErrorNameText, OK --> 
-    <!-- Error Message Font == OraMessageBoxErrorText, OK --> 
-    <!-- Help Text == OraInlineInfoText, OK -->
-
-    <!-- navigation bar styles shrunken -->
-    <style selector=".OraNavBarActiveLink">
-      <includeStyle name="AFSmallFont"/>
-    </style>
-
-    <style selector=".OraNavBarInactiveLink">
-      <includeStyle name="AFSmallFont"/>
-    </style>
-
-    <style selector=".OraNavBarViewOnly">
-      <includeStyle name="AFSmallFont"/>
-      <property name="color">#000000</property>
-    </style>
-
-    <style selector=".OraCrumbsSelected">
-      <includeStyle name="AFVerySmallFont"/>
-    </style>
-
-    <style selector=".OraCrumbsEnabled">
-      <includeStyle name="VerySmallLinkFont"/>
-    </style>
-
-    <!-- don't change font-size of disabled links -->
-    <style selector=".p_OraDisabled">
-        <property name="font-size"/>
-    </style>  
- 
-    <style selector=".p_OraTabBar">
-      <includeStyle name="SmallLinkFont"/>
-      <includeStyle name="AFLightBackground"/>
-      <property name="border-width"/>
-      <property name="border-style"/>
-      <property name="padding"/>
-    </style>
-  
-    <style selector=".p_OraGlobalHeader">  
-        <includeStyle name="SmallLinkFont"/>
-        <includeStyle name="LightExtraAccentBackground"/>
-        <includeStyle name="AFTextForeground"/>        
-    </style>
-
-
-    <style selector="OraLinkSelected">
-      <property name="background-color"/>
-      <property name="border-color"/>
-    </style>
-
-    <style selector="OraLinkSelectedLink">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-  
-    <style selector="OraLinkSelectedActive">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-  
-    <style selector="OraLinkSelectedVisited">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-      
-
-    <style selector="OraLinkEnabled">
-      <property name="background-color"/>
-    </style>    
-    
-    <style selector="OraLinkEnabledLink">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-  
-    <style selector="OraLinkEnabledActive">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-  
-    <style selector="OraLinkEnabledVisited">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-          
-   <style selector="af|menuTabs::selected">
-      <property name="background-color"/>
-      <property name="border-color"/>
-    </style>
-
-    <style selector="af|menuTabs::selected-link">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-
-    <style selector="af|menuTabs::enabled">
-      <property name="background-color"/>
-    </style>    
-    
-    <style selector="af|menuTabs::enabled-link">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-
-    <style selector="af|menuBar::selected">
-      <property name="background-color"/>
-    </style>
-
-    <style selector="af|menuBar::selected-link">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
-
-    <style selector="af|menuBar::enabled">
-      <property name="background-color"/>
-    </style>    
-    
-    <style selector="af|menuBar::enabled-link">
-      <includeStyle name="AFVeryDarkForeground"/>
-    <property name="text-decoration">none</property>
-    </style>
- 
-    
-    <style selector="af|table::control-bar-top">
-      <property name="background-color"/>
-      <property name="border-style"/>
-      <property name="border-color"/>
-      <property name="padding"/>
-    </style>
-    
-    <style selector="af|treeTable::control-bar-top">
-      <property name="background-color"/>
-      <property name="border-style"/>
-      <property name="border-color"/>
-      <property name="padding"/>
-    </style>
-    
-    <style selector=".OraSortableHeaderBorder">
-      <property name="border-width">1px</property>
-    </style>    
-
-    <style selector=".OraButtonText">
-        <includeStyle name="AFSmallFont"/>
-        <includeStyle name="AFLightAccentBackground"/>
-        <includeStyle name="AFTextForeground"/>
-      </style>
-      
-      <style selector=".AFFieldText">    
-        <includeStyle name="AFSmallFont"/>
-      </style>               
-      <style selector=".AFFieldTextDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>                
-      <style selector=".AFFieldNumber">    
-        <includeStyle name="AFSmallFont"/>
-      </style>               
-      <style selector=".AFFieldNumberDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>                 
-      <style selector=".AFDataText">    
-        <includeStyle name="AFSmallFont"/>
-      </style> 
-      <style selector=".AFDataTextDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>        
-      <style selector=".AFDataNumber">    
-        <includeStyle name="AFSmallFont"/>
-      </style>
-      <style selector=".AFDataNumberDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>          
-      <style selector=".AFPhoneFieldText">    
-        <includeStyle name="AFSmallFont"/>
-      </style> 
-      <style selector=".AFPhoneFieldTextDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>        
-      <style selector=".AFPostalCodeFieldText">    
-        <includeStyle name="AFSmallFont"/>
-      </style>
-      <style selector=".AFPostalCodeFieldTextDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>         
-      <style selector=".AFAddressFieldText">    
-        <includeStyle name="AFSmallFont"/>
-      </style>      
-      <style selector=".AFAddressFieldTextDisabled">    
-        <includeStyle name="AFSmallFont"/>
-      </style>       
-  </styleSheet>
-  <styleSheet platforms="windows ppc" browsers="ie">
-    <!-- use Tahoma for everything -->
-    <style name="AFDefaultFontFamily">
-      <property name="font-family">Tahoma</property>
-    </style>
-    
-   <style name="AFDefaultFont">
-      <includeStyle name="AFDefaultFontFamily"/>
-      <property name="font-size">x-small</property>
-    </style>
-
-    <style name="AFVerySmallFont">
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">xx-small</property>
-    </style>
-
-
-    <style name="AFSmallFont">
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">xx-small</property>
-    </style>
-
-    <style name="AFMediumFont">
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">x-small</property>
-    </style>
-
-    <style name="AFLargeFont">
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">small</property>
-    </style>
-
-    <style name="AFVeryLargeFont">
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">medium</property>
-    </style>
-
-
-    <!-- If I include AFVerySmallFont, which is defined above, shouldn't that work? 
-         I'm getting the attributes in blaf.xss -->
-    <style name="VerySmallLinkFont">
-      <!--includeStyle name="AFVerySmallFont"/-->
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">xx-small</property>
-    </style>    
-
-    <!-- Same problem as above -->
-    <style name="SmallLinkFont">
-      <!--includeStyle name="AFSmallFont"/-->
-      <includeStyle name="AFDefaultFont"/>
-      <property name="font-size">xx-small</property>    
-    </style>    
-  </styleSheet>
-</styleSheetDocument>
+<styleSheetDocument xmlns="http://myfaces.apache.org/uix/style">
+  <import href="minimal-desktop.xss"/>
+
+  <!-- A custom style sheet which overrides AFDefaultFontFamily -->
+  <styleSheet>
+
+    <style name="AFLightAccentBackground">
+      <property name="background-color">#e9e8e8</property>
+    </style>
+
+   <!-- The default font family -->
+   <!-- Removing font family as this doesn't seem to make a 
+        difference and makes the stylesheet much bigger -->
+   <style name="AFDefaultFontFamily">
+     <property name="font-family"/>
+   </style>
+
+
+   <!-- The default font -->
+   <style name="AFDefaultFont">
+     <includeStyle name="AFDefaultFontFamily"/>
+     <property name="font-size">9pt</property>
+   </style>
+ 
+   <!-- The default bold font -->
+   <style name="AFDefaultBoldFont">
+     <includeStyle name="AFDefaultFont"/>
+     <property name="font-weight">bold</property>
+   </style>
+ 
+   <!-- A very small font -->
+   <style name="AFVerySmallFont">
+     <includeStyle name="AFDefaultFont"/>
+     <property name="font-size">-2pt</property>
+   </style>
+ 
+   <!-- A small font -->
+   <style name="AFSmallFont">
+     <includeStyle name="AFDefaultFont"/>
+     <property name="font-size">-1pt</property>
+   </style>
+ 
+   <!-- A medium font - just slightly bigger than default -->
+   <style name="AFMediumFont">
+     <includeStyle name="AFDefaultFont"/>
+     <property name="font-size">+1pt</property>
+   </style>
+ 
+   <!-- A large font -->
+   <style name="AFLargeFont">
+     <includeStyle name="AFDefaultFont"/>
+     <property name="font-size">+2pt</property>
+   </style>
+ 
+   <!-- A very large font -->
+   <style name="AFVeryLargeFont">
+     <includeStyle name="AFDefaultFont"/>
+     <property name="font-size">+3pt</property>
+   </style>
+
+    <!-- set the text style on the body so that it doesn' -->
+    <!-- have to be repeated -->
+    <style selector="BODY">
+      <includeStyle name="AFTextBackground"/>
+      <includeStyle name="AFDefaultFont"/>
+    </style>
+
+    <!-- styles used in af|panelPage::privacy, copyright, and about -->
+    <style name="AFFooterMessageText">
+      <property name="text-align">center</property>
+      <property name="padding"/>
+    </style>
+  
+    <style name="AFFooterMessageLink">
+      <includeStyle name="AFLinkForeground"/>
+    </style>
+  
+    <!-- Page Header Text -->
+    <style selector=".OraGlobalPageTitle">
+      <includeStyle name="AFLargeFont"/>
+      <includeStyle name="AFDarkForeground"/>
+    </style>
+    
+    <!-- Header Text -->
+    <!-- this is the same as simple-pda, so we don't need to define it here -->
+
+    
+
+    <!-- Page Sub Header Text TBD -->
+    <!-- Page Content Header TBD -->
+    <!-- Instruction Text == .AFInstructionText, OK -->
+    <!-- Text == AFDefaultFont OK -->
+    <!-- Subtext TBD -->
+
+    <!-- Label -->
+
+    <style selector=".AFLabelText"> 
+      <includeStyle name="AFVerySmallFont"/>
+      <property name="font-weight">bold</property>
+    </style>
+
+    <style selector=".AFLabelTextDisabled"> 
+      <includeStyle name="AFVerySmallFont"/>
+      <property name="font-weight">bold</property>
+    </style>
+
+    <!-- Link == A:link, OraLinkText, OK -->
+    <!-- Column Header == af|column::header-text, OK -->
+    <!-- Error! == OraErrorNameText, OK --> 
+    <!-- Error Message Font == OraMessageBoxErrorText, OK --> 
+    <!-- Help Text == OraInlineInfoText, OK -->
+
+    <!-- navigation bar styles shrunken -->
+    <style selector=".OraNavBarActiveLink">
+      <includeStyle name="AFSmallFont"/>
+    </style>
+
+    <style selector=".OraNavBarInactiveLink">
+      <includeStyle name="AFSmallFont"/>
+    </style>
+
+    <style selector=".OraNavBarViewOnly">
+      <includeStyle name="AFSmallFont"/>
+      <property name="color">#000000</property>
+    </style>
+
+    <style selector=".OraCrumbsSelected">
+      <includeStyle name="AFVerySmallFont"/>
+    </style>
+
+    <style selector=".OraCrumbsEnabled">
+      <includeStyle name="VerySmallLinkFont"/>
+    </style>
+
+    <!-- don't change font-size of disabled links -->
+    <style selector=".p_OraDisabled">
+        <property name="font-size"/>
+    </style>  
+ 
+    <style selector=".p_OraTabBar">
+      <includeStyle name="SmallLinkFont"/>
+      <includeStyle name="AFLightBackground"/>
+      <property name="border-width"/>
+      <property name="border-style"/>
+      <property name="padding"/>
+    </style>
+  
+    <style selector=".p_OraGlobalHeader">  
+        <includeStyle name="SmallLinkFont"/>
+        <includeStyle name="LightExtraAccentBackground"/>
+        <includeStyle name="AFTextForeground"/>        
+    </style>
+
+
+    <style selector="OraLinkSelected">
+      <property name="background-color"/>
+      <property name="border-color"/>
+    </style>
+
+    <style selector="OraLinkSelectedLink">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+  
+    <style selector="OraLinkSelectedActive">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+  
+    <style selector="OraLinkSelectedVisited">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+      
+
+    <style selector="OraLinkEnabled">
+      <property name="background-color"/>
+    </style>    
+    
+    <style selector="OraLinkEnabledLink">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+  
+    <style selector="OraLinkEnabledActive">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+  
+    <style selector="OraLinkEnabledVisited">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+          
+   <style selector="af|menuTabs::selected">
+      <property name="background-color"/>
+      <property name="border-color"/>
+    </style>
+
+    <style selector="af|menuTabs::selected-link">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+
+    <style selector="af|menuTabs::enabled">
+      <property name="background-color"/>
+    </style>    
+    
+    <style selector="af|menuTabs::enabled-link">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+
+    <style selector="af|menuBar::selected">
+      <property name="background-color"/>
+    </style>
+
+    <style selector="af|menuBar::selected-link">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+
+    <style selector="af|menuBar::enabled">
+      <property name="background-color"/>
+    </style>    
+    
+    <style selector="af|menuBar::enabled-link">
+      <includeStyle name="AFVeryDarkForeground"/>
+    <property name="text-decoration">none</property>
+    </style>
+ 
+    
+    <style selector="af|table::control-bar-top">
+      <property name="background-color"/>
+      <property name="border-style"/>
+      <property name="border-color"/>
+      <property name="padding"/>
+    </style>
+    
+    <style selector="af|treeTable::control-bar-top">
+      <property name="background-color"/>
+      <property name="border-style"/>
+      <property name="border-color"/>
+      <property name="padding"/>
+    </style>
+    
+    <style selector=".OraSortableHeaderBorder">
+      <property name="border-width">1px</property>
+    </style>    
+
+    <style selector=".OraButtonText">
+        <includeStyle name="AFSmallFont"/>
+        <includeStyle name="AFLightAccentBackground"/>
+        <includeStyle name="AFTextForeground"/>
+      </style>
+      
+      <style selector=".AFFieldText">    
+        <includeStyle name="AFSmallFont"/>
+      </style>               
+      <style selector=".AFFieldTextDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>                
+      <style selector=".AFFieldNumber">    
+        <includeStyle name="AFSmallFont"/>
+      </style>               
+      <style selector=".AFFieldNumberDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>                 
+      <style selector=".AFDataText">    
+        <includeStyle name="AFSmallFont"/>
+      </style> 
+      <style selector=".AFDataTextDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>        
+      <style selector=".AFDataNumber">    
+        <includeStyle name="AFSmallFont"/>
+      </style>
+      <style selector=".AFDataNumberDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>          
+      <style selector=".AFPhoneFieldText">    
+        <includeStyle name="AFSmallFont"/>
+      </style> 
+      <style selector=".AFPhoneFieldTextDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>        
+      <style selector=".AFPostalCodeFieldText">    
+        <includeStyle name="AFSmallFont"/>
+      </style>
+      <style selector=".AFPostalCodeFieldTextDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>         
+      <style selector=".AFAddressFieldText">    
+        <includeStyle name="AFSmallFont"/>
+      </style>      
+      <style selector=".AFAddressFieldTextDisabled">    
+        <includeStyle name="AFSmallFont"/>
+      </style>       
+  </styleSheet>
+  <styleSheet platforms="windows ppc" browsers="ie">
+    <!-- use Tahoma for everything -->
+    <style name="AFDefaultFontFamily">
+      <property name="font-family">Tahoma</property>
+    </style>
+    
+   <style name="AFDefaultFont">
+      <includeStyle name="AFDefaultFontFamily"/>
+      <property name="font-size">x-small</property>
+    </style>
+
+    <style name="AFVerySmallFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>
+    </style>
+
+
+    <style name="AFSmallFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>
+    </style>
+
+    <style name="AFMediumFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">x-small</property>
+    </style>
+
+    <style name="AFLargeFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">small</property>
+    </style>
+
+    <style name="AFVeryLargeFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">medium</property>
+    </style>
+
+
+    <!-- If I include AFVerySmallFont, which is defined above, shouldn't that work? 
+         I'm getting the attributes in blaf.xss -->
+    <style name="VerySmallLinkFont">
+      <!--includeStyle name="AFVerySmallFont"/-->
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>
+    </style>    
+
+    <!-- Same problem as above -->
+    <style name="SmallLinkFont">
+      <!--includeStyle name="AFSmallFont"/-->
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>    
+    </style>    
+  </styleSheet>
+  
+  <styleSheet platforms="blackberry" browsers="blackberry">
+    
+    <style name="AFDefaultFont">
+      <includeStyle name="AFDefaultFontFamily"/>
+      <property name="font-size">x-small</property>
+    </style>
+
+    <style name="AFVerySmallFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>
+    </style>
+
+
+    <style name="AFSmallFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>
+    </style>
+
+    <style name="AFMediumFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">x-small</property>
+    </style>
+
+    <style name="AFLargeFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">small</property>
+    </style>
+
+    <style name="AFVeryLargeFont">
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">medium</property>
+    </style>
+
+
+    <!-- If I include AFVerySmallFont, which is defined above, shouldn't that work? 
+         I'm getting the attributes in blaf.xss -->
+    <style name="VerySmallLinkFont">
+      <!--includeStyle name="AFVerySmallFont"/-->
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>
+    </style>    
+
+    <!-- Same problem as above -->
+    <style name="SmallLinkFont">
+      <!--includeStyle name="AFSmallFont"/-->
+      <includeStyle name="AFDefaultFont"/>
+      <property name="font-size">xx-small</property>    
+    </style>    
+  </styleSheet>    
+</styleSheetDocument>



Mime
View raw message