May 2009 - richfaces-svn-commits - Jboss List Archives

JBoss Rich Faces SVN: r14095 - in trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum: testng and 1 other directory.

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

Author: konstantin.mishin Date: 2009-05-08 14:25:52 -0400 (Fri, 08 May 2009) New Revision: 14095 Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/DnDUseCasesTest.java Log: RF-6909 Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java =================================================================== --- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-05-08 18:05:55 UTC (rev 14094) +++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-05-08 18:25:52 UTC (rev 14095) @@ -81,9 +81,10 @@ String HEADER_NAME_PATH_SUFFIX = "//h1//text()"; String HEADER_NAME_PATH = HEADER_PATH + HEADER_NAME_PATH_SUFFIX; String DESCRIPTION_PATH = HEADER_PATH + "/following-sibling::p"; - String CONTROLS_PATH = "//*[@class='shelf-header-table-col2']"; + String CONTROLS_PATH = "//*[@class='content_box']/descendant::*[@class='shelf-header-table-col2']"; String EDIT_PATH = CONTROLS_PATH + "/a[1]"; String DELETE_PATH = CONTROLS_PATH + "/a[2]"; + String VIEW_PATH_SUFFIX = "/a[3]"; } public static interface EditShelfArea { @@ -149,7 +150,10 @@ } public static interface TreeArea { - + String CHILDREN_PATH = "//*[@id='treeform:tree']/*[@class='dr-tree rich-tree']/*[contains(@id, 'childs')]"; + String SHELF_PATH_PART = CHILDREN_PATH + "/*[not(contains(@class, 'rich-tree-node-children'))]"; + String ALBUM_PATH_PART = CHILDREN_PATH + "/*[contains(@class, 'rich-tree-node-children')]"; + String TEXT_PATH_SUFFIX = "/descendant::*[contains(@id, 'text')]"; } public static interface ResizeSlider { @@ -183,7 +187,10 @@ login(selenium, UserInfoConstants.LOGIN_NAME, UserInfoConstants.LOGIN_PASSWORD); } - public static void login(Selenium selenium, String name, String password) { + public static void login(Selenium selenium, String name, String password) { + if (isLogined(selenium)) { + logout(selenium); + } selenium.click(HtmlConstants.LogInOutArea.LOGIN_ID); try { Thread.sleep(5000); @@ -208,7 +215,6 @@ if (!isLogined(selenium, UserInfoConstants.LOGIN_NAME)) { Assert.fail("Authentication was not succesfull. Logged user text should contain typed login name"); } - } public static void logout(Selenium selenium) { @@ -232,6 +238,26 @@ Assert.assertTrue(selenium.isVisible(HtmlConstants.FilesUploadArea.FILE_UPLOAD_ID)); } + public static void openShelf(Selenium selenium, String shelfName) { + boolean presented = false; + int xpathCount = selenium.getXpathCount(HtmlConstants.ShelfArea.HEADER_PATH).intValue(); + for (int i = 2; i <= xpathCount && !presented; i++) { + presented = selenium.getText("" + HtmlConstants.ShelfArea.HEADER_PATH + + "[" + i + "]" + HtmlConstants.ShelfArea.HEADER_NAME_PATH_SUFFIX) + .equals(shelfName); + + if (presented) { + selenium.click(HtmlConstants.ShelfArea.CONTROLS_PATH + "[" + (i - 1) + "]" + HtmlConstants.ShelfArea.VIEW_PATH_SUFFIX); + waitForAjaxCompletion(selenium); + testShelfArea(selenium, shelfName); + } + } + if (!presented) { + Assert.fail("Shelf with name '" + shelfName + "' doesn't exist on this page."); + } + + } + public static void testShelfArea(Selenium selenium) { testShelfArea(selenium, null, null); } @@ -253,7 +279,6 @@ } public static boolean isShelfPresentOnPage(Selenium selenium, String shelfName) { - testShelfArea(selenium); boolean presented = false; if (shelfName != null) { int xpathCount = selenium.getXpathCount(HtmlConstants.ShelfArea.HEADER_PATH).intValue(); @@ -285,6 +310,21 @@ testShelfArea(selenium, shelfName); } + public static String getShelfTextPathInTree(Selenium selenium, String shelfName) { + String xPath = null; + int xpathCount = selenium.getXpathCount(HtmlConstants.TreeArea.SHELF_PATH_PART).intValue(); + for (int i = 1; i <= xpathCount && xPath == null; i++) { + String path = HtmlConstants.TreeArea.SHELF_PATH_PART + "[" + i + "]" + HtmlConstants.TreeArea.TEXT_PATH_SUFFIX; + if (selenium.getText(path).contains(shelfName)) { + xPath = path; + } + } + if (xPath == null) { + Assert.fail("Shelf with name '" + shelfName + "' doesn't exist in tree."); + } + return xPath; + } + public static void openAlbumFromPreview(Selenium selenium) { openAlbumFromPreview(selenium, selenium.getText(HtmlConstants.AlbumArea.PREVIEW_PATH + HtmlConstants.AlbumArea.PREVIEW_NAME_PATH_SUFFIX)); } @@ -330,7 +370,6 @@ } public static boolean isAlbumPresentOnPage(Selenium selenium, String albumName) { - testAlbumArea(selenium); boolean presented = false; if (albumName != null) { int xpathCount = selenium.getXpathCount(HtmlConstants.AlbumArea.PREVIEW_PATH).intValue(); @@ -362,6 +401,25 @@ testAlbumArea(selenium, albumName); } + public static String getAlbumTextPathInTree(Selenium selenium, String albumName) { + String xPath = null; + int xpathCount = selenium.getXpathCount(HtmlConstants.TreeArea.ALBUM_PATH_PART).intValue(); + for (int i = 1; i <= xpathCount && xPath == null; i++) { + String pathPart = HtmlConstants.TreeArea.ALBUM_PATH_PART + "[" + i + "]" + HtmlConstants.TreeArea.TEXT_PATH_SUFFIX; + int xpathCount2 = selenium.getXpathCount(pathPart).intValue(); + for (int j = 1; j <= xpathCount2 && xPath == null; j++) { + String path = pathPart + "[" + j + "]"; + if (selenium.getText(path).contains(albumName)) { + xPath = path; + } + } + } + if (xPath == null) { + Assert.fail("Album with name '" + albumName + "' doesn't exist in tree."); + } + return xPath; + } + public static void openImageFromPreview(Selenium selenium) { openImageFromPreview(selenium, selenium.getText(HtmlConstants.ImageArea.PREVIEW_PATH + HtmlConstants.ImageArea.PREVIEW_NAME_PATH_SUFFIX)); } @@ -406,7 +464,6 @@ } public static boolean isImagePresentOnPage(Selenium selenium, String imageName) { - testImageArea(selenium); boolean presented = false; if (imageName != null) { int xpathCount = selenium.getXpathCount(HtmlConstants.ImageArea.PREVIEW_PATH).intValue(); Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/DnDUseCasesTest.java =================================================================== --- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/DnDUseCasesTest.java 2009-05-08 18:05:55 UTC (rev 14094) +++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/testng/DnDUseCasesTest.java 2009-05-08 18:25:52 UTC (rev 14095) @@ -5,6 +5,8 @@ import org.richfaces.photoalbum.RealWorldHelper; import org.richfaces.photoalbum.SeleniumTestBase; +import org.richfaces.photoalbum.RealWorldHelper.HtmlConstants; +import org.testng.Assert; import org.testng.annotations.Test; /** @@ -13,18 +15,26 @@ */ public class DnDUseCasesTest extends SeleniumTestBase { - //TODO @Test - public void testDnDAlbum() { + @Test + public void testDnDAlbumFromTree() { renderPage(); - RealWorldHelper.login(selenium); + String fromShelfName = selenium.getText(HtmlConstants.ShelfArea.HEADER_PATH + "[2]" + HtmlConstants.ShelfArea.HEADER_NAME_PATH_SUFFIX); + String toShelfName = selenium.getText(HtmlConstants.ShelfArea.HEADER_PATH + "[3]" + HtmlConstants.ShelfArea.HEADER_NAME_PATH_SUFFIX); + RealWorldHelper.openShelf(selenium, fromShelfName); RealWorldHelper.openAlbumFromPreview(selenium); - - String compId = "treeform:j_id148"; - - String natureAlbumXpath = "//*[@id='"+ compId + ":childs']/div[1]/table[1]/tbody/tr/td[3]"; - String sportShelfXpath = "//*[@id='"+ compId + ":childs']/table[2]/tbody/tr/td[3]"; - selenium.dragAndDropToObject(natureAlbumXpath, sportShelfXpath); + String albumName = selenium.getText(RealWorldHelper.HtmlConstants.AlbumArea.HEADER_NAME_PATH); + String shelfTextPath = RealWorldHelper.getShelfTextPathInTree(selenium, toShelfName); + String albumTextPath = RealWorldHelper.getAlbumTextPathInTree(selenium, albumName); + selenium.dragAndDropToObject(albumTextPath, shelfTextPath); waitForAjaxCompletion(); + selenium.click(HtmlConstants.ToolBarArea.VIEW_SHELFS_PATH); + waitForAjaxCompletion(); + RealWorldHelper.openShelf(selenium, fromShelfName); + Assert.assertFalse(RealWorldHelper.isAlbumPresentOnPage(selenium, albumName)); + selenium.click(HtmlConstants.ToolBarArea.VIEW_SHELFS_PATH); + waitForAjaxCompletion(); + RealWorldHelper.openShelf(selenium, toShelfName); + Assert.assertTrue(RealWorldHelper.isAlbumPresentOnPage(selenium, albumName)); } }

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14094 - in trunk/samples: violetRays and 1 other directory.

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

Author: nbelaevski Date: 2009-05-08 14:05:55 -0400 (Fri, 08 May 2009) New Revision: 14094 Modified: trunk/samples/themes/pom.xml trunk/samples/violetRays/pom.xml Log: https://jira.jboss.org/jira/browse/RF-6508 Modified: trunk/samples/themes/pom.xml =================================================================== --- trunk/samples/themes/pom.xml 2009-05-08 17:48:17 UTC (rev 14093) +++ trunk/samples/themes/pom.xml 2009-05-08 18:05:55 UTC (rev 14094) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>layout</artifactId> + <artifactId>richfaces-ui</artifactId> <version>3.3.1-SNAPSHOT</version> </dependency> </dependencies> Modified: trunk/samples/violetRays/pom.xml =================================================================== --- trunk/samples/violetRays/pom.xml 2009-05-08 17:48:17 UTC (rev 14093) +++ trunk/samples/violetRays/pom.xml 2009-05-08 18:05:55 UTC (rev 14094) @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>layout</artifactId> + <artifactId>richfaces-ui</artifactId> <version>3.3.1-SNAPSHOT</version> </dependency> </dependencies>

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14093 - in trunk/samples: richfaces-demo and 1 other directory.

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

Author: nbelaevski Date: 2009-05-08 13:48:17 -0400 (Fri, 08 May 2009) New Revision: 14093 Modified: trunk/samples/pom.xml trunk/samples/richfaces-demo/pom.xml Log: https://jira.jboss.org/jira/browse/RF-6508 Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2009-05-08 17:47:45 UTC (rev 14092) +++ trunk/samples/pom.xml 2009-05-08 17:48:17 UTC (rev 14093) @@ -497,6 +497,7 @@ <module>glassX</module> <module>darkX</module> <module>richfaces-demo</module> - <module>themes</module> + <module>themes</module> + <module>violetRays</module> </modules> </project> \ No newline at end of file Modified: trunk/samples/richfaces-demo/pom.xml =================================================================== --- trunk/samples/richfaces-demo/pom.xml 2009-05-08 17:47:45 UTC (rev 14092) +++ trunk/samples/richfaces-demo/pom.xml 2009-05-08 17:48:17 UTC (rev 14093) @@ -317,6 +317,11 @@ <version>3.3.1-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>violetRays</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> <version>1.0</version>

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14092 - trunk/samples/violetRays.

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

Author: nbelaevski Date: 2009-05-08 13:47:45 -0400 (Fri, 08 May 2009) New Revision: 14092 Modified: trunk/samples/violetRays/ Log: https://jira.jboss.org/jira/browse/RF-6508 Property changes on: trunk/samples/violetRays ___________________________________________________________________ Name: svn:ignore + target

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14091 - trunk.

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

Author: nbelaevski Date: 2009-05-08 13:47:15 -0400 (Fri, 08 May 2009) New Revision: 14091 Modified: trunk/deployRelease.sh Log: https://jira.jboss.org/jira/browse/RF-6508 Modified: trunk/deployRelease.sh =================================================================== --- trunk/deployRelease.sh 2009-05-08 17:44:21 UTC (rev 14090) +++ trunk/deployRelease.sh 2009-05-08 17:47:15 UTC (rev 14091) @@ -30,5 +30,7 @@ mvn -s $settings -P local,docs,release clean deploy cd $PROJECT_DIR/samples/themes mvn -s $settings -P local,docs,release clean deploy +cd $PROJECT_DIR/samples/violetRays +mvn -s $settings -P local,docs,release clean deploy cd $PROJECT_DIR/samples/richfaces-demo mvn -s $settings -P local,docs,release clean deploy

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14090 - in trunk/samples/themes/src/main: resources/META-INF/themes and 3 other directories.

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

Author: nbelaevski Date: 2009-05-08 13:44:21 -0400 (Fri, 08 May 2009) New Revision: 14090 Removed: trunk/samples/themes/src/main/config/component/violetRays.xml trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/images/violet/ trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx Log: https://jira.jboss.org/jira/browse/RF-6508 Deleted: trunk/samples/themes/src/main/config/component/violetRays.xml =================================================================== --- trunk/samples/themes/src/main/config/component/violetRays.xml 2009-05-08 17:42:45 UTC (rev 14089) +++ trunk/samples/themes/src/main/config/component/violetRays.xml 2009-05-08 17:44:21 UTC (rev 14090) @@ -1,10 +0,0 @@ -<?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> - <family>org.richfaces.Page</family> - <template>org/richfaces/violetRays.jspx</template> - </renderer> -</components> \ No newline at end of file Deleted: trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties =================================================================== --- trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties 2009-05-08 17:42:45 UTC (rev 14089) +++ trunk/samples/themes/src/main/resources/META-INF/themes/violetRays.theme.properties 2009-05-08 17:44:21 UTC (rev 14090) @@ -1,2 +0,0 @@ -rendererType=org.richfaces.VioletRaysRenderer -styleSheet=resource:///org/richfaces/renderkit/html/css/violetRays.xcss Deleted: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss =================================================================== --- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss 2009-05-08 17:42:45 UTC (rev 14089) +++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/violetRays.xcss 2009-05-08 17:44:21 UTC (rev 14090) @@ -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/samples/themes/src/main/templates/org/richfaces/violetRays.jspx =================================================================== --- trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx 2009-05-08 17:42:45 UTC (rev 14089) +++ trunk/samples/themes/src/main/templates/org/richfaces/violetRays.jspx 2009-05-08 17:44:21 UTC (rev 14090) @@ -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

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14089 - in trunk/samples/violetRays/src/main: resources/META-INF/themes and 2 other directories.

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

Author: nbelaevski Date: 2009-05-08 13:42:45 -0400 (Fri, 08 May 2009) New Revision: 14089 Removed: trunk/samples/violetRays/src/main/config/component/cssZend.xml trunk/samples/violetRays/src/main/config/component/oldschool.xml trunk/samples/violetRays/src/main/config/component/smooth.xml trunk/samples/violetRays/src/main/resources/META-INF/themes/csszend.theme.properties trunk/samples/violetRays/src/main/resources/META-INF/themes/oldschool.theme.properties trunk/samples/violetRays/src/main/resources/META-INF/themes/smooth.theme.properties trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/oldschool.xcss trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css trunk/samples/violetRays/src/main/templates/org/richfaces/cssZendPage.jspx trunk/samples/violetRays/src/main/templates/org/richfaces/oldschool.jspx trunk/samples/violetRays/src/main/templates/org/richfaces/smooth.jspx Log: https://jira.jboss.org/jira/browse/RF-6508 Deleted: trunk/samples/violetRays/src/main/config/component/cssZend.xml =================================================================== --- trunk/samples/violetRays/src/main/config/component/cssZend.xml 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/config/component/cssZend.xml 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,10 +0,0 @@ -<?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> - <family>org.richfaces.Page</family> - <template>org/richfaces/cssZendPage.jspx</template> - </renderer> -</components> \ No newline at end of file Deleted: trunk/samples/violetRays/src/main/config/component/oldschool.xml =================================================================== --- trunk/samples/violetRays/src/main/config/component/oldschool.xml 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/config/component/oldschool.xml 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,10 +0,0 @@ -<?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.OldSchoolThemeRenderer</name> - <family>org.richfaces.Page</family> - <template>org/richfaces/oldschool.jspx</template> - </renderer> -</components> \ No newline at end of file Deleted: trunk/samples/violetRays/src/main/config/component/smooth.xml =================================================================== --- trunk/samples/violetRays/src/main/config/component/smooth.xml 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/config/component/smooth.xml 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,10 +0,0 @@ -<?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.SmoothThemeRenderer</name> - <family>org.richfaces.Page</family> - <template>org/richfaces/smooth.jspx</template> - </renderer> -</components> \ No newline at end of file Deleted: trunk/samples/violetRays/src/main/resources/META-INF/themes/csszend.theme.properties =================================================================== --- trunk/samples/violetRays/src/main/resources/META-INF/themes/csszend.theme.properties 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/resources/META-INF/themes/csszend.theme.properties 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,2 +0,0 @@ -rendererType=org.richfaces.CssZendPageRenderer -styleSheet=resource:///org/richfaces/renderkit/html/css/zengarden.css Deleted: trunk/samples/violetRays/src/main/resources/META-INF/themes/oldschool.theme.properties =================================================================== --- trunk/samples/violetRays/src/main/resources/META-INF/themes/oldschool.theme.properties 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/resources/META-INF/themes/oldschool.theme.properties 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,2 +0,0 @@ -rendererType=org.richfaces.OldSchoolThemeRenderer -styleSheet=resource\:///org/richfaces/renderkit/html/css/oldschool.xcss Deleted: trunk/samples/violetRays/src/main/resources/META-INF/themes/smooth.theme.properties =================================================================== --- trunk/samples/violetRays/src/main/resources/META-INF/themes/smooth.theme.properties 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/resources/META-INF/themes/smooth.theme.properties 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,2 +0,0 @@ -rendererType=org.richfaces.SmoothThemeRenderer -styleSheet=resource\:///org/richfaces/renderkit/html/css/smooth.xcss Deleted: trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/oldschool.xcss =================================================================== --- trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/oldschool.xcss 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/oldschool.xcss 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,91 +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"> - <u:selector name="body"> - <u:style name="background" skin="generalBackgroundColor"/> - <u:style name="margin" value="0px"/> - </u:selector> - - <u:selector name=".header_bg"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.HeaderBackground"/> - </u:style> - <u:style name="border-bottom" value="1px solid" /> - <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:selector> - - <u:selector name=".footer_bg"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.FooterBackground"/> - </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:selector> - - <u:selector name=".menu_col"> - <u:style name="background" skin="generalBackgroundColor"/> - <u:style name="vertical-align" value="top"/> - <u:style name="border-top" value="2px solid" /> - <u:style name="border-top-color" skin="panelBorderColor" /> - <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=".content_col"> - <u:style name="background" skin="generalBackgroundColor"/> - <u:style name="vertical-align" value="top"/> - <u:style name="width" value="100%"/> - <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="*.menu_col, *.content_col, *.footer_bg"> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="generalTextColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - </u:selector> - <u:selector name="*.header_content"> - <u:style name="font-family" skin="headerFamilyFont" /> - <u:style name="color" skin="headerTextColor" /> - <u:style name="font-size" skin="headerSizeFont" /> - </u:selector> - <f:verbatim> - <![CDATA[ -/*.menu_width{width : 300px;}*/ - - -.page_size { - width : 100%; - height : 100%; -} - - -.header_content { - margin : 0px 0px 0px 0px; - height : 95px; position : relative; -} - -.spacer{font-size : 1px;} - - -.footer_bg_content { - margin : 0px 0px 0px 0px; - height : 45px; - position : relative; -} - ]]> - </f:verbatim> -</f:template> \ No newline at end of file Deleted: trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss =================================================================== --- trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/smooth.xcss 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,162 +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"> - - <u:selector name="body"> - <u:style name="background" skin="headerGradientColor"/> - <u:style name="margin" value="0px"/> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.PageBackground"/> - </u:style> - <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-style" value="solid" /> - <u:style name="border-top-width" value="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-style" value="solid" /> - <u:style name="border-right-width" value="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 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="position" value="relative"/> - </u:selector> - - <u:selector name=".header_bg_left"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.ShadowHeaderLeft"/> - </u:style> - <u:style name="background-repeat" value="no-repeat"/> - <u:style name="background-position" value="top left"/> - </u:selector> - <u:selector name=".header_bg_right"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.ShadowHeaderRight"/> - </u:style> - <u:style name="background-repeat" value="no-repeat"/> - <u:style name="background-position" value="top right"/> - </u:selector> - - <u:selector name=".footer_bg_content"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.ShadowFooterBackground"/> - </u:style> - <u:style name="background-repeat" value="repeat-x"/> - <u:style name="background-position" value="top left"/> - <u:style name="margin" value="0px 15px" /> - <u:style name="position" value="relative"/> - <u:style name="padding" value="15px" /> - <u:style name="height" value="53px" /> - </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="top 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="top right"/> - <u:style name="height" value="72px" /> - </u:selector> - - - <u:selector name=".left_col"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundButtomLeft"/> - </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="no-repeat"/> - <u:style name="background-position" value="top left"/> - <u:style name="width" value="15px"/> - <u:style name="height" value="100%"/> - </u:selector> - - <u:selector name=".right_col"> - <u:style name="background-image"> -  - <f:resource f:key="org.richfaces.theme.images.ShadowBackgroundButtomRight"/> - </u:style> -  - <u:style name="background-repeat" value="repeat-y"/> - <u:style name="background-position" value="buttom 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="no-repeat"/> - <u:style name="background-position" value="top right"/> - <u:style name="width" value="15px"/> - <u:style name="height" value="100%"/> - </u:selector> - - <f:verbatim> - <![CDATA[ -.page_size{width:90%; margin:0px auto; border: none;} -.menu_width{width : 300px;} - -.common_box {margin : 0px; } -.spacer{font-size : 1px;} - ]]> - </f:verbatim> -</f:template> \ No newline at end of file Deleted: trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css =================================================================== --- trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/resources/org/richfaces/renderkit/html/css/zengarden.css 2009-05-08 17:42:45 UTC (rev 14089) @@ -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/samples/violetRays/src/main/templates/org/richfaces/cssZendPage.jspx =================================================================== --- trunk/samples/violetRays/src/main/templates/org/richfaces/cssZendPage.jspx 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/templates/org/richfaces/cssZendPage.jspx 2009-05-08 17:42:45 UTC (rev 14089) @@ -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/samples/violetRays/src/main/templates/org/richfaces/oldschool.jspx =================================================================== --- trunk/samples/violetRays/src/main/templates/org/richfaces/oldschool.jspx 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/templates/org/richfaces/oldschool.jspx 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:jsp="http://java.sun.com/JSP/Page" - 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.OldSchoolThemeRenderer" - 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"/> - <style type="text/css"> - <jsp:scriptlet><![CDATA[ - Integer width = (Integer) component.getAttributes().get("width"); - if (null != width && width.intValue() > 0) { - StringBuilder format = new StringBuilder( - ".rich-page{margin:auto;text-align:left;"); - format.append("width:").append(width).append("px;"); - writer.write(format.toString()); - } else { - writer.write(".rich-page{width:100%;}\n"); - } - ]]></jsp:scriptlet> - </style> - <u:insertFacet name="pageHeader"/> - -</head> -<body x:passThruWithExclusions="value,name,type,id"> - <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{component.attributes['pageClass']}"> - <tbody> - <tr> - <td class="header_bg"> - <div class="header_content rich-page-header #{component.attributes['headerClass']}"> - - <u:insertFacet name="header"/> - - </div> - </td> - </tr> - <tr> - <td width="100%" height="100%" class="bg_tabbody"> - <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" class="rich-page-content #{component.attributes['contentClass']}"> - <tbody> - <tr> - <td class="menu_col rich-page-sidebar #{component.attributes['sidebarClass']}"> - <div class="menu_width spacer" style="width:#{component.attributes['sidebarWidth']}px"></div> - - <u:insertFacet name="sidebar"/> - - </td> - <td class="content_col rich-page-body #{component.attributes['bodyClass']}"> - - <vcp:body> - <f:call name="renderChildren" /> - </vcp:body> - - </td> - </tr> - </tbody> - </table> - </td> - </tr> - <tr> - <td class="footer_bg"> - <div class="footer_bg_content rich-page-footer #{component.attributes['footerClass']}"> - - <u:insertFacet name="footer"/> - - </div> - </td> - </tr> - </tbody> - </table> -</body> -</html> -</f:root> \ No newline at end of file Deleted: trunk/samples/violetRays/src/main/templates/org/richfaces/smooth.jspx =================================================================== --- trunk/samples/violetRays/src/main/templates/org/richfaces/smooth.jspx 2009-05-08 17:41:34 UTC (rev 14088) +++ trunk/samples/violetRays/src/main/templates/org/richfaces/smooth.jspx 2009-05-08 17:42:45 UTC (rev 14089) @@ -1,103 +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.SmoothThemeRenderer" - 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"/> - <style type="text/css"> - <jsp:scriptlet><![CDATA[ - Integer width = (Integer) component.getAttributes().get("width"); - if (null != width && width.intValue() > 0) { - StringBuilder format = new StringBuilder( - ".rich-page{margin:auto;text-align:left;"); - format.append("width:").append(width).append("px;"); - writer.write(format.toString()); - } else { - writer.write(".rich-page{width:100%;}\n"); - } - ]]></jsp:scriptlet> - </style> - <u:insertFacet name="pageHeader"/> - -</head> -<body x:passThruWithExclusions="value,name,type,id"> -<table class="rich-page #{component.attributes['pageClass']}" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td class="common_box"> - - <table height="100%" cellpadding="0" cellspacing="0" class="page_size"> - <thead> - <tr> - <th colspan="3" class="header_bg_left"> - <div class="header_bg_right"> -  - <div class="header_content rich-page-header #{component.attributes['headerClass']}"> - <u:insertFacet name="header"/> - </div> - </div> - </th> - </tr> - </thead> - <tbody> - <tr> - <td class="left_col"> - <div class="left_strut"> - <br /> - </div> - </td> - <td width="100%" height="100%" class="bg_tabbody"> - <table class="content_body rich-page-content #{component.attributes['contentClass']}" cellpadding="0" cellspacing="0" width="100%" height="100%"> - <tbody> - <tr> - <td class="menu_col rich-page-sidebar #{component.attributes['sidebarClass']}"> - <div class="spacer" style="width:#{component.attributes['sidebarWidth']}px"></div> - <u:insertFacet name="sidebar"/> - </td> - <td class="content_col rich-page-body #{component.attributes['bodyClass']}"> - <vcp:body> - <f:call name="renderChildren" /> - </vcp:body> - </td> - </tr> - </tbody> - </table> - </td> - <td class="right_col"> - <div class="right_strut"> - <br /> - </div> - </td> - </tr> - <tr> - <td colspan="3" class="footer_bg_left"> - <div class="footer_bg_right"> - <div class="footer_bg_content rich-page-footer #{component.attributes['footerClass']}"> - <u:insertFacet name="footer"/> - - </div> - </div> - </td> - </tr> - </tbody> - </table> - - </td> - </tr> -</table> -</body> -</html> -</f:root> \ No newline at end of file

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14088 - in trunk/samples: violetRays and 2 other directories.

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

Author: nbelaevski Date: 2009-05-08 13:41:34 -0400 (Fri, 08 May 2009) New Revision: 14088 Added: trunk/samples/violetRays/ trunk/samples/violetRays/pom.xml trunk/samples/violetRays/src/ trunk/samples/violetRays/src/main/ trunk/samples/violetRays/src/main/config/ trunk/samples/violetRays/src/main/resources/ trunk/samples/violetRays/src/main/templates/ Log: https://jira.jboss.org/jira/browse/RF-6508 Added: trunk/samples/violetRays/pom.xml =================================================================== --- trunk/samples/violetRays/pom.xml (rev 0) +++ trunk/samples/violetRays/pom.xml 2009-05-08 17:41:34 UTC (rev 14088) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <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>violetRays</artifactId> + <version>3.3.1-SNAPSHOT</version> + <name>violetRays</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> + </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 Copied: trunk/samples/violetRays/src/main/config (from rev 14076, trunk/samples/themes/src/main/config) Copied: trunk/samples/violetRays/src/main/resources (from rev 14076, trunk/samples/themes/src/main/resources) Copied: trunk/samples/violetRays/src/main/templates (from rev 14076, trunk/samples/themes/src/main/templates)

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14087 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples.

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

Author: nbelaevski Date: 2009-05-08 13:16:47 -0400 (Fri, 08 May 2009) New Revision: 14087 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml Log: https://jira.jboss.org/jira/browse/RF-7073 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml 2009-05-08 16:51:18 UTC (rev 14086) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml 2009-05-08 17:16:47 UTC (rev 14087) @@ -6,22 +6,14 @@ xmlns:rich="http://richfaces.org/rich" xmlns:s="http://jboss.com/products/seam/taglib"> <style> - -.column { - width: 400px; -} - -.column, .column2 { - vertical-align: top; -} - -.column2 { - padding-left: 100px; -} -</style> + .column { + width: 400px; + vertical-align: top; + } + </style> <h:form id="form"> - <h:panelGrid columns="2" width="100%" columnClasses="column,column2"> + <h:panelGrid columns="2" width="100%" columnClasses="column,column"> <h:panelGroup style="height:320px;width:400px;" layout="block"> <rich:editor configuration="#{editorBean.currentConfiguration}" id="editor" width="400" height="300" validator="#{editorBean.validate}" @@ -31,7 +23,7 @@ onsubmit="if (!#{rich:element('form:editorvalue')} && !#{editorBean.useSeamText}) return false;" /> </rich:editor> </h:panelGroup> - <rich:panel id="controls" style="width: 400px;"> + <rich:panel id="controls"> <f:facet name="header"> <h:outputText value="Editor Settings" /> </f:facet>

14 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14086 - trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager.

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

Author: amarkhel Date: 2009-05-08 12:51:18 -0400 (Fri, 08 May 2009) New Revision: 14086 Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java Log: Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java =================================================================== --- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-05-08 16:43:07 UTC (rev 14085) +++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-05-08 16:51:18 UTC (rev 14086) @@ -97,7 +97,7 @@ } public void showImage(Image image){ - pushEvent(Constants.CLEAR_EDITOR_EVENT); + pushEvent(Constants.CLEAR_EDITOR_EVENT, ""); if(!canViewImage(image)){ pushEvent(Constants.ADD_ERROR_EVENT, Constants.HAVENT_ACCESS); return; @@ -281,10 +281,6 @@ return index / 5 + 1; } - public void setPage(Integer page){ - - } - public boolean isUserImage(Image image){ if(image == null || image.getOwner() == null) { return false;

14 years, 11 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 May 2009