March 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r13331 - in trunk: samples/themes and 33 other directories.

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

Author: alexsmirnov Date: 2009-03-31 19:54:56 -0400 (Tue, 31 Mar 2009) New Revision: 13331 Added: trunk/samples/themes/ trunk/samples/themes/pom.xml trunk/samples/themes/src/ trunk/samples/themes/src/main/ trunk/samples/themes/src/main/config/ trunk/samples/themes/src/main/config/component/ trunk/samples/themes/src/main/config/component/cssZend.xml trunk/samples/themes/src/main/config/component/violetRays.xml trunk/samples/themes/src/main/config/faces/ trunk/samples/themes/src/main/config/faces/faces-config.xml trunk/samples/themes/src/main/java/ trunk/samples/themes/src/main/java/org/ trunk/samples/themes/src/main/java/org/richfaces/ trunk/samples/themes/src/main/java/org/richfaces/theme/ trunk/samples/themes/src/main/java/org/richfaces/theme/App.java trunk/samples/themes/src/main/resources/ trunk/samples/themes/src/main/resources/META-INF/ trunk/samples/themes/src/main/resources/META-INF/themes/ trunk/samples/themes/src/main/resources/META-INF/themes/csszend.theme.properties trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties trunk/samples/themes/src/main/resources/org/ trunk/samples/themes/src/main/resources/org/richfaces/ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img01.jpg trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img02.jpg trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img03.jpg trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img04.jpg trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img05.gif trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img06.jpg trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/spacer.gif trunk/samples/themes/src/main/templates/ trunk/samples/themes/src/main/templates/org/ trunk/samples/themes/src/main/templates/org/richfaces/ trunk/samples/themes/src/main/templates/org/richfaces/cssZendPage.jspx trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx trunk/samples/themes/src/test/ trunk/samples/themes/src/test/java/ trunk/samples/themes/src/test/java/org/ trunk/samples/themes/src/test/java/org/richfaces/ trunk/samples/themes/src/test/java/org/richfaces/theme/ trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java Removed: trunk/ui/layout/src/main/config/faces/faces-config.xml trunk/ui/layout/src/main/resources/META-INF/themes/csszend.theme.properties trunk/ui/layout/src/main/resources/META-INF/themes/violetRays.theme.properties trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/images/violet/ trunk/ui/layout/src/main/templates/org/richfaces/cssZendPage.jspx trunk/ui/layout/src/main/templates/org/richfaces/violetRays.jspx Modified: trunk/samples/pom.xml trunk/ui/layout/src/main/config/component/page.xml Log: move themes to the separate project Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/samples/pom.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -497,5 +497,6 @@ <module>glassX</module> <module>darkX</module> <module>richfaces-demo</module> + <module>themes</module> </modules> -</project> +</project> \ No newline at end of file Added: trunk/samples/themes/pom.xml =================================================================== --- trunk/samples/themes/pom.xml (rev 0) +++ trunk/samples/themes/pom.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.1-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>themes</artifactId> + <version>3.3.1-SNAPSHOT</version> + <name>themes</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.3.1-SNAPSHOT</version> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>layout</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Property changes on: trunk/samples/themes/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/config/component/cssZend.xml =================================================================== --- trunk/samples/themes/src/main/config/component/cssZend.xml (rev 0) +++ trunk/samples/themes/src/main/config/component/cssZend.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> + +<components> + <renderer generate="true" override="true"> + <name>org.richfaces.CssZendPageRenderer</name> + <template>org/richfaces/cssZendPage.jspx</template> + </renderer> +</components> \ No newline at end of file Property changes on: trunk/samples/themes/src/main/config/component/cssZend.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/config/component/violetRays.xml =================================================================== --- trunk/samples/themes/src/main/config/component/violetRays.xml (rev 0) +++ trunk/samples/themes/src/main/config/component/violetRays.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> + +<components> + <renderer generate="true" override="true"> + <name>org.richfaces.VioletRaysRenderer</name> + <template>org/richfaces/violetRays.jspx</template> + </renderer> +</components> \ No newline at end of file Property changes on: trunk/samples/themes/src/main/config/component/violetRays.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/config/faces/faces-config.xml =================================================================== --- trunk/samples/themes/src/main/config/faces/faces-config.xml (rev 0) +++ trunk/samples/themes/src/main/config/faces/faces-config.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> + <render-kit> + <renderer> + <component-family>org.richfaces.Page</component-family> + <renderer-type>org.richfaces.CssZendPageRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.CssZendRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.Page</component-family> + <renderer-type>org.richfaces.VioletRaysRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.VioletRaysRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config> \ No newline at end of file Property changes on: trunk/samples/themes/src/main/config/faces/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/java/org/richfaces/theme/App.java =================================================================== --- trunk/samples/themes/src/main/java/org/richfaces/theme/App.java (rev 0) +++ trunk/samples/themes/src/main/java/org/richfaces/theme/App.java 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,13 @@ +package org.richfaces.theme; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/App.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/resources/META-INF/themes/csszend.theme.properties =================================================================== --- trunk/samples/themes/src/main/resources/META-INF/themes/csszend.theme.properties (rev 0) +++ trunk/samples/themes/src/main/resources/META-INF/themes/csszend.theme.properties 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,2 @@ +rendererType=org.richfaces.CssZendPageRenderer +styleSheet=resource:///org/richfaces/renderkit/html/css/zengarden.css Property changes on: trunk/samples/themes/src/main/resources/META-INF/themes/csszend.theme.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties =================================================================== --- trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties (rev 0) +++ trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,2 @@ +rendererType=org.richfaces.VioletRaysRenderer +styleSheet=resource:///org/richfaces/renderkit/html/css/violetRays.xcss Property changes on: trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss (from rev 13320, trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss) =================================================================== --- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss (rev 0) +++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<f:template xmlns:f='http:/jsf.exadel.com/template' + xmlns:u='http:/jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml"> + + <f:verbatim> + <![CDATA[ +body { + margin: 0; + background: #7A287A none repeat left top; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size: 13px; + color: #C752C7; +} + +h1, h2, h3 { + margin: 0; + font-family: Georgia, "Times New Roman", Times, serif; + font-weight: normal; + color: #649632; +} + +h1 { font-size: 44px; } + +h2 { font-size: 20px; } + +h3 { } + +p, ul, ol { + margin-top: 0; + line-height: 240%; + text-align: justify; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size: 11px; +} + +ul, ol { } + +blockquote { } + +a { color: #FFFFFF; } + +a:hover { text-decoration: none; } + +a img { + border: none; +} + +img.left { + float: left; + margin: 7px 30px 0 0; +} + +img.right { + float: right; + margin: 7px 0 0 30px; +} + +hr { display: none; } + +.list1 { +} + +.list1 li { + float: left; + line-height: normal; +} + +.list1 li img { + margin: 0 30px 30px 0; +} + +.list1 li.alt img { + margin-right: 0; +} + +#wrapper { + background: none repeat-x left top; + padding-top: 30px; +} + +/* Header */ + +#header-wrapper { +} + +#header { + width: 913px; + height: 71px; + margin: 0 auto; + + padding-top:10px; + text-align:center; + background: none no-repeat left top; +} + +/* Search */ + +#search { + float: right; + width: 305px; + height: 76px; +} + +#search form { + float: right; + margin: 0; + padding: 35px 20px 0 0; +} + +#search fieldset { + margin: 0; + padding: 0; + border: none; +} + +#search input { + float: left; + font: 12px Georgia, "Times New Roman", Times, serif; + border: none; +} + +#search-text { + width: 135px; + height: 18px; + padding: 3px 0 0 5px; + background: #ECF9E4; + color: #658453; +} + +#search-submit { + height: 21px; + margin-left: 12px; + color: #39561D; +} + +/* Page */ + +#page { + width: 913px; + margin: 0 auto; + padding: 30px 0px 0px 0px; + background: #180818; +} + +/** LOGO */ + +#logo { + width: 913px; + height: 200px; + margin: 0 auto; + background: #180818; +} + +#logo h1, #logo p { + margin: 0; + padding: 0 0 0 20px; + line-height: normal; +} + +#logo h1 { + padding-top: 70px; +} + +#logo h1 a { + text-decoration: none; + text-transform: lowercase; + color: #FFFFFF; +} + +#logo h1 a:hover { text-decoration: underline; } + +#logo h2 { + padding: 0; + margin: 0; +} + +#logo p { + padding: 0px 0 0 20px; + font: italic 13px Georgia, "Times New Roman", Times, serif; + color: #FFFFFF; +} + +#logo p a { + text-decoration: none; + color: #FFFFFF; +} + +#logo p a:hover { text-decoration: underline; } + +/* Content */ + +#content { + float: right; + width: 600px; +} + +/* Post */ + +.post { + margin-bottom: 25px; +} + +.post .title { + height: 30px; + margin-bottom: 3px; + padding: 8px 0px 2px 20px; + background: #230C23; + color: #FFFFFF; +} + +.post .date { + float: right; + margin-top: 0; + padding-right: 20px; + font-family: Georgia, "Times New Roman", Times, serif; + font-weight: normal; + font-size: 18px; + color: #DB44DB; +} + +.post .meta { + margin: 0 0 3px 25px; + padding: 2px 30px 2px 0px; + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; + font-size: 10px; + color: #B6ACA2; +} + +.post .meta a { color: #B6ACA2; } + +.post .entry { + padding: 25px 20px 0px 20px; +} + +.post .links { + margin: 0 250px 0 0; + padding: 0 0 0 0px; +} + +.post .links .comments { +} + +.post .links .permalink { + padding-left: 17px; +} + +/* Sidebar */ + +#sidebar { + float: left; + width: 280px; +} + +#sidebar ul { + margin: 0; + padding: 0; + list-style: none; + line-height: normal; +} + +#sidebar li { + margin-bottom: 30px; + padding: 0 0 20px 0px; +} + +#sidebar li ul { + line-height: 200%; +} + +#sidebar li li { + margin: 0; + padding: 0 20px; +} + +#sidebar p { + margin: 0; + padding: 0 20px; +} + +#sidebar h2 { + height: 30px; + margin-bottom: 3px; + padding: 8px 0px 2px 20px; + background: #230C23; + font-size: 20px; + color: #FFFFFF; +} + + +#sidebar p { + line-height: 200%; +} + +/* Calendar */ + +#calendar { +} + +#calendar caption { + padding-bottom: 5px; + font-weight: bold; +} + +#calendar table { + width: 90%; + border-collapse: collapse; + margin: 0 20px; +} + +#calendar thead th { + padding: 5px 0; + text-align: center; +} + +#calendar tbody td { + padding: 5px 0; + text-align: center; +} + +#calendar tfoot td { + padding: 5px; +} + +#calendar tfoot #next { + text-align: right; +} + +#calendar #today { +} + +/* Footer */ + +#footer { + width: 913px; + margin: 0 auto; + padding: 0; + text-align:center; + padding-top:20px; + background: none no-repeat left top; + height: 80px; +} + +#footer p { + margin: 0; + padding: 20px 0; + text-align: center; + line-height: normal; + color: #FFFFFF; +} + +#footer a { + color: #C752C7; +} + + ]]> + </f:verbatim> + + + + <u:selector name="body"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img02.jpg" /> + </u:style> + </u:selector> + + <u:selector name="#wrapper"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img01.jpg" /> + </u:style> + </u:selector> + <u:selector name="#header"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img03.jpg" /> + </u:style> + </u:selector> + + <u:selector name="#footer"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img04.jpg" /> + </u:style> + </u:selector> + +</f:template> \ No newline at end of file Copied: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css (from rev 13320, trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css) =================================================================== --- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css (rev 0) +++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,199 @@ +/* css Zen Garden default style v1.02 */ +/* css released under Creative Commons License - http://creativecommons.org/licenses/by-nc-sa/1.0/ */ + +/* This file based on 'Tranquille' by Dave Shea */ +/* You may use this file as a foundation for any new work, but you may find it easier to start from scratch. */ +/* Not all elements are defined in this file, so you'll most likely want to refer to the xhtml as well. */ + +/* Your images should be linked as if the CSS file sits in the same folder as the images. ie. no paths. */ + + +/* basic elements */ +html { + margin: 0; + padding: 0; + } +body { + font: 75% georgia, sans-serif; + line-height: 1.88889; + color: #555753; + background: #fff url(blossoms.jpg) no-repeat bottom right; + margin: 0; + padding: 0; + } +p { + margin-top: 0; + text-align: justify; + } +h3 { + font: italic normal 1.4em georgia, sans-serif; + letter-spacing: 1px; + margin-bottom: 0; + color: #7D775C; + } +a:link { + font-weight: bold; + text-decoration: none; + color: #B7A5DF; + } +a:visited { + font-weight: bold; + text-decoration: none; + color: #D4CDDC; + } +a:hover, a:active { + text-decoration: underline; + color: #9685BA; + } +acronym { + border-bottom: none; + } + + +/* specific divs */ +#container { + background: url(zen-bg.jpg) no-repeat top left; + padding: 0 175px 0 110px; + margin: 0; + position: relative; + } + +#intro { + min-width: 470px; + } + +/* using an image to replace text in an h1. This trick courtesy Douglas Bowman, http://www.stopdesign.com/articles/css/replace-text/ */ +#pageHeader h1 { + background: transparent url(h1.gif) no-repeat top left; + margin-top: 10px; + width: 219px; + height: 87px; + float: left; + } +#pageHeader h1 span { + display:none + } +#pageHeader h2 { + background: transparent url(h2.gif) no-repeat top left; + margin-top: 58px; + margin-bottom: 40px; + width: 200px; + height: 18px; + float: right; + } +#pageHeader h2 span { + display:none + } +#pageHeader { + padding-top: 20px; +} + +#quickSummary { + clear:both; + margin: 20px 20px 20px 10px; + width: 160px; + float: left; + } +#quickSummary p { + font: italic 10pt/22pt georgia; + text-align:center; + } + +#preamble { + clear: right; + padding: 0px 10px 0 10px; + } +#supportingText { + padding-left: 10px; + margin-bottom: 40px; + } + +#footer { + text-align: center; + } +#footer a:link, #footer a:visited { + margin-right: 20px; + } + +#linkList { + margin-left: 600px; + position: absolute; + top: 0; + right: 0; + } +#linkList2 { + font: 10px verdana, sans-serif; + background: transparent url(paper-bg.jpg) top left repeat-y; + padding: 10px; + margin-top: 150px; + width: 130px; + } +#linkList h3.select { + background: transparent url(h3.gif) no-repeat top left; + margin: 10px 0 5px 0; + width: 97px; + height: 16px; + } +#linkList h3.select span { + display:none + } +#linkList h3.favorites { + background: transparent url(h4.gif) no-repeat top left; + margin: 25px 0 5px 0; + width: 60px; + height: 18px; + } +#linkList h3.favorites span { + display:none + } +#linkList h3.archives { + background: transparent url(h5.gif) no-repeat top left; + margin: 25px 0 5px 0; + width:57px; + height: 14px; + } +#linkList h3.archives span { + display:none + } +#linkList h3.resources { + background: transparent url(h6.gif) no-repeat top left; + margin: 25px 0 5px 0; + width:63px; + height: 10px; + } +#linkList h3.resources span { + display:none + } + + +#linkList ul { + margin: 0; + padding: 0; + } +#linkList li { + line-height: 2.5ex; + background: transparent url(cr1.gif) no-repeat top center; + display: block; + padding-top: 5px; + margin-bottom: 5px; + list-style-type: none; + } +#linkList li a:link { + color: #988F5E; + } +#linkList li a:visited { + color: #B3AE94; + } + + +#extraDiv1 { + background: transparent url(cr2.gif) top left no-repeat; + position: absolute; + top: 40px; + right: 0; + width: 148px; + height: 110px; + } +.accesskey { + text-decoration: underline; + } \ No newline at end of file Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img01.jpg =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img01.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img02.jpg =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img02.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img03.jpg =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img03.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img04.jpg =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img04.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img05.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img05.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img06.jpg =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/img06.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/spacer.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/spacer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/themes/src/main/templates/org/richfaces/cssZendPage.jspx =================================================================== --- trunk/samples/themes/src/main/templates/org/richfaces/cssZendPage.jspx (rev 0) +++ trunk/samples/themes/src/main/templates/org/richfaces/cssZendPage.jspx 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:h="http://jsf.exadel.com/header" + xmlns:vcp="http://ajax4jsf.org/cdk/vcp" + class="org.richfaces.renderkit.html.CssZendRenderer" + baseclass="org.richfaces.renderkit.AbstractPageRenderer" + component="org.richfaces.component.UIPage" + > + <c:set var="namespace" value="#{this:prolog(context,component)}"/> + <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}" + > + <head> + <title>#{component.attributes['pageTitle']}</title> + <f:call name="themeStyle"/> + <f:call name="themeScript"/> + <u:insertFacet name="pageHeader"/> + </head> + <body id="css-zen-garden" x:passThruWithExclusions="value,name,type,id"> + <div id="container" class="rich-page #{component.attributes['pageClass']}" + x:style="#{component.attributes['pageStyle']}"> + <div id="intro"> + <c:if test="#{this:hasFacet(component,'header')}"> + <div id="pageHeader" class="rich-page-header #{component.attributes['headerClass']}"> + <u:insertFacet name="header"/> + </div> + </c:if> + <c:if test="#{this:hasFacet(component,'summary')}"> + <div id="quickSummary" class="rich-page-summary #{component.attributes['summaryClass']}"> + <u:insertFacet name="summary"/> + </div> + </c:if> + <c:if test="#{this:hasFacet(component,'preamble')}"> + <div id="preamble" class="rich-page-preamble #{component.attributes['preambleClass']}"> + <u:insertFacet name="preamble"/> + </div> + </c:if> + </div> + <div id="supportingText" class="rich-page-content #{component.attributes['contentClass']}"> + <vcp:body> + <div class="rich-page-body #{component.attributes['bodyClass']}"> + <f:call name="renderChildren" /> + </div> + </vcp:body> + <c:if test="#{this:hasFacet(component,'footer')}"> + <div id="footer" class="rich-page-footer #{component.attributes['footerClass']}"> + <u:insertFacet name="footer"/> + </div> + </c:if> + </div> + <c:if test="#{this:hasFacet(component,'sidebar')}"> + <div id="linkList" class="rich-page-sidebar #{component.attributes['styleClass']}"> + <div id="linkList2"> + <u:insertFacet name="sidebar"/> + </div> + </div> + </c:if> + </div> +  +<div id="extraDiv1"> +<span/> +</div> +<div id="extraDiv2"> +</div> +<div id="extraDiv3"> +</div> +<div id="extraDiv4"> +</div> +<div id="extraDiv5"> +</div> +<div id="extraDiv6"> +</div> + </body> + </html> +</f:root> \ No newline at end of file Property changes on: trunk/samples/themes/src/main/templates/org/richfaces/cssZendPage.jspx ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx =================================================================== --- trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx (rev 0) +++ trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:h="http://jsf.exadel.com/header" + xmlns:vcp="http://ajax4jsf.org/cdk/vcp" + class="org.richfaces.renderkit.html.VioletRaysRenderer" + baseclass="org.richfaces.renderkit.AbstractPageRenderer" + component="org.richfaces.component.UIPage" + > + <c:set var="namespace" value="#{this:prolog(context,component)}"/> + <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}" + > +<head> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <title>#{component.attributes['pageTitle']}</title> + <f:call name="themeStyle"/> + <f:call name="themeScript"/> + <u:insertFacet name="pageHeader"/> + +</head> +<body x:passThruWithExclusions="value,name,type,id"> +<div id="wrapper"> + +<div id="header"> + <c:if test="#{this:hasFacet(component,'header')}"> + <div id="#{clientId}:hd" class="rich-page-header #{component.attributes['headerClass']}"> + <u:insertFacet name="header"/> + </div> + </c:if> + +</div> + + + +<hr /> + + + +<div id="page"> + <div id="content"> + <vcp:body> + <div class="rich-page-body #{component.attributes['bodyClass']}"> + <f:call name="renderChildren" /> + </div> + </vcp:body> + </div> + +  + <div id="sidebar"> + + <c:if test="#{this:hasFacet(component,'sidebar')}"> + <div class="rich-page-sidebar #{component.attributes['styleClass']}"> + <u:insertFacet name="sidebar"/> + </div> + </c:if> + </div> +  + <div style="clear: both;"></div> + </div> + +</div> + <div id="footer"> + <c:if test="#{this:hasFacet(component,'footer')}"> + <f:clientid var="clientId"/> + <div id="#{clientId}:ft" class="rich-page-footer #{component.attributes['footerClass']}"> + <u:insertFacet name="footer"/> + </div> + </c:if> + + </div> + +</body> +</html> +</f:root> \ No newline at end of file Property changes on: trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java =================================================================== --- trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java (rev 0) +++ trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java 2009-03-31 23:54:56 UTC (rev 13331) @@ -0,0 +1,38 @@ +package org.richfaces.theme; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Property changes on: trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/layout/src/main/config/component/page.xml =================================================================== --- trunk/ui/layout/src/main/config/component/page.xml 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/config/component/page.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -146,12 +146,4 @@ </property> --> </component> - <renderer generate="true" override="true"> - <name>org.richfaces.CssZendPageRenderer</name> - <template>org/richfaces/cssZendPage.jspx</template> - </renderer> - <renderer generate="true" override="true"> - <name>org.richfaces.VioletRaysRenderer</name> - <template>org/richfaces/violetRays.jspx</template> - </renderer> </components> Deleted: trunk/ui/layout/src/main/config/faces/faces-config.xml =================================================================== --- trunk/ui/layout/src/main/config/faces/faces-config.xml 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/config/faces/faces-config.xml 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" - version="1.2"> - <render-kit> - <renderer> - <component-family>org.richfaces.Page</component-family> - <renderer-type>org.richfaces.CssZendPageRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.CssZendRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.Page</component-family> - <renderer-type>org.richfaces.VioletRaysRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.VioletRaysRenderer</renderer-class> - </renderer> - </render-kit> -</faces-config> \ No newline at end of file Deleted: trunk/ui/layout/src/main/resources/META-INF/themes/csszend.theme.properties =================================================================== --- trunk/ui/layout/src/main/resources/META-INF/themes/csszend.theme.properties 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/resources/META-INF/themes/csszend.theme.properties 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,2 +0,0 @@ -rendererType=org.richfaces.CssZendPageRenderer -styleSheet=resource:///org/richfaces/renderkit/html/css/zengarden.css Deleted: trunk/ui/layout/src/main/resources/META-INF/themes/violetRays.theme.properties =================================================================== --- trunk/ui/layout/src/main/resources/META-INF/themes/violetRays.theme.properties 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/resources/META-INF/themes/violetRays.theme.properties 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,2 +0,0 @@ -rendererType=org.richfaces.VioletRaysRenderer -styleSheet=resource:///org/richfaces/renderkit/html/css/violetRays.xcss Deleted: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss =================================================================== --- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,386 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:verbatim> - <![CDATA[ -body { - margin: 0; - background: #7A287A none repeat left top; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 13px; - color: #C752C7; -} - -h1, h2, h3 { - margin: 0; - font-family: Georgia, "Times New Roman", Times, serif; - font-weight: normal; - color: #649632; -} - -h1 { font-size: 44px; } - -h2 { font-size: 20px; } - -h3 { } - -p, ul, ol { - margin-top: 0; - line-height: 240%; - text-align: justify; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 11px; -} - -ul, ol { } - -blockquote { } - -a { color: #FFFFFF; } - -a:hover { text-decoration: none; } - -a img { - border: none; -} - -img.left { - float: left; - margin: 7px 30px 0 0; -} - -img.right { - float: right; - margin: 7px 0 0 30px; -} - -hr { display: none; } - -.list1 { -} - -.list1 li { - float: left; - line-height: normal; -} - -.list1 li img { - margin: 0 30px 30px 0; -} - -.list1 li.alt img { - margin-right: 0; -} - -#wrapper { - background: none repeat-x left top; - padding-top: 30px; -} - -/* Header */ - -#header-wrapper { -} - -#header { - width: 913px; - height: 71px; - margin: 0 auto; - - padding-top:10px; - text-align:center; - background: none no-repeat left top; -} - -/* Search */ - -#search { - float: right; - width: 305px; - height: 76px; -} - -#search form { - float: right; - margin: 0; - padding: 35px 20px 0 0; -} - -#search fieldset { - margin: 0; - padding: 0; - border: none; -} - -#search input { - float: left; - font: 12px Georgia, "Times New Roman", Times, serif; - border: none; -} - -#search-text { - width: 135px; - height: 18px; - padding: 3px 0 0 5px; - background: #ECF9E4; - color: #658453; -} - -#search-submit { - height: 21px; - margin-left: 12px; - color: #39561D; -} - -/* Page */ - -#page { - width: 913px; - margin: 0 auto; - padding: 30px 0px 0px 0px; - background: #180818; -} - -/** LOGO */ - -#logo { - width: 913px; - height: 200px; - margin: 0 auto; - background: #180818; -} - -#logo h1, #logo p { - margin: 0; - padding: 0 0 0 20px; - line-height: normal; -} - -#logo h1 { - padding-top: 70px; -} - -#logo h1 a { - text-decoration: none; - text-transform: lowercase; - color: #FFFFFF; -} - -#logo h1 a:hover { text-decoration: underline; } - -#logo h2 { - padding: 0; - margin: 0; -} - -#logo p { - padding: 0px 0 0 20px; - font: italic 13px Georgia, "Times New Roman", Times, serif; - color: #FFFFFF; -} - -#logo p a { - text-decoration: none; - color: #FFFFFF; -} - -#logo p a:hover { text-decoration: underline; } - -/* Content */ - -#content { - float: right; - width: 600px; -} - -/* Post */ - -.post { - margin-bottom: 25px; -} - -.post .title { - height: 30px; - margin-bottom: 3px; - padding: 8px 0px 2px 20px; - background: #230C23; - color: #FFFFFF; -} - -.post .date { - float: right; - margin-top: 0; - padding-right: 20px; - font-family: Georgia, "Times New Roman", Times, serif; - font-weight: normal; - font-size: 18px; - color: #DB44DB; -} - -.post .meta { - margin: 0 0 3px 25px; - padding: 2px 30px 2px 0px; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - font-size: 10px; - color: #B6ACA2; -} - -.post .meta a { color: #B6ACA2; } - -.post .entry { - padding: 25px 20px 0px 20px; -} - -.post .links { - margin: 0 250px 0 0; - padding: 0 0 0 0px; -} - -.post .links .comments { -} - -.post .links .permalink { - padding-left: 17px; -} - -/* Sidebar */ - -#sidebar { - float: left; - width: 280px; -} - -#sidebar ul { - margin: 0; - padding: 0; - list-style: none; - line-height: normal; -} - -#sidebar li { - margin-bottom: 30px; - padding: 0 0 20px 0px; -} - -#sidebar li ul { - line-height: 200%; -} - -#sidebar li li { - margin: 0; - padding: 0 20px; -} - -#sidebar p { - margin: 0; - padding: 0 20px; -} - -#sidebar h2 { - height: 30px; - margin-bottom: 3px; - padding: 8px 0px 2px 20px; - background: #230C23; - font-size: 20px; - color: #FFFFFF; -} - - -#sidebar p { - line-height: 200%; -} - -/* Calendar */ - -#calendar { -} - -#calendar caption { - padding-bottom: 5px; - font-weight: bold; -} - -#calendar table { - width: 90%; - border-collapse: collapse; - margin: 0 20px; -} - -#calendar thead th { - padding: 5px 0; - text-align: center; -} - -#calendar tbody td { - padding: 5px 0; - text-align: center; -} - -#calendar tfoot td { - padding: 5px; -} - -#calendar tfoot #next { - text-align: right; -} - -#calendar #today { -} - -/* Footer */ - -#footer { - width: 913px; - margin: 0 auto; - padding: 0; - text-align:center; - padding-top:20px; - background: none no-repeat left top; - height: 80px; -} - -#footer p { - margin: 0; - padding: 20px 0; - text-align: center; - line-height: normal; - color: #FFFFFF; -} - -#footer a { - color: #C752C7; -} - - ]]> - </f:verbatim> - - - - <u:selector name="body"> - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img02.jpg" /> - </u:style> - </u:selector> - - <u:selector name="#wrapper"> - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img01.jpg" /> - </u:style> - </u:selector> - <u:selector name="#header"> - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img03.jpg" /> - </u:style> - </u:selector> - - <u:selector name="#footer"> - <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/images/violet/img04.jpg" /> - </u:style> - </u:selector> - -</f:template> \ No newline at end of file Deleted: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css =================================================================== --- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,199 +0,0 @@ -/* css Zen Garden default style v1.02 */ -/* css released under Creative Commons License - http://creativecommons.org/licenses/by-nc-sa/1.0/ */ - -/* This file based on 'Tranquille' by Dave Shea */ -/* You may use this file as a foundation for any new work, but you may find it easier to start from scratch. */ -/* Not all elements are defined in this file, so you'll most likely want to refer to the xhtml as well. */ - -/* Your images should be linked as if the CSS file sits in the same folder as the images. ie. no paths. */ - - -/* basic elements */ -html { - margin: 0; - padding: 0; - } -body { - font: 75% georgia, sans-serif; - line-height: 1.88889; - color: #555753; - background: #fff url(blossoms.jpg) no-repeat bottom right; - margin: 0; - padding: 0; - } -p { - margin-top: 0; - text-align: justify; - } -h3 { - font: italic normal 1.4em georgia, sans-serif; - letter-spacing: 1px; - margin-bottom: 0; - color: #7D775C; - } -a:link { - font-weight: bold; - text-decoration: none; - color: #B7A5DF; - } -a:visited { - font-weight: bold; - text-decoration: none; - color: #D4CDDC; - } -a:hover, a:active { - text-decoration: underline; - color: #9685BA; - } -acronym { - border-bottom: none; - } - - -/* specific divs */ -#container { - background: url(zen-bg.jpg) no-repeat top left; - padding: 0 175px 0 110px; - margin: 0; - position: relative; - } - -#intro { - min-width: 470px; - } - -/* using an image to replace text in an h1. This trick courtesy Douglas Bowman, http://www.stopdesign.com/articles/css/replace-text/ */ -#pageHeader h1 { - background: transparent url(h1.gif) no-repeat top left; - margin-top: 10px; - width: 219px; - height: 87px; - float: left; - } -#pageHeader h1 span { - display:none - } -#pageHeader h2 { - background: transparent url(h2.gif) no-repeat top left; - margin-top: 58px; - margin-bottom: 40px; - width: 200px; - height: 18px; - float: right; - } -#pageHeader h2 span { - display:none - } -#pageHeader { - padding-top: 20px; -} - -#quickSummary { - clear:both; - margin: 20px 20px 20px 10px; - width: 160px; - float: left; - } -#quickSummary p { - font: italic 10pt/22pt georgia; - text-align:center; - } - -#preamble { - clear: right; - padding: 0px 10px 0 10px; - } -#supportingText { - padding-left: 10px; - margin-bottom: 40px; - } - -#footer { - text-align: center; - } -#footer a:link, #footer a:visited { - margin-right: 20px; - } - -#linkList { - margin-left: 600px; - position: absolute; - top: 0; - right: 0; - } -#linkList2 { - font: 10px verdana, sans-serif; - background: transparent url(paper-bg.jpg) top left repeat-y; - padding: 10px; - margin-top: 150px; - width: 130px; - } -#linkList h3.select { - background: transparent url(h3.gif) no-repeat top left; - margin: 10px 0 5px 0; - width: 97px; - height: 16px; - } -#linkList h3.select span { - display:none - } -#linkList h3.favorites { - background: transparent url(h4.gif) no-repeat top left; - margin: 25px 0 5px 0; - width: 60px; - height: 18px; - } -#linkList h3.favorites span { - display:none - } -#linkList h3.archives { - background: transparent url(h5.gif) no-repeat top left; - margin: 25px 0 5px 0; - width:57px; - height: 14px; - } -#linkList h3.archives span { - display:none - } -#linkList h3.resources { - background: transparent url(h6.gif) no-repeat top left; - margin: 25px 0 5px 0; - width:63px; - height: 10px; - } -#linkList h3.resources span { - display:none - } - - -#linkList ul { - margin: 0; - padding: 0; - } -#linkList li { - line-height: 2.5ex; - background: transparent url(cr1.gif) no-repeat top center; - display: block; - padding-top: 5px; - margin-bottom: 5px; - list-style-type: none; - } -#linkList li a:link { - color: #988F5E; - } -#linkList li a:visited { - color: #B3AE94; - } - - -#extraDiv1 { - background: transparent url(cr2.gif) top left no-repeat; - position: absolute; - top: 40px; - right: 0; - width: 148px; - height: 110px; - } -.accesskey { - text-decoration: underline; - } \ No newline at end of file Deleted: trunk/ui/layout/src/main/templates/org/richfaces/cssZendPage.jspx =================================================================== --- trunk/ui/layout/src/main/templates/org/richfaces/cssZendPage.jspx 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/templates/org/richfaces/cssZendPage.jspx 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" - xmlns:h="http://jsf.exadel.com/header" - xmlns:vcp="http://ajax4jsf.org/cdk/vcp" - class="org.richfaces.renderkit.html.CssZendRenderer" - baseclass="org.richfaces.renderkit.AbstractPageRenderer" - component="org.richfaces.component.UIPage" - > - <c:set var="namespace" value="#{this:prolog(context,component)}"/> - <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}" - > - <head> - <title>#{component.attributes['pageTitle']}</title> - <f:call name="themeStyle"/> - <f:call name="themeScript"/> - <u:insertFacet name="pageHeader"/> - </head> - <body id="css-zen-garden" x:passThruWithExclusions="value,name,type,id"> - <div id="container" class="rich-page #{component.attributes['pageClass']}" - x:style="#{component.attributes['pageStyle']}"> - <div id="intro"> - <c:if test="#{this:hasFacet(component,'header')}"> - <div id="pageHeader" class="rich-page-header #{component.attributes['headerClass']}"> - <u:insertFacet name="header"/> - </div> - </c:if> - <c:if test="#{this:hasFacet(component,'summary')}"> - <div id="quickSummary" class="rich-page-summary #{component.attributes['summaryClass']}"> - <u:insertFacet name="summary"/> - </div> - </c:if> - <c:if test="#{this:hasFacet(component,'preamble')}"> - <div id="preamble" class="rich-page-preamble #{component.attributes['preambleClass']}"> - <u:insertFacet name="preamble"/> - </div> - </c:if> - </div> - <div id="supportingText" class="rich-page-content #{component.attributes['contentClass']}"> - <vcp:body> - <div class="rich-page-body #{component.attributes['bodyClass']}"> - <f:call name="renderChildren" /> - </div> - </vcp:body> - <c:if test="#{this:hasFacet(component,'footer')}"> - <div id="footer" class="rich-page-footer #{component.attributes['footerClass']}"> - <u:insertFacet name="footer"/> - </div> - </c:if> - </div> - <c:if test="#{this:hasFacet(component,'sidebar')}"> - <div id="linkList" class="rich-page-sidebar #{component.attributes['styleClass']}"> - <div id="linkList2"> - <u:insertFacet name="sidebar"/> - </div> - </div> - </c:if> - </div> -  -<div id="extraDiv1"> -<span/> -</div> -<div id="extraDiv2"> -</div> -<div id="extraDiv3"> -</div> -<div id="extraDiv4"> -</div> -<div id="extraDiv5"> -</div> -<div id="extraDiv6"> -</div> - </body> - </html> -</f:root> \ No newline at end of file Deleted: trunk/ui/layout/src/main/templates/org/richfaces/violetRays.jspx =================================================================== --- trunk/ui/layout/src/main/templates/org/richfaces/violetRays.jspx 2009-03-31 22:56:39 UTC (rev 13330) +++ trunk/ui/layout/src/main/templates/org/richfaces/violetRays.jspx 2009-03-31 23:54:56 UTC (rev 13331) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" - xmlns:h="http://jsf.exadel.com/header" - xmlns:vcp="http://ajax4jsf.org/cdk/vcp" - class="org.richfaces.renderkit.html.VioletRaysRenderer" - baseclass="org.richfaces.renderkit.AbstractPageRenderer" - component="org.richfaces.component.UIPage" - > - <c:set var="namespace" value="#{this:prolog(context,component)}"/> - <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}" - > -<head> -<meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>#{component.attributes['pageTitle']}</title> - <f:call name="themeStyle"/> - <f:call name="themeScript"/> - <u:insertFacet name="pageHeader"/> - -</head> -<body x:passThruWithExclusions="value,name,type,id"> -<div id="wrapper"> - -<div id="header"> - <c:if test="#{this:hasFacet(component,'header')}"> - <div id="#{clientId}:hd" class="rich-page-header #{component.attributes['headerClass']}"> - <u:insertFacet name="header"/> - </div> - </c:if> - -</div> - - - -<hr /> - - - -<div id="page"> - <div id="content"> - <vcp:body> - <div class="rich-page-body #{component.attributes['bodyClass']}"> - <f:call name="renderChildren" /> - </div> - </vcp:body> - </div> - -  - <div id="sidebar"> - - <c:if test="#{this:hasFacet(component,'sidebar')}"> - <div class="rich-page-sidebar #{component.attributes['styleClass']}"> - <u:insertFacet name="sidebar"/> - </div> - </c:if> - </div> -  - <div style="clear: both;"></div> - </div> - -</div> - <div id="footer"> - <c:if test="#{this:hasFacet(component,'footer')}"> - <f:clientid var="clientId"/> - <div id="#{clientId}:ft" class="rich-page-footer #{component.attributes['footerClass']}"> - <u:insertFacet name="footer"/> - </div> - </c:if> - - </div> - -</body> -</html> -</f:root> \ No newline at end of file

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13330 - trunk/ui/dataTable/src/main/java/org/richfaces/component.

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

