[richfaces-svn-commits] JBoss Rich Faces SVN: r13784 - in trunk: samples/themes/src/main/java/org/richfaces/theme/images and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Apr 22 16:52:22 EDT 2009
Author: alexsmirnov
Date: 2009-04-22 16:52:21 -0400 (Wed, 22 Apr 2009)
New Revision: 13784
Added:
trunk/samples/layout-sample/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundLeft.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundRight.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterBackground.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterLeft.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterRight.java
Modified:
trunk/samples/layout-sample/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/layout-sample/src/main/webapp/WEB-INF/web.xml
trunk/samples/themes/src/main/java/org/richfaces/theme/images/BaseShadowGradient.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderLeft.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderRight.java
trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss
trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx
trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss
Log:
"smooth" theme at most implemented.
Added: trunk/samples/layout-sample/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/samples/layout-sample/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/samples/layout-sample/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2009-04-22 20:52:21 UTC (rev 13784)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Modified: trunk/samples/layout-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/layout-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/layout-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-04-22 20:52:21 UTC (rev 13784)
@@ -9,7 +9,7 @@
<managed-bean>
<managed-bean-name>bean</managed-bean-name>
<managed-bean-class>org.richfaces.samples.Bean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>skinBean</managed-bean-name>
Modified: trunk/samples/layout-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/layout-sample/src/main/webapp/WEB-INF/web.xml 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/layout-sample/src/main/webapp/WEB-INF/web.xml 2009-04-22 20:52:21 UTC (rev 13784)
@@ -1,62 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Archetype Created Web Application</display-name>
- <context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>server</param-value>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>Archetype Created Web Application</display-name>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
</context-param>
- <context-param>
- <param-name>facelets.VIEW_MAPPINGS</param-name>
- <param-value>*.xhtml</param-value>
- </context-param>
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.SKIN</param-name>
- <param-value>#{skinBean.skin}</param-value>
- </context-param>
- <context-param>
- <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
-<!--context-param>
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>#{skinBean.skin}</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <!--context-param>
<param-name>org.richfaces.LoadStyleStrategy</param-name>
<param-value>NONE</param-value>
-</context-param-->
-
- <!--
- -->
- <filter>
- <display-name>Ajax4jsf Filter</display-name>
- <filter-name>ajax4jsf</filter-name>
- <filter-class>org.ajax4jsf.Filter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>ajax4jsf</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
+</context-param
+
+ -->
+ <filter>
+ <display-name>Ajax4jsf Filter</display-name>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ <init-param>
+ <param-name>enable-cache</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
<dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
-</web-app>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/BaseShadowGradient.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/BaseShadowGradient.java 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/BaseShadowGradient.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -1,5 +1,7 @@
package org.richfaces.theme.images;
+import java.awt.geom.AffineTransform;
+
import javax.faces.context.FacesContext;
import org.ajax4jsf.util.Zipper2;
@@ -37,6 +39,11 @@
}
+ public static final AffineTransform FLIP_TRANSFORM = new AffineTransform(-1, 0, 0, 1, 0, 0);
+ public static final double RADIUS = 7.5;
+ public static final double MARGIN = 5.0;
+ protected static final int SHADOW_RADIUS = (int) (RADIUS+MARGIN);
+
public BaseShadowGradient(int width, int height, int gradientHeight,
String baseColor, String gradientColor, boolean horizontal) {
super(width, height, gradientHeight, baseColor, gradientColor,
@@ -112,6 +119,10 @@
}
}
+ protected AffineTransform createFlipTransform() {
+ return new AffineTransform(-1.0, 0.0, 0.0, 1.0, getDimensions(null).getWidth(),0.0);
+ }
+
public BaseShadowGradient(String baseColor, String gradientColor,
boolean horizontal) {
super(baseColor, gradientColor, horizontal);
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundLeft.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundLeft.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundLeft.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -0,0 +1,44 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ShadowBackgroundLeft extends BaseShadowGradient {
+
+
+ public ShadowBackgroundLeft() {
+ super(15, 15, 15,"panelBorderColor","headerBackgroundColor", false);
+ }
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ ShadowData shadowData = (ShadowData) data;
+ Dimension dimensions = getDimensions(null);
+ if(null != shadowData.getShadowColor()){
+ g2d.setColor(new Color(shadowData.getShadowColor()));
+ g2d.fillRect(0, 0, (int) MARGIN, dimensions.height);
+ }
+ if(null != shadowData.getHeaderBackgroundColor()){
+ g2d.setColor(new Color(shadowData.getHeaderBackgroundColor()));
+ g2d.fillRect((int) MARGIN, 0, (int) (dimensions.width-MARGIN), dimensions.height);
+ }
+
+ }
+ /* (non-Javadoc)
+ * @see org.richfaces.theme.images.BaseShadowGradient#getShadowColor()
+ */
+ @Override
+ protected String getShadowColor() {
+ return "shadowBackgroundColor";
+ }
+
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundLeft.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundRight.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundRight.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundRight.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -0,0 +1,14 @@
+package org.richfaces.theme.images;
+
+import java.awt.Graphics2D;
+
+
+public class ShadowBackgroundRight extends ShadowBackgroundLeft {
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ //x -> -x, y -> y
+ g2d.transform(createFlipTransform());
+ super.paintGradient(g2d, data);
+ }
+
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowBackgroundRight.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterBackground.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterBackground.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -0,0 +1,47 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.richfaces.theme.images.BaseShadowGradient.ShadowData;
+
+
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ShadowFooterBackground extends BaseShadowGradient {
+
+ public ShadowFooterBackground() {
+ super(15, 72, 65,"panelBorderColor", "headerGradientColor",false);
+ }
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ Dimension dim = getDimensions(null,data);
+ // Shadow
+ ShadowData shadowData = (ShadowData) data;
+ if(null != shadowData.getShadowColor()){
+ g2d.setColor(new Color(shadowData.getShadowColor()));
+ g2d.fillRect(0, (int) (dim.height-MARGIN), getDimensions(null).width, (int) MARGIN);
+ }
+ g2d.translate(0.0, -MARGIN);
+ paintGradientContent(g2d, data);
+ }
+
+ protected void paintGradientContent(Graphics2D g2d, Data data) {
+ // Paint gradient itself
+ super.paintGradient(g2d, data);
+ }
+
+ @Override
+ protected String getShadowColor() {
+ return "shadowBackgroundColor";
+ }
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterBackground.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterLeft.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterLeft.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterLeft.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -0,0 +1,34 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.richfaces.theme.images.BaseShadowGradient.ShadowData;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ShadowFooterLeft extends ShadowFooterBackground {
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ Dimension dim = getDimensions(null, data);
+ // Shadow
+ ShadowData shadowData = (ShadowData) data;
+ if(null != shadowData.getShadowColor()){
+ g2d.setColor(new Color(shadowData.getShadowColor()));
+ g2d.fillRoundRect(0, -dim.height, dim.width*2, dim.height*2,SHADOW_RADIUS,SHADOW_RADIUS);
+ }
+ g2d.translate(0.0, -MARGIN);
+ RoundRectangle2D clip = new RoundRectangle2D.Double(MARGIN,-1.0*dim.getHeight(),dim.getWidth()*2.0,dim.getHeight()*2.0,RADIUS,RADIUS);
+ g2d.setClip(clip);
+ super.paintGradientContent(g2d, data);
+ }
+
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterLeft.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterRight.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterRight.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterRight.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -0,0 +1,21 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import java.awt.Graphics2D;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ShadowFooterRight extends ShadowFooterLeft {
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Data data) {
+ //x -> -x, y -> y
+ g2d.transform(createFlipTransform());
+ super.paintGradient(g2d, data);
+ }
+
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowFooterRight.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderBackground.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -22,8 +22,23 @@
@Override
protected void paintGradient(Graphics2D g2d, Data data) {
+ // Shadow
+ ShadowData shadowData = (ShadowData) data;
+ if(null != shadowData.getShadowColor()){
+ g2d.setColor(new Color(shadowData.getShadowColor()));
+ g2d.fillRect(0, 0, getDimensions(null).width, (int) MARGIN);
+ }
+ g2d.translate(0.0, MARGIN);
+ // Paint gradient itself
+ paintGradientContent(g2d, data);
+ }
+
+ /**
+ * @param g2d
+ * @param data
+ */
+ protected void paintGradientContent(Graphics2D g2d, Data data) {
Dimension dim = getDimensions(null, data);
- // Paint gradient itself
super.paintGradient(g2d, data);
// Paint lower bar
Integer headerBackgroundColor = data.getHeaderBackgroundColor();
Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderLeft.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderLeft.java 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderLeft.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -3,10 +3,13 @@
*/
package org.richfaces.theme.images;
+import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.geom.RoundRectangle2D;
+import org.richfaces.theme.images.BaseShadowGradient.ShadowData;
+
/**
* @author asmirnov
*
@@ -15,10 +18,18 @@
@Override
protected void paintGradient(Graphics2D g2d, Data data) {
+ // Shadow
Dimension dim = getDimensions(null, data);
- RoundRectangle2D clip = new RoundRectangle2D.Double(5,5,dim.width*2.0,dim.height*2.0,5,5);
+ ShadowData shadowData = (ShadowData) data;
+ if(null != shadowData.getShadowColor()){
+ g2d.setColor(new Color(shadowData.getShadowColor()));
+ g2d.fillRoundRect(0, 0, dim.width*2, dim.height*2,SHADOW_RADIUS,SHADOW_RADIUS);
+ }
+ // Paint gradient itself
+ g2d.translate(0.0, MARGIN);
+ RoundRectangle2D clip = new RoundRectangle2D.Double(MARGIN,0,dim.getWidth()*2.0,dim.getHeight()*2.0,RADIUS,RADIUS);
g2d.setClip(clip);
- super.paintGradient(g2d, data);
+ super.paintGradientContent(g2d, data);
}
}
Modified: trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderRight.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderRight.java 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/ShadowHeaderRight.java 2009-04-22 20:52:21 UTC (rev 13784)
@@ -4,7 +4,6 @@
package org.richfaces.theme.images;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
/**
* @author asmirnov
@@ -15,7 +14,7 @@
@Override
protected void paintGradient(Graphics2D g2d, Data data) {
//x -> -x, y -> y
- g2d.transform(new AffineTransform(-1, 0, 0, 1, 0, 0));
+ g2d.transform(createFlipTransform());
super.paintGradient(g2d, data);
}
Modified: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss
===================================================================
--- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss 2009-04-22 20:52:21 UTC (rev 13784)
@@ -3,6 +3,7 @@
<f:template xmlns:f='http:/jsf.exadel.com/template'
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml">
+
<u:selector name="body">
<u:style name="background" skin="headerGradientColor"/>
<u:style name="margin" value="0px"/>
@@ -13,17 +14,43 @@
<u:style name="background-repeat" value="repeat-x"/>
<u:style name="background-position" value="top left"/>
</u:selector>
+
+ <u:selector name=".bg_tabbody">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-top" value="solid 15px" />
+ </u:selector>
+
+ <u:selector name=".content_body">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border" value="none" />
+ </u:selector>
+
+ <u:selector name=".menu_col">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-right" value="solid 2px" />
+ <u:style name="vertical-align" value="top"/>
+ </u:selector>
+ <u:selector name=".content_col">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="width" value="100%" />
+ <u:style name="vertical-align" value="top"/>
+ </u:selector>
+
+
<u:selector name=".header_content">
<u:style name="background-image">
<!-- images/bg_header.png -->
<f:resource f:key="org.richfaces.theme.images.ShadowHeaderBackground"/>
</u:style>
- <u:style name="margin" value="0px 10px 0px 10px" />
+ <u:style name="margin" value="0px 15px 0px 15px" />
+ <u:style name="padding" value="15px" />
<u:style name="border-bottom-color" skin="generalBackgroundColor" />
<u:style name="background-color" skin="headerBackgroundColor"/>
<u:style name="background-repeat" value="repeat-x"/>
<u:style name="background-position" value="top left"/>
- <u:style name="height" value="80px"/>
<u:style name="position" value="relative"/>
</u:selector>
@@ -42,40 +69,88 @@
</u:style>
<u:style name="background-repeat" value="no-repeat"/>
<u:style name="background-position" value="top right"/>
- <u:style name="height" value="80px"/>
</u:selector>
- <u:selector name=".footer_bg">
+ <u:selector name=".footer_bg_content">
<u:style name="background-image">
<!-- images/bg_footer.png -->
- <f:resource f:key="org.richfaces.theme.images.FooterBackground"/>
+ <f:resource f:key="org.richfaces.theme.images.ShadowFooterBackground"/>
</u:style>
- <u:style name="border-top" value="1px solid" />
- <u:style name="border-top-color" skin="generalBackgroundColor" />
- <u:style name="background-color" skin="panelBorderColor"/>
<u:style name="background-repeat" value="repeat-x"/>
- <u:style name="background-position" value="center left"/>
+ <u:style name="background-position" value="bottom left"/>
+ <u:style name="margin" value="0px 15px 0px 15px" />
+ <u:style name="position" value="relative"/>
+ <u:style name="padding" value="15px" />
</u:selector>
+ <u:selector name=".footer_bg_left">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowFooterLeft"/>
+ </u:style>
+ <!-- u:style name="background-color" skin="panelBorderColor"/-->
+ <u:style name="background-repeat" value="no-repeat"/>
+ <u:style name="background-position" value="bottom left"/>
+ </u:selector>
+ <u:selector name=".footer_bg_right">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowFooterRight"/>
+ </u:style>
+ <u:style name="background-repeat" value="no-repeat"/>
+ <u:style name="background-position" value="bottom right"/>
+ </u:selector>
+
+
+ <u:selector name=".left_col">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundLeft"/>
+ </u:style>
+ <!-- u:style name="background-color" skin="panelBorderColor"/-->
+ <u:style name="background-repeat" value="repeat-y"/>
+ <u:style name="background-position" value="top left"/>
+ <u:style name="vertical-align" value="top"/>
+ </u:selector>
+ <u:selector name=".left_strut">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundLeft"/>
+ </u:style>
+ <!-- u:style name="background-color" skin="panelBorderColor"/-->
+ <u:style name="background-repeat" value="repeat-y"/>
+ <u:style name="background-position" value="buttom left"/>
+ <u:style name="width" value="14px"/>
+ </u:selector>
+
+ <u:selector name=".right_col">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundRight"/>
+ </u:style>
+ <!-- u:style name="background-color" skin="panelBorderColor"/-->
+ <u:style name="background-repeat" value="repeat-y"/>
+ <u:style name="background-position" value="top right"/>
+ <u:style name="vertical-align" value="top"/>
+ </u:selector>
+ <u:selector name=".right_strut">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundRight"/>
+ </u:style>
+ <!-- u:style name="background-color" skin="panelBorderColor"/-->
+ <u:style name="background-repeat" value="repeat-y"/>
+ <u:style name="background-position" value="buttom right"/>
+ <u:style name="width" value="14px"/>
+ </u:selector>
+
<f:verbatim>
<![CDATA[
-.page_size{width : 90%;}
+.page_size{width : 90%;border: none;}
.menu_width{width : 300px;}
.common_box {margin : 0px; }
.spacer{font-size : 1px;}
-.left_col {background : url(images/bg_left.png) top left no-repeat; vertical-align : top}
-.left_strut {background : url(images/bg_left_strut.png) top left no-repeat; height : 389px; width : 14px}
-.bg_tabbody {background : #c0c0c0}
-
-.menu_col {border-right : 2px solid #C0C0C0; vertical-align : top; background : #FFFFFF;}
-.content_col {vertical-align : top; width : 100%; background : #FFFFFF;}
-
-.right_col {background : url(images/bg_right.png) top right no-repeat; vertical-align : top}
-.right_strut {background : url(images/bg_right_strut.png) top right no-repeat; height : 389px; width : 14px}
-.footer_bg_left {background : url(images/bg_footer_left.png) top left no-repeat;}
-.footer_bg_right {background : url(images/bg_footer_right.png) top right no-repeat; height : 72px;}
-.footer_bg_content {margin : 0px 10px 0px 10px; height : 53px; position : relative;}
]]>
</f:verbatim>
</f:template>
\ No newline at end of file
Modified: trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/samples/themes/src/main/templates/org/richfaces/smooth.jspx 2009-04-22 20:52:21 UTC (rev 13784)
@@ -39,13 +39,13 @@
<tr>
<td align="center" class="common_box">
- <table height="100%" border="0" cellpadding="0" cellspacing="0" class="page_size">
+ <table height="100%" cellpadding="0" cellspacing="0" class="page_size">
<tr>
<td colspan="3" class="header_bg_left">
<div class="header_bg_right">
- <div class="spacer" style="height : 15px"></div>
+ <!-- div class="spacer" style="height : 15px"></div -->
<div class="header_content">
- <u:insertFacet name="header"/>
+ <u:insertFacet name="header"/>
</div>
</div>
</td>
@@ -57,7 +57,7 @@
</div>
</td>
<td width="100%" height="100%" class="bg_tabbody">
- <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <table class="content_body" cellpadding="0" cellspacing="0" width="100%" height="100%">
<tr>
<td class="menu_col">
<div class="spacer" style="width:#{component.attributes['sidebarWidth']}px"></div>
Modified: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss
===================================================================
--- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-04-22 19:56:13 UTC (rev 13783)
+++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-04-22 20:52:21 UTC (rev 13784)
@@ -43,13 +43,13 @@
<u:style name="background-color" skin="generalBackgroundColor"/>
<u:style name="background-repeat" value="repeat-x"/>
<u:style name="background-position" value="top left"/>
+ <u:style name="border" value="2px solid" />
+ <u:style name="border-color" skin="panelBorderColor" />
</u:selector>
<u:selector name=".rich-page-main">
<u:style name="border-top" value="2px solid" />
<u:style name="border-top-color" skin="panelBorderColor" />
- <u:style name="border-bottom" value="2px solid" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
</u:selector>
<u:selector name=".rich-page-body">
@@ -73,10 +73,6 @@
<u:selector name=".rich-page-sidebar">
<!--u:style name="padding" value="0 20px 0 20px" /-->
<u:style name="vertical-align" value="top"/>
- <u:style name="border-right" value="2px solid" />
- <u:style name="border-right-color" skin="panelBorderColor" />
- <u:style name="border-bottom" value="2px solid" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
</u:selector>
<u:selector name="*.rich-page-sidebar, *.rich-page-body, *.rich-page-footer">
More information about the richfaces-svn-commits
mailing list