February 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r21593 - in trunk/examples/richfaces-showcase/src/main/webapp: richfaces/dataScroller/samples and 2 other directories.

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

Author: ilya_shaikovsky Date: 2011-02-10 07:05:52 -0500 (Thu, 10 Feb 2011) New Revision: 21593 Removed: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml Log: http://jira.jboss.org/browse/RF-10484 Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,3 +0,0 @@ -rich-message{ - color:red; -} \ No newline at end of file Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,30 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:composite="http://java.sun.com/jsf/composite" - xmlns:a4j="http://richfaces.org/a4j"> -<head> -<title>panel</title> -</head> -<body> - -<composite:interface> - <composite:attribute name="for" required="true" /> - <composite:attribute name="style" required="false" /> - <composite:attribute name="styleClass" required="false" /> -</composite:interface> - -<composite:implementation> - <h:outputStylesheet library="org.richfaces.showcase" name="message.css" /> - <a4j:outputPanel ajaxRendered="true"> - <h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}" - showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}" - styleClass="rich-message #{cc.attrs.styleClass}" /> - </a4j:outputPanel> -</composite:implementation> -</body> -</html> Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,96 +0,0 @@ -.rich-page { - width: 100%; -} - -body { - background-color: #FFFFFF; - margin: 10px; -} - -.header_bg { - background-image: - "url(#{resource['org.richfaces.demo.images:pgHdrGrad.png']})"; - border-bottom: 1px solid #FFFFFF; - background-color: '#{richSkin.headerBackgroundColor}'; - background-repeat: repeat-x; - background-position: top left; -} - -.footer_bg { - background-image: - "url(#{resource['org.richfaces.demo.images:pgFtrGrad.png']})"; - border-top: 1px solid #FFFFFF; - background-color: '#{richSkin.headerBackgroundColor}'; - background-repeat: repeat-x; - background-position: center left; -} - -.menu_col { - background-color: '#{richSkin.generalBackgroundColor}'; - vertical-align: top; - border-top: 10px solid #FFFFFF; - border-right: 10px solid #FFFFFF; - border-bottom: 10px solid #FFFFFF; -} - -.content_col { - background-color: #FFFFFF; - vertical-align: top; - width: 100%; - border-top: 10px solid #FFFFFF; - border-bottom: 10px solid #FFFFFF; -} - -*.menu_col,*.content_col,*.footer_bg { - font-family: '#{richSkin.generalFamilyFont}'; - color: '#{richSkin.generalTextColor}'; - font-size: '#{richSkin.generalSizeFont}'; -} - -*.header_content { - font-family: '#{richSkin.generalFamilyFont}'; - color: '#{richSkin.headerTextColor}'; - font-size: '#{richSkin.generalSizeFont}'; - padding-left: 20px; -} - -.page_size { - width: 100%; - height: 100%; -} - -.header_content { - margin: 0px 0px 0px 0px; - position: relative -} - -.spacer { - font-size: 1px; -} - -.footer_bg_content { - padding:20px; - margin: 0px 0px 0px 0px; -} - -.new_marker { - color: red; - vertical-align: super; - font-size: 8px; - padding-left: 2px; -} - -.header_links_container, .header_links_container a:visited, .header_links_container * { - color: '#{richSkin.headerTextColor}'; -} - -.header_links_container { - padding-right: 20px; -} - -.skin-chooser{ -margin-bottom: 3px; -} -.samples-navigator{ -margin-bottom: 10px; -} \ No newline at end of file Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,69 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:composite="http://java.sun.com/jsf/composite"> - <head> - <title>page</title> - </head> -<body> - -<composite:interface> - <composite:attribute name="style" /> - <composite:attribute name="styleClass"/> - <composite:attribute name="headerClass"/> - <composite:attribute name="bodyClass"/> - <composite:attribute name="sidebarClass"/> -</composite:interface> -<composite:implementation> -<h:outputText value="<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" escape="false"/> -<html xmlns="http://www.w3.org/1999/xhtml"> -<h:head> - <title>#{cc.attrs.pageTitle}</title> - <composite:renderFacet name="pageHeader"/> -</h:head> -<h:body> - <h:outputStylesheet name="rich/css/page.ecss" /> - <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}"> - <tbody> - <tr> - <td class="header_bg"> - <div class="header_content rich-page-header #{cc.attrs.headerClass}"> - <composite:renderFacet 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 #{cc.attrs.contentClass}"> - <tbody> - <tr> - <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}"> - <div class="menu_width spacer" style="width:#{cc.attrs.sidebarWidth}px"></div> - <composite:renderFacet name="sidebar"/> - </td> - <td class="content_col rich-page-body #{cc.attrs.bodyClass}"> - <composite:insertChildren /> - </td> - </tr> - </tbody> - </table> - </td> - </tr> - <tr> - <td class="footer_bg"> - <div class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}"> - <composite:renderFacet name="footer"/> - </div> - </td> - </tr> - </tbody> - </table> -</h:body> -</html> -</composite:implementation> -</body> -</html> Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,28 +0,0 @@ -.rf-p-c{ - border-width: 1px; - border-style: solid; - padding: 1px; - color: '#{richSkin.generalTextColor}'; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - background-color: '#{richSkin.generalBackgroundColor}'; - border-color: '#{richSkin.panelBorderColor}'; -} - -.rf-p-c .rf-p-hdr { - padding: 7px 20px; - border-width: 1px; - border-style: solid; - background-color: '#{richSkin.headerBackgroundColor}'; - border-color: '#{richSkin.panelBorderColor}'; - font-weight: bold; - background-position: left top; - background-repeat: repeat-x; - background-image: - "url(#{resource['org.richfaces.demo.images:pnGrad.png']})"; - color: '#{richSkin.headerTextColor}'; -} - -.rf-p-c .rf-p-b { - padding: 10px; -} \ No newline at end of file Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,50 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:composite="http://java.sun.com/jsf/composite"> - <head> - <title>panel</title> - </head> -<body> - -<composite:interface> - <composite:attribute name="id" required="false"/> - <composite:attribute name="style" required="false"/> - <composite:attribute name="styleClass" required="false"/> - <composite:attribute name="headerClass" required="false"/> - <composite:attribute name="bodyClass" required="false"/> -</composite:interface> - -<composite:implementation> - <h:outputStylesheet library="org.richfaces.showcase" name="panel.ecss" /> - - <div class="rich-panel #{cc.attrs.styleClass}" id="#{cc.attrs.id}" - style="#{cc.attrs.style}" - onclick="#{cc.attrs.onclick}" - ondblclick="#{cc.attrs.ondblclick}" - onkeydown="#{cc.attrs.onkeydown}" - onkeypress="#{cc.attrs.onkeypress}" - onkeyup="#{cc.attrs.onkeyup}" - onmousedown="#{cc.attrs.onmousedown}" - onmousemove="#{cc.attrs.onmousemove}" - onmouseout="#{cc.attrs.onmouseout}" - onmouseover="#{cc.attrs.onmouseover}" - onmouseup="#{cc.attrs.onmouseup}"> - - <h:panelGroup rendered="#{not empty cc.facets.header}"> - <div class="rich-panel-header #{cc.attrs.headerClass}"> - <composite:renderFacet name="header"/> - </div> - </h:panelGroup> - <div class="rich-panel-body #{cc.attrs.bodyClass}" > - <composite:insertChildren /> - </div> - - </div> -</composite:implementation> -</body> -</html> Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -1,32 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:composite="http://java.sun.com/jsf/composite" - xmlns:a4j="http://richfaces.org/a4j"> - <head> - <title>toolBar</title> - </head> -<body> - -<composite:interface> - <composite:attribute name="items" required="true"/> -</composite:interface> -<composite:implementation> - <table> - <tbody> - <a4j:repeat value="#{cc.attrs.items}" var="item"> - <tr> - <td> - <h:link value="#{item.name}" outcome="#{item.outcome}" /> - </td> - </tr> - </a4j:repeat> - </tbody> - </table> -</composite:implementation> -</body> -</html> \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -17,7 +17,7 @@ onclick="#{rich:component('ds')}.previous()" /> <a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic" id="pics"> - <h:graphicImage value="#{pic.uri}" style="padding:5px;" /> + <h:graphicImage value="#{pic.uri}" style="" /> </a4j:repeat> <h:graphicImage value="/images/icons/scroller/arr_right.png" onclick="#{rich:component('ds')}.next()" /> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -6,9 +6,9 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich" xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:r="http://java.sun.com/jsf/composite/org.richfaces.showcase"> + > <h:form id="form"> - <r:messages /> + <rich:messages /> <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" id="table" rows="30"> <f:facet name="noData"> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2011-02-10 11:41:26 UTC (rev 21592) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2011-02-10 12:05:52 UTC (rev 21593) @@ -11,9 +11,11 @@ padding:5px; } .tabDiv { - border: 1px solid #{ richSkin.panelBorderColor}; + margin-right:5px; + border: 1px solid #{richSkin.panelBorderColor}; + background-color: #{richSkin.headerBackgroundColor}; cursor:pointer; - width:110px; + width:115px; padding-left:5px; float:left; } @@ -32,7 +34,7 @@ <p>For now you are at Panel 2</p> </rich:togglePanelItem> </rich:togglePanel> - <a4j:outputPanel id="tabs"> + <a4j:outputPanel id="tabs" layout="block"> <a4j:outputPanel layout="block" styleClass="tabDiv"> <rich:toggleControl event="click" targetPanel="panel1" targetItem="item1" />

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21592 - in trunk/examples/richfaces-showcase/src/main/webapp: templates and 1 other directory.

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