Author: nbelaevski Date: 2009-03-31 18:56:39 -0400 (Tue, 31 Mar 2009) New Revision: 13330 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java Log: https://jira.jboss.org/jira/browse/RF-6155 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2009-03-31 21:03:36 UTC (rev 13329) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2009-03-31 22:56:39 UTC (rev 13330) @@ -199,9 +199,18 @@ @Override public void processDecodes(FacesContext context) { + if (context == null) { + throw new NullPointerException(); + } + + if (!isRendered()) { + return; + } + for (UIComponent component : getChildren()) { component.processDecodes(context); } + for (UIComponent component : getFacets().values()) { if (isAjaxComponent(component)) { component.processDecodes(context); @@ -212,9 +221,18 @@ @Override public void processValidators(FacesContext context) { + if (context == null) { + throw new NullPointerException(); + } + + if (!isRendered()) { + return; + } + for (UIComponent component : getChildren()) { component.processValidators(context); } + for (UIComponent component : getFacets().values()) { if (isAjaxComponent(component)) { component.processValidators(context); @@ -224,9 +242,18 @@ @Override public void processUpdates(FacesContext context) { + if (context == null) { + throw new NullPointerException(); + } + + if (!isRendered()) { + return; + } + for (UIComponent component : getChildren()) { component.processUpdates(context); } + for (UIComponent component : getFacets().values()) { if (isAjaxComponent(component)) { component.processUpdates(context);

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13329 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: nbelaevski Date: 2009-03-31 17:03:36 -0400 (Tue, 31 Mar 2009) New Revision: 13329 Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js Log: https://jira.jboss.org/jira/browse/RF-6668 Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js =================================================================== --- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2009-03-31 19:57:49 UTC (rev 13328) +++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2009-03-31 21:03:36 UTC (rev 13329) @@ -14,16 +14,6 @@ return component; }; -/* do not use plz - left for back compatibility only */ -Tree.Item.fireCollapsionEvent = function(elt) { - return Tree.Item.findComponent(elt).fireCollapsionEvent(); -}; - -Tree.Item.fireExpansionEvent = function(elt) { - return Tree.Item.findComponent(elt).fireExpansionEvent(); -}; -/* do not use end */ - Tree.Item.createItemForNode = function() { var getComponentIndex = function(node) { var idx = 0;

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13328 - in trunk/ui/tree/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.

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

