April 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r13784 - in trunk: samples/themes/src/main/java/org/richfaces/theme/images and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

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> - - -  - <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">  <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">  - <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"> +  + <f:resource f:key="org.richfaces.theme.images.ShadowFooterLeft"/> + </u:style> +  + <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"> +  + <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"> +  + <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundLeft"/> + </u:style> +  + <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"> +  + <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundLeft"/> + </u:style> +  + <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"> +  + <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundRight"/> + </u:style> +  + <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"> +  + <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundRight"/> + </u:style> +  + <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="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="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">

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13783 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-04-22 15:56:13 -0400 (Wed, 22 Apr 2009) New Revision: 13783 Modified: trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml Log: https://jira.jboss.org/jira/browse/RF-6022 Relevant Resources Links: links to livedemo are made mor meaningfull now Modified: trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml 2009-04-22 19:45:29 UTC (rev 13782) +++ trunk/docs/userguide/en/src/main/docbook/included/ajaxListener.xml 2009-04-22 19:56:13 UTC (rev 13783) @@ -111,8 +111,8 @@ <section> <title>Relevant resources links</title> <para> - Some additional information about usage of component can be found in this - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/ajaxListener.jsf?c=aj...">forum topic</ulink>.</para> + Some additional information about usage of component can be found on + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/ajaxListener.jsf?c=aj...">RichFaces Live Demo page</ulink>.</para> <para> More information about <emphasis role="bold"><property><f:valueChangeListener></property></emphasis> can be found <ulink url=" http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/tlddocs/f/valueCha...">in Sun JSF TLD documentation </ulink>. </para>

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13782 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-04-22 15:45:29 -0400 (Wed, 22 Apr 2009) New Revision: 13782 Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java Log: https://jira.jboss.org/jira/browse/RF-6828 Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2009-04-22 19:15:28 UTC (rev 13781) +++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2009-04-22 19:45:29 UTC (rev 13782) @@ -22,7 +22,6 @@ import java.io.IOException; import java.util.Iterator; -import java.util.List; import javax.faces.FacesException; import javax.faces.application.FacesMessage; @@ -74,7 +73,7 @@ }else if((layout != null) && (layout.equals("list"))){ isWroteTable = false; - writer.startElement("dl", uiMessages); + writer.startElement(HTML.DL_ELEMENT, uiMessages); getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context)); renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone); @@ -97,7 +96,7 @@ writer.endElement("tbody"); writer.endElement("table"); }else{ - writer.endElement("dl"); + writer.endElement(HTML.DL_ELEMENT); } } @@ -195,7 +194,7 @@ String parentStyle = (String)uiMessages.getAttributes().get("style"); String parentClass = (String)uiMessages.getAttributes().get("styleClass"); - parentStyle = ((isDisplayNone) ? "display: none; " : "") + parentStyle; + parentStyle = ((isDisplayNone) ? "display: none; " : "") + (parentStyle != null ? parentStyle : ""); String richMessageClass = "rich-messages"; parentClass = parentClass != null ? (richMessageClass + " " + parentClass) : richMessageClass; @@ -217,27 +216,25 @@ } public void renderBody(UIRichMessages uiMessages, FacesContext context, ResponseWriter writer,FacesMessage facesMsg,boolean isWroteTable) throws IOException{ + if (isWroteTable) { + writer.startElement(HTML.TR_ELEMENT, uiMessages); + writer.startElement(HTML.td_ELEM, uiMessages); + } else { + writer.startElement(HTML.DT_ELEMENT, uiMessages); + } + + if (facesMsg != null) { + outerStyles(uiMessages, context, writer, facesMsg); + renderMarkerFacet(uiMessages, context, writer, facesMsg); + renderLabel(uiMessages, context, writer, facesMsg); + } - if(facesMsg != null ){ - if(isWroteTable){ - writer.startElement(HTML.TR_ELEMENT, uiMessages); - writer.startElement(HTML.td_ELEM, uiMessages); - }else{ - writer.startElement("dt", uiMessages); - } - - outerStyles(uiMessages, context, writer, facesMsg); - renderMarkerFacet(uiMessages, context, writer, facesMsg); - renderLabel(uiMessages, context, writer, facesMsg); - - if(isWroteTable){ - writer.endElement(HTML.td_ELEM); - writer.endElement(HTML.TR_ELEMENT); - }else{ - writer.endElement("dt"); - } - } - + if (isWroteTable) { + writer.endElement(HTML.td_ELEM); + writer.endElement(HTML.TR_ELEMENT); + } else { + writer.endElement(HTML.DT_ELEMENT); + } } protected Class<? extends UIComponent> getComponentClass() {

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13781 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-04-22 15:15:28 -0400 (Wed, 22 Apr 2009) New Revision: 13781 Modified: trunk/docs/userguide/en/src/main/docbook/included/messages.xml Log: https://jira.jboss.org/jira/browse/RF-6710 https://jira.jboss.org/jira/browse/RF-6762 Messages: passedLabel attribute and passedMarker facet are removed from dev guide according to changes in the component Modified: trunk/docs/userguide/en/src/main/docbook/included/messages.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/messages.xml 2009-04-22 19:15:07 UTC (rev 13780) +++ trunk/docs/userguide/en/src/main/docbook/included/messages.xml 2009-04-22 19:15:28 UTC (rev 13781) @@ -107,10 +107,10 @@ <entry>warnMarker</entry> <entry>Defines marker for "Warn" message severity class</entry> </row> - <row> +  </tbody> </tgroup> </table> @@ -120,17 +120,14 @@ <para> <emphasis role="bold">Example:</emphasis> </para> - <programlisting role="XML"><![CDATA[<rich:messages layout="table" tooltip="true" showDetail="false" showSummary="true" passedLabel="No Errors"> + <programlisting role="XML"><![CDATA[<rich:messages layout="table" tooltip="true" showDetail="false" showSummary="true"> <f:facet name="errorMarker"> <h:graphicImage url="/image/error.png"/> </f:facet> <f:facet name="infoMarker"> <h:graphicImage url="/image/info.png"/> </f:facet> - <f:facet name="passedMarker"> - <h:graphicImage url="/image/passed.png"/> - </f:facet> -</rich:messages>]]></programlisting> + </rich:messages>]]></programlisting> <para>The <emphasis role="bold"><property><rich:messages></property></emphasis> component keeps all messages for all components even after only one ajax-validated component was updated.</para>

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13780 - in trunk/framework: impl/src/main/java/org/richfaces/model and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-04-22 15:15:07 -0400 (Wed, 22 Apr 2009) New Revision: 13780 Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java Log: https://jira.jboss.org/jira/browse/RF-6663 Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java 2009-04-22 18:44:47 UTC (rev 13779) +++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java 2009-04-22 19:15:07 UTC (rev 13780) @@ -77,6 +77,7 @@ (c == '<') || // - escape HTML markup characters (c == '>') || // - HTML (c == '&') || // - HTML + (c == '-') || // - HTML comments (c < 0x20) || // See <http://www.w3.org/TR/REC-xml#charsets> ((c > 0xd7ff) && (c < 0xe000)) || (c > 0xfffd)|| (c > 0xff)) { return (false); Modified: trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2009-04-22 18:44:47 UTC (rev 13779) +++ trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2009-04-22 19:15:07 UTC (rev 13780) @@ -117,7 +117,14 @@ @Override public Object getRowKey() { - return rowKeys.indexOf(originalModel.getRowKey()); + Object originalModelKey = originalModel.getRowKey(); + int idx = rowKeys.indexOf(originalModelKey); + + if (originalModelKey != null || idx >= 0) { + return idx; + } else { + return null; + } } @Override

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13779 - in trunk/docs: userguide/en/src/main/docbook/included and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-04-22 14:44:47 -0400 (Wed, 22 Apr 2009) New Revision: 13779 Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml Log: https://jira.jboss.org/jira/browse/RF-398 English is checked and corrected in 2 chapters for Photo Album Tutorial, and in one chapter (architecture overview) in dev guide Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml =================================================================== --- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml 2009-04-22 18:32:25 UTC (rev 13778) +++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml 2009-04-22 18:44:47 UTC (rev 13779) @@ -143,20 +143,20 @@ <para> Implementation of the <emphasis role="bold"><property><rich:tree></property></emphasis> in the application is very similar to the model shown above. The <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> component has <nodes> attribute. - The top <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> in the <emphasis role="bold"><property><rich:tree></property></emphasis> in the Phot Album Demo application is responsible for shelves rendering. - Its <emphasis><property>"nodes"</property></emphasis> attribute refers to <emphasis><property>getShelfs()</property></emphasis> method of the <code>ShelfManager</code> class and gets the collection of shelves associated with the current user including all shared shelves in the system. + The top <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> in the <emphasis role="bold"><property><rich:tree></property></emphasis> in the Photo Album Demo application is responsible for shelves rendering. + Its <emphasis><property>"nodes"</property></emphasis> attribute refers to <emphasis><property>getShelves()</property></emphasis> method of the <code>ShelfManager</code> class and gets the collection of shelves associated with the current user including all shared shelves in the system. Take a look at this method: </para> - <programlisting role="JAVA"><![CDATA[public List<Shelf> getShelfs(){ - if(shelfs == null){ - shelfs = shelfAction.getShelfs(user); + <programlisting role="JAVA"><![CDATA[public List<Shelf> getShelves(){ + if(shelves == null){ + shelves = shelfAction.getShelves(user); } - return shelfs; + return shelves; } ]]></programlisting> <para> - After the <emphasis><property>"nodes"</property></emphasis> attribute of the <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis>, which is responsible for shelves rendering, receives the collection of shelves, + When the <emphasis><property>"nodes"</property></emphasis> attribute of the <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis>, which is responsible for shelves rendering, receives the collection of shelves, the iteration process switches to the nested <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis>, which is responsible for albums. The "albums" <emphasis role="bold"><property><rich:treeNodesAdaptor></property></emphasis> <emphasis><property>"nodes"</property></emphasis> attribute refers in its turn to the <code>albums</code> field of the <code>Shelf</code> class and takes a collection of all albums associated with the current shelf. @@ -169,7 +169,7 @@ adviseNodeSelected="#{treeManager.adviseNodeSelected}" iconCollapsed="/img/shell/tree_icon_plus.png" iconExpanded="/img/shell/tree_icon_minus.png"> - <rich:treeNodesAdaptor nodes="#{shelfManager.getShelfs()}" var="shelf"> + <rich:treeNodesAdaptor nodes="#{shelfManager.getShelves()}" var="shelf"> <rich:treeNode reRender="mainArea" selectedClass="tree-selected-node"> <f:facet name="icon"> <h:graphicImage style="border: none" value="/img/shell/tree_icon_shelf.png"> @@ -213,7 +213,7 @@ </rich:tree>]]></programlisting> <para> - The illustration below shows how the Shelves—Albums heirarchy is rendered on the page. + The illustration below shows how the Shelves—Albums hierarchy is rendered on the page. </para> <figure> @@ -245,7 +245,7 @@ Note: </title> <para> - Due to "Shelves—Albums—Photos" paradigm we can say that photos could be moved between albums, albums could be moved between shelves. + Due to "Shelves—Albums—Photos" hierarchy we can say that photos could be moved between albums, albums could be moved between shelves. To avoid a mishmash, it's not allowed to place photos directly in shelves as well as nesting shelves inside shelves or albums inside albums. </para> </note> @@ -267,7 +267,7 @@ To provide drop functionality for the marked albums we should mark shelves as drop zones in the application code too. For this purpose we add the <emphasis role="bold"><property>rich:dropSupport</property></emphasis> component to the "shelf" node: </para> - <programlisting role="XML"><![CDATA[<rich:treeNodesAdaptor nodes="#{shelfManager.getShelfs()}" var="shelf"> + <programlisting role="XML"><![CDATA[<rich:treeNodesAdaptor nodes="#{shelfManager.getShelves()}" var="shelf"> <rich:treeNode <rich:dropSupport id="shelfDND" acceptedTypes="album" @@ -283,7 +283,7 @@ The <emphasis><property>"acceptedType"</property></emphasis> attribute tells the "shelf" node what types of dragged zones (albums in this case) it can accept. The value for the <emphasis><property>"acceptedType"</property></emphasis> attribute corresponds the album <emphasis><property>"dragType"</property></emphasis> attribute. The method binding that will process drag-and-drop operation should be pointed via <emphasis><property>"dropListener"</property></emphasis> attribute of the <emphasis role="bold"><property>rich:tree</property></emphasis>. - This method is shown in th e listing below: + This method is shown in the listing below: </para> <programlisting role="JAVA"><![CDATA[... public void processDrop(DropEvent dropEvent) { @@ -323,7 +323,7 @@ <section> <title>Upload images</title> - <para>The implementation of <emphasis role="bold"><property><rich:fileUpload></property></emphasis> in the Phot Album Demo uses the embedded Flash module that adds extra functionality to the component. + <para>The implementation of <emphasis role="bold"><property><rich:fileUpload></property></emphasis> in the Photo Album Demo uses the embedded Flash module that adds extra functionality to the component. Here are the additional features that the Flash module provides: </para> <itemizedlist> @@ -333,7 +333,7 @@ </itemizedlist> <para> - The photos uploading functionality is realized on the <code>/includes/fileUpload/fileUploader.xhtml page</code>. Let's have a look at this page to find out how the uploader is imlemented: + The photos uploading functionality is based on the <code>/includes/fileUpload/fileUploader.xhtml page</code>. Let's have a look at this page to find out how the uploader is implemented: </para> <programlisting role="XML"><![CDATA[<rich:fileUpload style="margin : 0px 0px 20px 0px; width : 504px; height : 200px; background : #f1f1f1; border : 1px solid #A1A1A1" @@ -402,7 +402,7 @@ Then the uploader creates an <code>Image</code> object and extracts all image metadata such as Camera name, Image size etc. Then it sets an album and generates a new path to it. The system should save six different sizes of the photo. - After the photo was added into the data base the system removes a temporary file created for storage. + After the photo was added into the database the system removes a temporary file created for storage. </para> @@ -562,7 +562,7 @@ ...]]></programlisting> <para> - The described above implements a modal panel with photos that change each other in order they store in an album. + The described above example implements a modal panel with photos that change each other in order they store in an album. </para> <figure> <title>Slide show</title> Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-04-22 18:32:25 UTC (rev 13778) +++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-04-22 18:44:47 UTC (rev 13779) @@ -233,7 +233,7 @@ stacking context the <emphasis role="bold"> <property><rich:modalPanel></property> </emphasis> nested into such element may be overlapped with another - elements, which appear later in HTML heirarchy and assimilated with + elements, which appear later in HTML hierarchy and assimilated with basic stacking context (HTML <body>). To make the panel rendered in closest to the observer layer and avoid such overlapping, the component was designed in way when it is always being Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-04-22 18:32:25 UTC (rev 13778) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-04-22 18:44:47 UTC (rev 13779) @@ -1556,7 +1556,7 @@ with several CSS files variants, each of which contains the same values repeated numerous times. </para> <para> These problems can be solved with the <property>skinnability</property> system - built into the RichFaces project and realized fully in RichFaces. Every named skin + built into the RichFaces project and implemented fully in RichFaces. Every named skin has some skin-parameters for the definition of a palette and the other parameters of the user interface. By changing just a few parameters, you can alter the appearance of dozens of components in an application in a synchronized fashion without messing

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13778 - trunk/examples/photoalbum/web/src/main/webapp.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-04-22 14:32:25 -0400 (Wed, 22 Apr 2009) New Revision: 13778 Modified: trunk/examples/photoalbum/web/src/main/webapp/index.xhtml Log: https://jira.jboss.org/jira/browse/RF-6833 Modified: trunk/examples/photoalbum/web/src/main/webapp/index.xhtml =================================================================== (Binary files differ)

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13777 - trunk/examples/photoalbum/web/src/main/webapp/stylesheet.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-04-22 14:32:11 -0400 (Wed, 22 Apr 2009) New Revision: 13777 Modified: trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css Log: https://jira.jboss.org/jira/browse/RF-6833 Modified: trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css 2009-04-22 18:31:55 UTC (rev 13776) +++ trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css 2009-04-22 18:32:11 UTC (rev 13777) @@ -352,7 +352,7 @@ -.preview_box_photo_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_photo_80 {width : 100px; position : relative; float : left; /*margin : 0px 10px 10px 0px;*/} .preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;} .preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_80 table img{margin: 0px 0px 0px 0px;} @@ -392,18 +392,13 @@ } .image-scroller { - position: relative; - left: 0px; - top: 0px; -} +/* position: relative; + top: 0; + left: 0; + width: 100%;*/ + clear: both; +} -.image-scroller table { - position: absolute; - left: 0px; - top: 0px; - width: 100%; -} - .image-scroller, .image-scroller * { border-style: none; background-color: transparent;

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13776 - trunk/examples/photoalbum/web/src/main/webapp/layout.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-04-22 14:31:55 -0400 (Wed, 22 Apr 2009) New Revision: 13776 Modified: trunk/examples/photoalbum/web/src/main/webapp/layout/template.xhtml Log: https://jira.jboss.org/jira/browse/RF-6833 Modified: trunk/examples/photoalbum/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ)

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13775 - trunk/examples/photoalbum/web/src/main/webapp/includes/image.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-04-22 14:31:35 -0400 (Wed, 22 Apr 2009) New Revision: 13775 Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageScroller.xhtml Log: https://jira.jboss.org/jira/browse/RF-6833 Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageScroller.xhtml =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-22 16:51:47 UTC (rev 13774) +++ trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-22 18:31:35 UTC (rev 13775) @@ -5,7 +5,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <h:panelGroup layout="block" id="imagesTable" - style="margin: 30px 0px 40px 30px; float: left; position: relative; left: -2px;"> + style="margin: 30px 0px 40px 30px; float: left; position: relative; zoom: 1; left: -2px;"> <a4j:repeat value="#{model.selectedAlbum.images}" rows="5" var="img" id="repeat" rowKeyVar="rk"> @@ -14,17 +14,17 @@ <h:panelGroup layout="block" styleClass="preview_box_photo_80"> <h:graphicImage styleClass="pr_photo_bg" value="/img/shell/frame_photo_80.png" /> - <h:panelGrid cellpadding="0"> - <h:panelGroup> + <h:panelGrid cellpadding="0" cellspacing="2"> + <h:panelGroup layout="block"> <a4j:mediaOutput element="img" createContent="#{imageLoader.paintImage}" value="#{fileManager.transformPath(img.fullPath, '_small80')}"> </a4j:mediaOutput> - <br /> + <br/> </h:panelGroup> </h:panelGrid> - <h:panelGroup layout="block" styleClass="photo_name">#{img.name}</h:panelGroup> - <h:panelGroup layout="block" styleClass="photo_data">#{rk + 1}</h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_name"><h:outputText value="#{img.name}"/></h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_data"><h:outputText value="#{rk + 1}"/></h:panelGroup> </h:panelGroup> <a4j:support event="onclick"

15 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits April 2009