Author: ilya_shaikovsky Date: 2011-02-10 06:41:26 -0500 (Thu, 10 Feb 2011) New Revision: 21592 Added: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css Removed: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml Log: Copied: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css (from rev 21584, trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss) =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-10 11:41:26 UTC (rev 21592) @@ -0,0 +1,142 @@ +html{ + height:100%; +} +body{ + margin:0; + padding:0; + background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat; + font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif; + height:100%; +} +fieldset{ + margin:0; +} +ul.layout{ + list-style:none; +} +a{ + color:#5a8eba; + outline:none; + text-decoration:none; +} +a:hover{ + text-decoration:underline; +} +p{ + margin:0; + padding:0 0 6px; +} +#page{ + margin:0 auto; + width:987px; +} +#header{ + background:url('#{facesContext.externalContext.requestContextPath}/images/header-bg.png') no-repeat top left; + height:90px; +} +#header .logo{ + float:left; + margin-left:7px; + text-decoration:none; +} +#header .logo img{ + border:none; +} +#header .right-controls{ + float:right; +} +#header ul.top-links{ + margin:5px 15px 0 0; + text-align:right; +} +#header ul.top-links li{ + display:inline; + font-size:11px; +} +#header ul.top-links li a{ + background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat; + color:#fff; + padding:0 8px 0 3px; + font:11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif'; +} +#header ul.top-links li.last a{ + background:none; + padding:0 0 0 3px; +} +#header ul.top-links li.download-link a{ + color:#eccb7b; +} +#header ul#skin-menu{ + color:#89a0be; + cursor:default; + font-weight:bold; + margin:38px 15px 0 0; + text-align:right; +} +#header ul#skin-menu li{ + cursor:pointer; + display:inline-block; + float:right; + height:25px; + margin-left:4px; + padding-left:5px; +} +#header ul#skin-menu li span{ + height:25px; + padding:3px 5px 0 0; + display:inline-block; + font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif'; +} + +#header ul#skin-menu li span:hover{ + text-decoration:underline; +} +#header ul#skin-menu li.label{ + color:#999999; + cursor:default; + font-weight:normal; +} + +#header ul#skin-menu li.current-skin{ + background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') left -75px no-repeat; + color:#fff; +} +#header ul#skin-menu li.current-skin span{ + background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') right 0 repeat-x; +} +#header ul#skin-menu li.label span:hover, +#header ul#skin-menu li.current-skin span:hover{ + text-decoration:none; +} +#page-content{ + background:url('#{facesContext.externalContext.requestContextPath}/images/page-bg.png') 0 0 repeat-y; + height:100%; + min-height:520px; + padding:10px 20px 0; +} +#page-content .left-menu{ + float:left; + margin-right:10px; + min-height:450px; + width:210px; +} +#page-content .content-container { + float:left; + width:720px; +} + +.clear{ + clear:both; + height:0%; +} + +#footer{ + background:url('#{facesContext.externalContext.requestContextPath}/images/footer.png') top left no-repeat; + color:#2d4351; + text-align:center; + padding:15px 20px 10px; +} + +.source .syntaxhighlighter .line{ + white-space: normal !important; +} \ No newline at end of file Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss 2011-02-10 11:37:49 UTC (rev 21591) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss 2011-02-10 11:41:26 UTC (rev 21592) @@ -1,142 +0,0 @@ -html{ - height:100%; -} -body{ - margin:0; - padding:0; - background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat; - font:normal 12px 'Lucida Sans Unicode, Lucida Grande, Geneva,Verdana,Arial,sans-serif'; - height:100%; -} -fieldset{ - margin:0; -} -ul.layout{ - list-style:none; -} -a{ - color:#5a8eba; - outline:none; - text-decoration:none; -} -a:hover{ - text-decoration:underline; -} -p{ - margin:0; - padding:0 0 6px; -} -#page{ - margin:0 auto; - width:987px; -} -#header{ - background:url('#{facesContext.externalContext.requestContextPath}/images/header-bg.png') no-repeat top left; - height:90px; -} -#header .logo{ - float:left; - margin-left:7px; - text-decoration:none; -} -#header .logo img{ - border:none; -} -#header .right-controls{ - float:right; -} -#header ul.top-links{ - margin:5px 15px 0 0; - text-align:right; -} -#header ul.top-links li{ - display:inline; - font-size:11px; -} -#header ul.top-links li a{ - background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat; - color:#fff; - padding:0 8px 0 3px; - font:11px 'Lucida Sans Unicode, Lucida Grande, Geneva,Verdana,Arial,sans-serif'; -} -#header ul.top-links li.last a{ - background:none; - padding:0 0 0 3px; -} -#header ul.top-links li.download-link a{ - color:#eccb7b; -} -#header ul#skin-menu{ - color:#89a0be; - cursor:default; - font-weight:bold; - margin:38px 15px 0 0; - text-align:right; -} -#header ul#skin-menu li{ - cursor:pointer; - display:inline-block; - float:right; - height:25px; - margin-left:4px; - padding-left:5px; -} -#header ul#skin-menu li span{ - height:25px; - padding:3px 5px 0 0; - display:inline-block; - font:normal 12px 'Lucida Sans Unicode, Lucida Grande, Geneva,Verdana,Arial,sans-serif'; -} - -#header ul#skin-menu li span:hover{ - text-decoration:underline; -} -#header ul#skin-menu li.label{ - color:#999999; - cursor:default; - font-weight:normal; -} - -#header ul#skin-menu li.current-skin{ - background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') left -75px no-repeat; - color:#fff; -} -#header ul#skin-menu li.current-skin span{ - background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') right 0 repeat-x; -} -#header ul#skin-menu li.label span:hover, -#header ul#skin-menu li.current-skin span:hover{ - text-decoration:none; -} -#page-content{ - background:url('#{facesContext.externalContext.requestContextPath}/images/page-bg.png') 0 0 repeat-y; - height:100%; - min-height:520px; - padding:10px 20px 0; -} -#page-content .left-menu{ - float:left; - margin-right:10px; - min-height:450px; - width:210px; -} -#page-content .content-container { - float:left; - width:720px; -} - -.clear{ - clear:both; - height:0%; -} - -#footer{ - background:url('#{facesContext.externalContext.requestContextPath}/images/footer.png') top left no-repeat; - color:#2d4351; - text-align:center; - padding:15px 20px 10px; -} - -.source .syntaxhighlighter .line{ - white-space: normal !important; -} \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-10 11:37:49 UTC (rev 21591) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-10 11:41:26 UTC (rev 21592) @@ -19,7 +19,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script> -<h:outputStylesheet library="css" name="application.ecss"/> +<h:outputStylesheet library="css" name="application.css"/> </h:head> <h:body> <div id="page">

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21591 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richCollapsibleSubTableToggler and 1 other directory.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 06:37:49 -0500 (Thu, 10 Feb 2011) New Revision: 21591 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java Log: fixed collapsibleSubtable tests Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java 2011-02-10 11:36:56 UTC (rev 21590) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java 2011-02-10 11:37:49 UTC (rev 21591) @@ -12,8 +12,8 @@ super(root); } - ReferencedLocator<JQueryLocator> collapsedTogglers = ref(root, "> span[id$=expand]"); - ReferencedLocator<JQueryLocator> expandedTogglers = ref(root, "> span[id$=collapse]"); + ReferencedLocator<JQueryLocator> collapsedTogglers = ref(root, "> span[id$=collapsed]"); + ReferencedLocator<JQueryLocator> expandedTogglers = ref(root, "> span[id$=expanded]"); public ExtendedLocator<JQueryLocator> getCollapsed() { return collapsedTogglers; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java 2011-02-10 11:36:56 UTC (rev 21590) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java 2011-02-10 11:37:49 UTC (rev 21591) @@ -29,24 +29,24 @@ * @version $Revision$ */ public class CollapsibleSubTableTogglerAttributes extends AbstractComponentAttributes { - public void setCollapseIcon(String collapseIcon) { - setProperty("collapseIcon", collapseIcon); + public void setCollapsedIcon(String collapsedIcon) { + setProperty("collapsedIcon", collapsedIcon); } - public void setCollapseLabel(String collapseLabel) { - setProperty("collapseLabel", collapseLabel); + public void setCollapsedLabel(String collapsedLabel) { + setProperty("collapsedLabel", collapsedLabel); } public void setEvent(Event event) { setProperty("event", event); } - public void setExpandIcon(String expandIcon) { - setProperty("expandIcon", expandIcon); + public void setExpandedIcon(String expandedIcon) { + setProperty("expandedIcon", expandedIcon); } - public void setExpandLabel(String expandLabel) { - setProperty("expandLabel", expandLabel); + public void setExpandedLabel(String expandedLabel) { + setProperty("expandedLabel", expandedLabel); } public void setRendered(Boolean rendered) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java 2011-02-10 11:36:56 UTC (rev 21590) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java 2011-02-10 11:37:49 UTC (rev 21591) @@ -41,7 +41,6 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.model.CollapsibleSubTable; import org.richfaces.tests.metamer.ftest.model.CollapsibleSubTableToggler; @@ -89,65 +88,67 @@ @Test public void testCollapsedLabel() { - attributes.setCollapseLabel(LABEL); + attributes.setCollapsedIcon("none"); + attributes.setCollapsedLabel(LABEL); - new TogglerTester(link, image) { + new TogglerTester(image, link) { + String expandedImageUrl; @Override public void verifyBefore() { - assertEquals(selenium.getText(togglerExpanded), LABEL); + assertTrue(selenium.isVisible(togglerExpanded)); + assertFalse(selenium.isVisible(togglerCollapsed)); + expandedImageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); + } @Override public void verifyMiddle() { assertFalse(selenium.isVisible(togglerExpanded)); assertTrue(selenium.isVisible(togglerCollapsed)); + assertEquals(selenium.getText(togglerCollapsed), LABEL); } @Override public void verifyAfter() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getText(togglerExpanded), LABEL); + assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), expandedImageUrl); } }.testToggler(); } @Test public void testExpandedLabel() { - attributes.setExpandLabel(LABEL); + attributes.setExpandedLabel(LABEL); - new TogglerTester(image, link) { - String imageUrl; + new TogglerTester(link, image) { @Override public void verifyBefore() { - selenium.getAttribute(togglerExpanded.getAttribute(SRC)); assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - imageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); + assertEquals(selenium.getText(togglerExpanded), LABEL); } @Override - public void verifyAfter() { - assertTrue(selenium.isVisible(togglerExpanded)); - assertFalse(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), imageUrl); - } - - @Override public void verifyMiddle() { assertFalse(selenium.isVisible(togglerExpanded)); assertTrue(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getText(togglerCollapsed), LABEL); } + + @Override + public void verifyAfter() { + assertTrue(selenium.isVisible(togglerExpanded)); + assertFalse(selenium.isVisible(togglerCollapsed)); + assertEquals(selenium.getText(togglerExpanded), LABEL); + } }.testToggler(); } - @IssueTracking("https://issues.jboss.org/browse/RF-9725") @Test public void testExpandedIcon() { - attributes.setExpandIcon(IMAGE_URL); + attributes.setExpandedIcon(IMAGE_URL); new TogglerTester(image, image) { @@ -155,40 +156,37 @@ public void verifyBefore() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertTrue(selenium.getAttribute(togglerCollapsed.getAttribute(SRC)).contains(IMAGE_URL)); - + assertTrue(selenium.getAttribute(togglerExpanded.getAttribute(SRC)).contains(IMAGE_URL)); } @Override public void verifyMiddle() { assertFalse(selenium.isVisible(togglerExpanded)); assertTrue(selenium.isVisible(togglerCollapsed)); - assertFalse(selenium.getAttribute(togglerCollapsed.getAttribute(SRC)).contains(IMAGE_URL)); } @Override public void verifyAfter() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertTrue(selenium.getAttribute(togglerCollapsed.getAttribute(SRC)).contains(IMAGE_URL)); + assertTrue(selenium.getAttribute(togglerExpanded.getAttribute(SRC)).contains(IMAGE_URL)); } }.testToggler(); } - @IssueTracking("https://issues.jboss.org/browse/RF-9725") @Test public void testCollapsedIcon() { - attributes.setCollapseIcon(IMAGE_URL); + attributes.setCollapsedIcon(IMAGE_URL); new TogglerTester(image, image) { - String imageUrl; + String expandedImageUrl; @Override public void verifyBefore() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - imageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); + expandedImageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); } @Override @@ -202,7 +200,7 @@ public void verifyAfter() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), imageUrl); + assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), expandedImageUrl); } }.testToggler(); }

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21590 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 06:36:56 -0500 (Thu, 10 Feb 2011) New Revision: 21590 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java Log: added issue tracking for RF-10483 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-02-10 11:36:10 UTC (rev 21589) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-02-10 11:36:56 UTC (rev 21590) @@ -53,6 +53,7 @@ import org.richfaces.component.SwitchType; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.richTree.TreeAttributes; import org.richfaces.tests.metamer.ftest.richTree.TreeModel; @@ -224,6 +225,7 @@ @Test @Use(field = "event", value = "events") + @IssueTracking("https://issues.jboss.org/browse/RF-10483") public void testClientEvents() { String attributeName = event.getEventName(); ElementLocator<?> eventInput = pjq("span[id$=treeNode1Attributes:panel] input[id$=on" + attributeName

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21589 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richTreeModelAdaptor and 1 other directory.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 06:36:10 -0500 (Thu, 10 Feb 2011) New Revision: 21589 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java Log: fixed accidently changes list of expanding node numbers Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java 2011-02-10 11:35:19 UTC (rev 21588) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java 2011-02-10 11:36:10 UTC (rev 21589) @@ -45,7 +45,7 @@ private static final int TOP_LEVEL_NODES = 4; - int[][] PATHS = new int[][] { { 3, 2, 1, 2 }, { 2, 4, 6 } }; + protected int[][] paths = new int[][] { { 3, 2, 1 }, { 2, 4, 1 } }; protected TreeAttributes treeAttributes = new TreeAttributes(jq("span[id*=attributes]")); private TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]")); @@ -93,7 +93,7 @@ @Test public void testDeepExpansion() { - for (int[] path : PATHS) { + for (int[] path : paths) { int depth = path.length; for (int d = 1; d <= path.length; d++) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-02-10 11:35:19 UTC (rev 21588) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-02-10 11:36:10 UTC (rev 21589) @@ -50,8 +50,9 @@ public boolean recursiveLeafChildrenNullable; @BeforeClass - public void initTreeAttributes() { + public void setupTreeModelTesting() { treeAttributes = new TreeAttributes(jq("span[id*=treeAttributes]")); + paths = new int[][] { { 3, 2, 1, 2 }, { 2, 4, 6 } }; } @BeforeMethod

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21588 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 06:35:19 -0500 (Thu, 10 Feb 2011) New Revision: 21588 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestPollSimple.java Log: fixed a4j:poll - testClientSideEventHandlers Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestPollSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestPollSimple.java 2011-02-10 11:34:30 UTC (rev 21587) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestPollSimple.java 2011-02-10 11:35:19 UTC (rev 21588) @@ -177,9 +177,8 @@ private void testClientSideEventHandlers(String... events) { attributes.setEnabled(false); super.testRequestEventsBefore(events); - retrieveRequestTime.initializeValue(); attributes.setEnabled(true); - + retrieveRequestTime.initializeValue(); waitAjax.waitForChange(retrieveRequestTime); super.testRequestEventsAfter(events);

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21587 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 06:34:30 -0500 (Thu, 10 Feb 2011) New Revision: 21587 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java Log: added issue tracking for RF-10038 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-02-10 09:59:40 UTC (rev 21586) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-02-10 11:34:30 UTC (rev 21587) @@ -32,6 +32,7 @@ import java.util.regex.Pattern; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.annotations.Uses; import org.richfaces.tests.metamer.ftest.richTree.TestTreeSelection; @@ -93,6 +94,7 @@ @Test @Override @Use(field = "paths", value = "paths*") + @IssueTracking("https://issues.jboss.org/browse/RF-10038") public void testSubNodesSelection() { super.testSubNodesSelection(); } @@ -101,6 +103,7 @@ @Override @Uses({ @Use(field = "paths", value = "paths*"), @Use(field = "selectionType", value = "eventEnabledSelectionTypes") }) + @IssueTracking("https://issues.jboss.org/browse/RF-10038") public void testSubNodesSelectionEvents() { super.testSubNodesSelectionEvents(); }

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21586 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richPanelMenu and 2 other directories.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 04:59:40 -0500 (Thu, 10 Feb 2011) New Revision: 21586 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java Log: added PhaseInfo.noListener(message) + issue tracking for panelMenu Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -21,19 +21,24 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest; -import static org.jboss.test.selenium.dom.Event.*; +import static org.jboss.test.selenium.dom.Event.CLICK; +import static org.jboss.test.selenium.dom.Event.DBLCLICK; +import static org.jboss.test.selenium.dom.Event.MOUSEDOWN; +import static org.jboss.test.selenium.dom.Event.MOUSEMOVE; +import static org.jboss.test.selenium.dom.Event.MOUSEOUT; +import static org.jboss.test.selenium.dom.Event.MOUSEOVER; +import static org.jboss.test.selenium.dom.Event.MOUSEUP; import static org.jboss.test.selenium.encapsulated.JavaScript.js; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guard; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.id; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref; import java.net.URL; import java.util.Arrays; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -28,6 +28,7 @@ import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import javax.faces.event.PhaseId; @@ -86,6 +87,26 @@ throw new AssertionError("The '" + message + "' wasn't found across messages in phase " + phaseId); } + /** + * Asserts that there is no specified message in phases list. + * + * @param message + * the part of the message which it should be looked up + */ + public void assertNoListener(String message) { + initialize(); + for (Entry<PhaseId, Set<String>> entry : map.entrySet()) { + PhaseId phaseId = entry.getKey(); + Set<String> descriptions = entry.getValue(); + + for (String description : descriptions) { + if (description.contains(message)) { + throw new AssertionError("The '" + message + "' was found across messages in phase " + phaseId); + } + } + } + } + private void initialize() { if (retrieveRequestTime.isValueChanged()) { map.clear(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -38,6 +38,7 @@ import org.jboss.test.selenium.waiting.selenium.SeleniumWaiting; import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -95,6 +96,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10481") @Use(field = "mode", enumeration = true) public void testCollapseEvent() { attributes.setCollapseEvent(event.getEventName()); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -29,6 +29,7 @@ import java.net.URL; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.Test; @@ -36,6 +37,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ +@IssueTracking("https://issues.jboss.org/browse/RF-10317") public class TestPanelMenuGroupClientSideHandlers extends AbstractPanelMenuGroupTest { @Inject Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -34,6 +34,7 @@ import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.annotations.Uses; import org.testng.annotations.Test; @@ -42,6 +43,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ +@IssueTracking({ "https://issues.jboss.org/browse/RF-10314", "https://issues.jboss.org/browse/RF-10480" }) public class TestPanelMenuGroupMode extends AbstractPanelMenuGroupTest { @Inject Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -37,6 +37,7 @@ import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.model.PanelMenu; import org.testng.annotations.Test; @@ -45,6 +46,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ +@IssueTracking({ "https://issues.jboss.org/browse/RF-10436", "https://issues.jboss.org/browse/RF-10314" }) public class TestPanelMenuItemMode extends AbstractMetamerTest { PanelMenuItemAttributes attributes = new PanelMenuItemAttributes(); @@ -61,7 +63,7 @@ @Inject @Use(enumeration = true) - PanelMenuMode mode = PanelMenuMode.ajax; + PanelMenuMode mode; @Inject @Use("listeners") @@ -89,7 +91,12 @@ if ("phases".equals(listener)) { phaseInfo.assertPhases(getExpectedPhases()); } else { - phaseInfo.assertListener(getExecutionPhase(), listener); + PhaseId listenerInvocationPhase = getListenerInvocationPhase(); + if (listenerInvocationPhase == null) { + phaseInfo.assertNoListener(listener); + } else { + phaseInfo.assertListener(listenerInvocationPhase, listener); + } } } } @@ -109,8 +116,18 @@ return list.toArray(new PhaseId[list.size()]); } - private PhaseId getExecutionPhase() { + private PhaseId getListenerInvocationPhase() { PhaseId[] phases = getExpectedPhases(); - return phases[phases.length - 2]; + PhaseId phase = phases[phases.length - 2]; + + if ("executeChecker".equals(listener)) { + if (phase.compareTo(UPDATE_MODEL_VALUES) < 0 || mode == PanelMenuMode.server) { + return null; + } else { + return UPDATE_MODEL_VALUES; + } + } + + return phase; } }

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21585 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip and 1 other directory.

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

Author: lfryc(a)redhat.com Date: 2011-02-10 04:58:22 -0500 (Thu, 10 Feb 2011) New Revision: 21585 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java Log: fixed tooltip tests Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2011-02-10 09:35:53 UTC (rev 21584) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2011-02-10 09:58:22 UTC (rev 21585) @@ -65,7 +65,6 @@ attributes.setAttribute("attached", true); attributes.setAttribute("rendered", true); attributes.setAttribute("followMouse", true); - attributes.setAttribute("disabled", false); attributes.setAttribute("layout", "inline"); attributes.setAttribute("mode", "client"); attributes.setAttribute("showEvent", "mouseenter"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-02-10 09:35:53 UTC (rev 21584) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-02-10 09:58:22 UTC (rev 21585) @@ -24,7 +24,6 @@ import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES; import static javax.faces.event.PhaseId.RENDER_RESPONSE; import static javax.faces.event.PhaseId.RESTORE_VIEW; -import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES; import static org.jboss.test.selenium.dom.Event.CLICK; import static org.jboss.test.selenium.dom.Event.DBLCLICK; import static org.jboss.test.selenium.dom.Event.MOUSEDOWN; @@ -38,7 +37,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import java.net.URL; @@ -69,7 +67,7 @@ TooltipAttributes attributes = new TooltipAttributes(); JQueryLocator panel = pjq("div[id$=panel]"); - TooltipModel tooltip = new TooltipModel(panel.getChild(jq("* >.rf-tt")), panel); + TooltipModel tooltip = new TooltipModel(jq(".rf-tt"), panel); Point eventPosition; @@ -114,17 +112,25 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10282") public void testLifecycle() { attributes.setMode(TooltipMode.ajax); + retrieveRequestTime.initializeValue(); tooltip.recall(); + waitGui.waitForChange(retrieveRequestTime); phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES, RENDER_RESPONSE); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10285") + @IssueTracking("https://issues.jboss.org/browse/RF-10476") public void testData() { - fail("TODO needs comment "); + attributes.setData("RichFaces 4"); + attributes.setOncomplete("data = event.data"); + + retrieveRequestTime.initializeValue(); + tooltip.recall(); + waitGui.waitForChange(retrieveRequestTime); + + assertEquals(retrieveWindowData.retrieve(), "RichFaces 4"); } @Test @@ -132,7 +138,7 @@ super.testDir(tooltip); } - @Test + // ////@Test @Uses({ @Use(field = "direction", enumeration = true), @Use(field = "verticalOffset", value = "offsets"), @Use(field = "horizontalOffset", value = "offsets") }) public void testPositioning() { @@ -175,22 +181,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10283") - public void testDisabled() { - fail("TODO needs comment "); - } - - @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10333") - public void testExecute() { - attributes.setExecute("@this executeChecker"); - attributes.setMode(TooltipMode.ajax); - - tooltip.recall(); - phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker"); - } - - @Test @Use(field = "followMouse", booleans = { true, false }) public void testFollowMouse() { attributes.setFollowMouse(followMouse); @@ -234,7 +224,6 @@ attributes.setHideEvent("mouseup"); tooltip.recall(); - waitGui.until(isDisplayed.locator(tooltip)); selenium.mouseUpAt(panel, new Point(5, 5)); waitGui.until(isNotDisplayed.locator(tooltip)); @@ -259,17 +248,17 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10287") public void testLimitRender() { attributes.setLimitRender(true); attributes.setRender("@this renderChecker"); attributes.setMode(TooltipMode.ajax); retrieveRenderChecker.initializeValue(); + retrieveRequestTime.initializeValue(); tooltip.recall(); - - assertTrue(retrieveRenderChecker.isValueChanged()); + waitAjax.waitForChange(retrieveRenderChecker); + assertFalse(retrieveRequestTime.isValueChanged()); } @Test @@ -280,7 +269,6 @@ retrieveRequestTime.initializeValue(); tooltip.recall(); - waitAjax.until(isDisplayed.locator(tooltip)); assertEquals(retrieveRequestTime.isValueChanged(), mode == TooltipMode.ajax); retrieveRequestTime.initializeValue(); @@ -293,7 +281,6 @@ @Use(field = "domEvent", value = "domEvents") public void testDomEvents() { tooltip.recall(); - waitGui.until(isDisplayed.locator(tooltip)); testFireEvent(domEvent, tooltip); } @@ -339,8 +326,7 @@ retrieveStatusChecker.initializeValue(); tooltip.recall(); - assertTrue(retrieveStatusChecker.isValueChanged()); - + waitAjax.waitForChange(retrieveStatusChecker); } @Test @@ -359,7 +345,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10286") public void testZindex() { attributes.setZindex(10); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java 2011-02-10 09:35:53 UTC (rev 21584) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java 2011-02-10 09:58:22 UTC (rev 21585) @@ -28,9 +28,12 @@ import org.jboss.test.selenium.geometry.Point; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.request.RequestType; +import org.jboss.test.selenium.waiting.conditions.IsDisplayed; import org.richfaces.TooltipMode; import org.richfaces.tests.metamer.ftest.model.AbstractModel; +import static org.jboss.test.selenium.waiting.Wait.waitAjax; + /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ @@ -69,6 +72,7 @@ } else { guard(selenium, getRequestType()).mouseOverAt(target, new Point(x, y)); } + waitAjax().dontFail().interval(50).timeout(2000).until(IsDisplayed.getInstance().locator(this)); } public void hide() {

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r21584 - in trunk/examples/richfaces-showcase/src/main/webapp: richfaces/queue and 2 other directories.

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

Author: ilya_shaikovsky Date: 2011-02-10 04:35:53 -0500 (Thu, 10 Feb 2011) New Revision: 21584 Modified: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml Log: new design. Modified: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss 2011-02-10 06:56:41 UTC (rev 21583) +++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.ecss 2011-02-10 09:35:53 UTC (rev 21584) @@ -1,16 +1,17 @@ -* { - margin:0; - padding:0; -} html{ height:100%; } body{ + margin:0; + padding:0; background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat; font:normal 12px 'Lucida Sans Unicode, Lucida Grande, Geneva,Verdana,Arial,sans-serif'; height:100%; } -ul{ +fieldset{ + margin:0; +} +ul.layout{ list-style:none; } a{ @@ -56,6 +57,7 @@ background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat; color:#fff; padding:0 8px 0 3px; + font:11px 'Lucida Sans Unicode, Lucida Grande, Geneva,Verdana,Arial,sans-serif'; } #header ul.top-links li.last a{ background:none; @@ -83,7 +85,9 @@ height:25px; padding:3px 5px 0 0; display:inline-block; + font:normal 12px 'Lucida Sans Unicode, Lucida Grande, Geneva,Verdana,Arial,sans-serif'; } + #header ul#skin-menu li span:hover{ text-decoration:underline; } Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml 2011-02-10 06:56:41 UTC (rev 21583) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml 2011-02-10 09:35:53 UTC (rev 21584) @@ -19,9 +19,11 @@ <p>Pay attention to next point in the example:</p> <ul> - <li>Setting request delay to greater value reduces the greatly + <li>Setting <b>requestDelay</b> to greater value reduces the greatly requests count on fast typing. (More similar requests are combined in the result)</li> + <li>Setting requestDelay to smaller value(just for easier exploration) but using <b>ignoreDupResponse</b> flag set to true + - reduces greatly DOM updates count.</li> </ul> <p>Also pay your attention to the queue definition. Such definition (inside some form without a name) means that the queue options becomes Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2011-02-10 06:56:41 UTC (rev 21583) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2011-02-10 09:35:53 UTC (rev 21584) @@ -7,14 +7,11 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition> - <ul id="skin-menu"> + <ul id="skin-menu" class="layout"> <a4j:repeat var="skin" value="#{skinBean.skins}" iterationStatusVar="iterStatus"> <li class="#{(skin==skinBean.skin) ? 'current-skin' : ''}"><h:link - includeViewParams="true"> - <a4j:outputPanel> - #{skin} - </a4j:outputPanel> + includeViewParams="true"><a4j:outputPanel>#{skin}</a4j:outputPanel> <f:param name="skin" value="#{skin}" /> </h:link></li> </a4j:repeat> Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-10 06:56:41 UTC (rev 21583) +++ trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-10 09:35:53 UTC (rev 21584) @@ -26,7 +26,7 @@ <div id="header"> <a href="#" class="logo"><img src="#{facesContext.externalContext.requestContextPath}/images/rf-logo.png" alt="RF logo"/></a> <div class="right-controls"> - <ul class="top-links"> + <ul class="top-links layout"> <li><a href="http://jboss.org/richfaces;jsessionid=bJJO_UTMPzC7DsTvo5vjKA" target="_blank">Project Site</a></li> <li><a href="http://www.jboss.org/community/wiki/richfaceswikihomepage;jsessionid=bJJO..." target="_blank">Project Wiki</a></li> <li><a href="http://community.jboss.org/community/richfaces;jsessionid=bJJO_UTMPzC7DsT..." target="_blank">RichFaces Community Space</a></li>

15 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2011