Author: nbelaevski Date: 2009-03-31 15:57:49 -0400 (Tue, 31 Mar 2009) New Revision: 13328 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js Log: https://jira.jboss.org/jira/browse/RF-6552 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-03-31 19:57:15 UTC (rev 13327) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-03-31 19:57:49 UTC (rev 13328) @@ -83,12 +83,12 @@ String id = treeNode.getClientId(context); StringBuilder script = new StringBuilder(); - script.append("Tree.Item."); + script.append("var c = Tree.Item.findComponent(this); if (!c) return; c."); boolean expanded = tree.isExpanded(); if (expanded) { - script.append("fireCollapsionEvent(this);"); + script.append("fireCollapsionEvent();"); } else { - script.append("fireExpansionEvent(this);"); + script.append("fireExpansionEvent();"); } if (UITree.SWITCH_AJAX.equals(tree.getSwitchType())) { Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js =================================================================== --- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2009-03-31 19:57:15 UTC (rev 13327) +++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2009-03-31 19:57:49 UTC (rev 13328) @@ -14,6 +14,7 @@ return component; }; +/* do not use plz - left for back compatibility only */ Tree.Item.fireCollapsionEvent = function(elt) { return Tree.Item.findComponent(elt).fireCollapsionEvent(); }; @@ -21,6 +22,7 @@ Tree.Item.fireExpansionEvent = function(elt) { return Tree.Item.findComponent(elt).fireExpansionEvent(); }; +/* do not use end */ Tree.Item.createItemForNode = function() { var getComponentIndex = function(node) {

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13327 - in trunk/ui/tree/src/main: templates and 1 other directory.

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

