svn commit: r490916 - in /incubator/adffaces/trunk/trinidad: trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java

[jw...@apache.org]

Author: jwaldman
Date: Thu Dec 28 20:06:12 2006
New Revision: 490916

URL: http://svn.apache.org/viewvc?view=rev&rev=490916
Log:
ADFFACES-341 icon skin definition does not append all non-width/height/content properties into an inline style, and it should

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css?view=diff&rev=490916&r1=490915&r2=490916
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css Thu Dec 28 20:06:12 2006
@@ -374,10 +374,17 @@
 af|selectBooleanCheckbox::read-only-unchecked-icon
 {
   content:url(/skins/purple/images/checkrn.gif);
+  border-width: 3px;
+  border-style: dashed;
+  border-color: purple;
 }
 af|selectBooleanCheckbox::read-only-checked-icon
 {
-  content:url(/skins/purple/images/checkrc.gif);
+  /*content:url(/skins/purple/images/checkrc.gif);*/
+  content: "X";
+  border-width: 3px;
+  border-style: dashed;
+  border-color: aqua;
 }
 
 af|selectBooleanCheckbox::disabled-only-unchecked-icon

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java?view=diff&rev=490916&r1=490915&r2=490916
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Thu Dec 28 20:06:12 2006
@@ -543,9 +543,10 @@
   /**
    * Create an IconNode and add it to the iconNodeList.
    * @param selectorName
-   * @param propertyNodeList
-   * @param trTextAntialias
+   * @param noTrPropertyNodeList
    * @param iconNodeList
+   * @return boolean true if this "icon" does not contain an image url or text icon as the
+   * property value of 'content:'. That means it is only css styles.
    */
   private static boolean _addIconNode(
     String             selectorName,
@@ -626,7 +627,8 @@
       else
       {
         // create an inlineStyle with all the extraneous style properties
-        inlineStyle = new CSSStyle();
+        if (inlineStyle == null)
+          inlineStyle = new CSSStyle();
         inlineStyle.setProperty(propertyName, propertyValue);
       }
 
@@ -642,7 +644,7 @@
         // don't allow styleClass from the css parsing file. We can handle
         // this when we have style includes
         // put back the width/height properties if there were some
-        if (heightValue != null || widthValue != null)
+        if ((heightValue != null || widthValue != null) && inlineStyle == null)
           inlineStyle = new CSSStyle();
         if (heightValue != null)
          inlineStyle.setProperty("height", heightValue);