Author: nbelaevski Date: 2009-03-31 15:57:15 -0400 (Tue, 31 Mar 2009) New Revision: 13327 Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss trunk/ui/tree/src/main/templates/htmlTreeNode.jspx Log: https://jira.jboss.org/jira/browse/RF-6668 Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss =================================================================== --- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2009-03-31 19:43:22 UTC (rev 13326) +++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2009-03-31 19:57:15 UTC (rev 13327) @@ -84,6 +84,10 @@ display: none; } +.rich-tree-node-handle { + outline-style: none; +} + ]]> </f:verbatim> Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx =================================================================== --- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2009-03-31 19:43:22 UTC (rev 13326) +++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2009-03-31 19:57:15 UTC (rev 13327) @@ -64,7 +64,7 @@ } else { ]]> </jsp:scriptlet> - <a href="#" id="#{clientId}:handle" + <a href="#" id="#{clientId}:handle" class="rich-tree-node-handle" onclick="#{this:getToggleScript(context, component, 'handle')} return false;"> <jsp:scriptlet>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13326 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

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

Author: dsvyatobatsko Date: 2009-03-31 15:43:22 -0400 (Tue, 31 Mar 2009) New Revision: 13326 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxLogTest.java Log: test case uncommented Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxLogTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxLogTest.java 2009-03-31 19:11:59 UTC (rev 13325) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxLogTest.java 2009-03-31 19:43:22 UTC (rev 13326) @@ -34,7 +34,7 @@ private final static String INIT_POPUP_MODE = "#{logBean.initPopupMode}"; - //@Test + @Test public void testLogComponentWithPopupTrue(Template template) { AutoTester tester = getAutoTester(this); tester.renderPage(template, INIT_POPUP_MODE); @@ -49,7 +49,7 @@ selenium.windowFocus(); - writeStatus("Type smth. All typing is being logged"); + //writeStatus("Type smth. All typing is being logged"); type(inputElemId, "typing"); try {

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13325 - trunk/ui/tree/src/main/java/org/richfaces/renderkit.

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

Author: nbelaevski Date: 2009-03-31 15:11:59 -0400 (Tue, 31 Mar 2009) New Revision: 13325 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java Log: NodeRendererBase generified Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-03-31 18:23:23 UTC (rev 13324) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-03-31 19:11:59 UTC (rev 13325) @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -79,7 +80,6 @@ "mainRow".equals(to) && !tree.isToggleOnClick()) return ""; - boolean showLines = tree.isShowConnectingLines(); String id = treeNode.getClientId(context); StringBuilder script = new StringBuilder(); @@ -95,9 +95,9 @@ UITreeNode nodeFacet = tree.getNodeFacet(); JSFunction function = AjaxRendererUtils.buildAjaxFunction(nodeFacet, context); - Map eventOptions = AjaxRendererUtils.buildEventOptions(context, + Map<String, Object> eventOptions = AjaxRendererUtils.buildEventOptions(context, nodeFacet); - Map parameters = (Map) eventOptions.get("parameters"); + Map<Object, Object> parameters = (Map<Object, Object>) eventOptions.get("parameters"); parameters.remove(id); parameters.put(id + NODE_EXPANDED_INPUT_SUFFIX, String.valueOf(!expanded)); @@ -255,8 +255,8 @@ protected void doDecode(FacesContext context, UIComponent component) { UITreeNode node = (UITreeNode) component; UITree tree = node.getUITree(); - TreeRowKey key = (TreeRowKey) tree.getRowKey(); - Map requestMap = context.getExternalContext().getRequestParameterMap(); + TreeRowKey<?> key = (TreeRowKey<?>) tree.getRowKey(); + Map<String, String> requestMap = context.getExternalContext().getRequestParameterMap(); String id = node.getClientId(context); TreeState componentState = (TreeState) tree.getComponentState(); @@ -311,11 +311,11 @@ return null; } - private void convertOptions(Map opts) { + private void convertOptions(Map<String, Object> opts) { //converts JSFunctionDefinition to string - Iterator iterator = opts.entrySet().iterator(); + Iterator<Entry<String, Object>> iterator = opts.entrySet().iterator(); while (iterator.hasNext()) { - Map.Entry entry = (Map.Entry) iterator.next(); + Entry<String, Object> entry = iterator.next(); Object value = entry.getValue(); if (value instanceof JSFunctionDefinition) { JSFunctionDefinition definition = (JSFunctionDefinition) value; @@ -324,7 +324,7 @@ } } - private ScriptOptions createOptions(FacesContext context, UITreeNode component, Class clazz) { + private ScriptOptions createOptions(FacesContext context, UITreeNode component, Class<?> clazz) { ScriptOptions options = new TreeNodeOptions(component); mergeScriptOptions(options, context, component, clazz); convertOptions(options.getMap());

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13324 - trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: nbelaevski Date: 2009-03-31 14:23:23 -0400 (Tue, 31 Mar 2009) New Revision: 13324 Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js Log: https://jira.jboss.org/jira/browse/RF-6469 Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-03-31 17:56:01 UTC (rev 13323) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-03-31 18:23:23 UTC (rev 13324) @@ -523,7 +523,7 @@ if (newParent != this.parent) { this._saveInputValues(element); - newParent.insertBefore(this.parent.removeChild(element), null); + newParent.insertBefore(element, null); this.domReattached = true; } else { Element.show(this.parent); @@ -770,10 +770,6 @@ if (this.domReattached) { this._saveInputValues(element); - var pNode = element.parentNode; - if (pNode) { - pNode.removeChild(element); - } this.parent.appendChild(element); this.domReattached = false;

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r13323 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directories.

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

Author: dsvyatobatsko Date: 2009-03-31 13:56:01 -0400 (Tue, 31 Mar 2009) New Revision: 13323 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/suggestionBox/suggestionBoxAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java Log: https://jira.jboss.org/jira/browse/RF-6237 completed Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/suggestionBox/suggestionBoxAutoTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-03-31 17:34:46 UTC (rev 13322) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-03-31 17:56:01 UTC (rev 13323) @@ -993,6 +993,7 @@ } /** + * Simulates keystroke events on the specified element, as though you typed the value key-by-key. * Workaround for selenium.type/selenium.typeKeys * @param locator * @param string @@ -1016,7 +1017,31 @@ } } - + + /** + * This method differs from <code>type</code> method in only that <code>type</code> erases previous typing as though you are typing over it, + * while <code>typeOn</code> doesn't (go on typing) + * @param locator an element locator + * @param string the value to type + */ + public void typeOn(String locator, String string) { + StringBuffer value = new StringBuffer(selenium.getValue(locator)); + char[] chars = string.toCharArray(); + for (int i = 0; i < chars.length; i++) { + String key = Character.toString(chars[i]); + value.append(key); + + selenium.keyDown(locator, key); + + if(!isFF()) { + selenium.type(locator, value.toString()); + } + + selenium.keyPress(locator, key); + selenium.keyUp(locator, key); + } + } + public void testOnclickEvent(String testElementId, String testElementResultId, String beforeResult, String afterResult) { writeStatus("Testing onclick event"); AssertTextEquals(testElementResultId, beforeResult); Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-03-31 17:34:46 UTC (rev 13322) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-03-31 17:56:01 UTC (rev 13323) @@ -243,16 +243,19 @@ waitForAjaxCompletion(); selenium.keyDown(inputId, "\\13");//enter AssertValueEquals(inputId, "Belarus"); + assertSelectedCapitals("Minsk"); type(inputId, "Belarus,Arm"); waitForAjaxCompletion(); selenium.keyDown(inputId, "\\13");//enter AssertValueEquals(inputId, "Belarus,Armenia"); + assertSelectedCapitals("Minsk", "Yerevan"); type(inputId, "Belarus[Rus"); waitForAjaxCompletion(); selenium.keyDown(inputId, "\\13");//enter AssertValueEquals(inputId, "Belarus[Russia"); + assertSelectedCapitals("Minsk", "Moscow"); writeStatus("@ is not supported token"); type(inputId, "Belarus@Kaz"); @@ -261,6 +264,81 @@ AssertValueEquals(inputId, "Belarus@Kaz"); } + @Test + public void testSuggestionObjectFeature(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, RESET_METHOD); + writeStatus("Check suggestion object feature works"); + String inputId = tester.getClientId("suggestion"); + typeOn(inputId, "Bel"); + waitForAjaxCompletion(); + selenium.keyDown(inputId, "\\13");//enter + assertSelectedCapitals("Minsk"); + typeOn(inputId, ",Kaz"); + waitForAjaxCompletion(); + selenium.keyDown(inputId, "\\13");//enter + assertSelectedCapitals("Minsk", "Astana"); + typeOn(inputId, ",Arm"); + waitForAjaxCompletion(); + selenium.keyDown(inputId, "\\13");//enter + assertSelectedCapitals("Minsk", "Astana", "Yerevan"); + } + + @Test + public void testCore(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, RESET_METHOD); + + writeStatus("Check component is activated by user-defined events"); + writeStatus("Check list of options is fetched from server and shown"); + writeStatus("arbitrary option can be selected"); + + String suggestInputId = tester.getClientId("suggestion"); + String suggestPopupId = tester.getClientId(AutoTester.COMPONENT_ID + ":suggest"); + + writeStatus("Check component is activated"); + type(suggestInputId, "stan"); + waitForAjaxCompletion(); + AssertVisible(suggestPopupId, "Suggestion popup is not come up"); + + writeStatus("Check list of options is fetched from server and shown"); + //5 + nothingLabel row + Assert.assertEquals(6, selenium.getXpathCount("//table[@id='" + suggestPopupId + "']/tbody/tr")); + + writeStatus("Check arbitrary option can be selected"); + writeStatus("Try to select second item: Kyrgyzstan (Bishkek)"); + selenium.click("//table[@id='" + suggestPopupId + "']/tbody/tr[2]"); + AssertValueEquals(suggestInputId, "Kyrgyzstan"); + assertSelectedCapitals("Bishkek"); + } + + @Test + public void testMultiColumnPossibility(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, RESET_METHOD); + writeStatus("Check multi-column display is possible using var attribute"); + + String suggestInputId = tester.getClientId("suggestion"); + String suggestPopupId = tester.getClientId(AutoTester.COMPONENT_ID + ":suggest"); + String firstOptionXpath = "//table[@id='" + suggestPopupId + "']/tbody/tr[1]/td"; + type(suggestInputId, "Bel"); + waitForAjaxCompletion(); + writeStatus("Check option's columns are rendered properly"); + Assert.assertFalse(isVisible(firstOptionXpath + "[1]")); + AssertTextEquals(firstOptionXpath + "[2]", "Belarus"); + AssertTextEquals(firstOptionXpath + "[3]", "Minsk"); + AssertTextEquals(firstOptionXpath + "[4]", "207600.0"); + AssertTextEquals(firstOptionXpath + "[5]", "9689800"); + } + + private void assertSelectedCapitals(String... capitals) { + String liXpath = "//*[@id='suggestionObject']/ul/li"; + Assert.assertEquals(capitals.length, selenium.getXpathCount(liXpath).intValue()); + for (int i = 0; i < capitals.length; i++) { + AssertTextEquals(liXpath + "[" + (i + 1) + "]", capitals[i]); + } + } + @Override public void sendAjax() { type(getAutoTester(this).getClientId("suggestion"), "Bel"); @@ -275,7 +353,7 @@ @Override public String getTestUrl() { - return null; + throw new UnsupportedOperationException(); } }

15 years, 9 months

1
0
0 / 0

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

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

Author: nbelaevski Date: 2009-03-31 13:34:46 -0400 (Tue, 31 Mar 2009) New Revision: 13322 Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java Log: https://jira.jboss.org/jira/browse/RF-6529 Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2009-03-31 17:26:13 UTC (rev 13321) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2009-03-31 17:34:46 UTC (rev 13322) @@ -178,7 +178,7 @@ getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, component.getAttributes().get("separatorClass")); writer.startElement(HTML.IMG_ELEMENT, component); getUtils().writeAttribute(writer, HTML.src_ATTRIBUTE, uri); - getUtils().writeAttribute(writer, HTML.alt_ATTRIBUTE, " "); + getUtils().writeAttribute(writer, HTML.alt_ATTRIBUTE, ""); writer.endElement(HTML.IMG_ELEMENT); writer.endElement(HTML.td_ELEM); }

15 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2009