JBoss Rich Faces SVN: r8700 - trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/ajaxSamples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-05-22 10:33:21 -0400 (Thu, 22 May 2008)
New Revision: 8700
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/ajaxSamples/rspanel.xcss
Log:
button styles corrected
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/ajaxSamples/rspanel.xcss
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/ajaxSamples/rspanel.xcss 2008-05-22 13:26:10 UTC (rev 8699)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/ajaxSamples/rspanel.xcss 2008-05-22 14:33:21 UTC (rev 8700)
@@ -19,7 +19,7 @@
}
.rsButton {
border-width:2px;
- border-style:solid;
+ border-style:outset;
}
.rsLabel {
font-size: 12px;
@@ -40,6 +40,7 @@
</u:selector>
<u:selector name=".rsButton">
+ <u:style name="background-image" value="none" />
<u:style name="background-color" skin="additionalBackgroundColor" />
<u:style name="border-color" skin="panelBorderColor" />
</u:selector>
16 years, 7 months
JBoss Rich Faces SVN: r8699 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces/dataGrid/examples and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-05-22 09:26:10 -0400 (Thu, 22 May 2008)
New Revision: 8699
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/examples/form.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/examples/difftypes.xhtml
Log:
layout correction
plugnskin feature described.
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2008-05-22 13:24:39 UTC (rev 8698)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2008-05-22 13:26:10 UTC (rev 8699)
@@ -81,4 +81,5 @@
filtering=richDataIterators, Table Filtering, \t/images/ico_TableFiltering.gif, \t\t/images/cn_TableFiltering.gif, dataTable.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataTable.html, \t\t\t\t\t/richfaces/filteringFeature.jsf
columns =richDataIterators, \t Columns, \t\t\t/images/ico_columns.gif, \t\t/images/cn_Columns.gif, columns.html, jbossrichfaces/freezone/docs/tlddoc/rich/columns.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/taglib/ColumnsTag.html, \t\t\t\t\t/richfaces/columns.jsf
fileUpload =richInputs, \t File Upload, \t\t/images/ico_FileUpload.gif, \t\t/images/cn_FileUpload.gif, fileUpload.html, jbossrichfaces/freezone/docs/tlddoc/rich/fileUpload.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIFileUpload.html, \t\t\t\t\t/richfaces/fileUpload.jsf
-StandardSkinning =richMisc, \t Standard Skinning, \t\t/images/ico_StandardComponentsSkinning.gif, \t\t/images/cn_StandardComponentsSkinning.gif, ArchitectureOverview.html#StControlsSkinning, jbossrichfaces/freezone/docs/tlddoc/rich/StandardSkinning.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/standardSkinning.jsf
\ No newline at end of file
+StandardSkinning =richMisc, \t Standard Skinning, \t\t/images/ico_StandardComponentsSkinning.gif, \t\t/images/cn_StandardComponentsSkinning.gif, ArchitectureOverview.html\#StControlsSkinning, jbossrichfaces/freezone/docs/tlddoc/rich/StandardSkinning.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/standardSkinning.jsf
+plugnskin =richMisc, \t Plug'n'Skin, \t\t/images/ico_plugnskin.gif, \t\t/images/cn_plugnskin.gif, ArchitectureOverview.html\#plugnskin, jbossrichfaces/freezone/docs/tlddoc/rich/plugnskin.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/plugnskin.jsf
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/examples/form.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/examples/form.xhtml 2008-05-22 13:24:39 UTC (rev 8698)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/examples/form.xhtml 2008-05-22 13:26:10 UTC (rev 8699)
@@ -7,7 +7,7 @@
<style>
.label{
font-weight:bold;
-}
+}
</style>
<rich:panel>
<f:facet name="header">
@@ -15,7 +15,7 @@
</f:facet>
<h:form>
<rich:dataGrid value="#{dataTableScrollerBean.allCars}" var="car" columns="3" elements="9">
- <rich:panel>
+ <rich:panel style="width:200px">
<f:facet name="header">
<h:outputText value="#{car.make} #{car.model}"></h:outputText>
</f:facet>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/examples/difftypes.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/examples/difftypes.xhtml 2008-05-22 13:24:39 UTC (rev 8698)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/examples/difftypes.xhtml 2008-05-22 13:26:10 UTC (rev 8699)
@@ -6,17 +6,17 @@
xmlns:rich="http://richfaces.org/rich">
<h:form>
- <h:panelGrid columns="3" columnClasses="tpanels,tpanels,tpanels" width="100%">
- <rich:simpleTogglePanel switchType="server" label="Server Switch Type" width="250px">
+ <h:panelGrid columns="3" width="100%" columnClasses="tpanels,tpanels,tpanels">
+ <rich:simpleTogglePanel switchType="server" label="Server Switch Type" height="90px">
The regular JSF form submission is processed during the changing mode between
showing and hidding the additional content.
</rich:simpleTogglePanel>
- <rich:simpleTogglePanel switchType="ajax" label="Ajax Switch Type" width="250px">
+ <rich:simpleTogglePanel switchType="ajax" label="Ajax Switch Type" height="90px">
This type allows to perform the partial view update instead of the
whole page reloading. You also can reRender other components
while the panel content is toggled.
</rich:simpleTogglePanel>
- <rich:simpleTogglePanel switchType="client" label="Client Switch Type" width="250px">
+ <rich:simpleTogglePanel switchType="client" label="Client Switch Type" height="90px">
The switching between showing and hiding the toggle panel content
performs on the client side.
</rich:simpleTogglePanel>
16 years, 7 months
JBoss Rich Faces SVN: r8698 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-05-22 09:24:39 -0400 (Thu, 22 May 2008)
New Revision: 8698
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml
Log:
layout correction
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml 2008-05-22 13:23:10 UTC (rev 8697)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/simpleTogglePanel/usage.xhtml 2008-05-22 13:24:39 UTC (rev 8698)
@@ -10,9 +10,8 @@
<style>
.tpanels {
width:33%;
- padding: 10px;
+ padding: 2px;
vertical-align:top;
- height:160px;
}
</style>
<p>SimpleTogglePanel represents a panel with a base text label at the top and additional
16 years, 7 months
JBoss Rich Faces SVN: r8697 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-05-22 09:23:10 -0400 (Thu, 22 May 2008)
New Revision: 8697
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml
Log:
layout correction
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml 2008-05-22 13:22:24 UTC (rev 8696)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml 2008-05-22 13:23:10 UTC (rev 8697)
@@ -31,13 +31,8 @@
<h:panelGrid columns="2" columnClasses="top">
<h:panelGroup>
<ui:include src="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
- </ui:include>
</h:panelGroup>
-
- <h:panelGroup>
- <div style="padding-left: 20px">
+ <h:panelGroup layout="block" style="padding-left: 20px">
<b>Details of usage</b>
<p>
Next attributes could be defined to manage simple built-in sorting:
@@ -62,9 +57,12 @@
use value "false" for this attribute.
</li>
</ul>
- </div>
</h:panelGroup>
</h:panelGrid>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
+ </ui:include>
+
</div>
</fieldset>
</ui:define>
16 years, 7 months
JBoss Rich Faces SVN: r8696 - trunk/samples/richfaces-demo/src/main/webapp/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-05-22 09:22:24 -0400 (Thu, 22 May 2008)
New Revision: 8696
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml 2008-05-22 13:20:44 UTC (rev 8695)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.xhtml 2008-05-22 13:22:24 UTC (rev 8696)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:rich="http://richfaces.org/rich">
<ui:composition template="/templates/main.xhtml">
- <ui:define name="title">RichFaces - Open Source Rich JSF Components - Stndard Components Skinning</ui:define>
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Standard Components Skinning</ui:define>
<ui:define name="body">
<ui:include src="/richfaces/standardSkinning/usage.xhtml"/>
16 years, 7 months
JBoss Rich Faces SVN: r8695 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: plugnskin and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-05-22 09:20:44 -0400 (Thu, 22 May 2008)
New Revision: 8695
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/snippets/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/snippets/panel.xcss
trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/usage.xhtml
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/snippets/snippet2.css
Log:
plugnskin feature described.
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/snippets/panel.xcss
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/snippets/panel.xcss (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/snippets/panel.xcss 2008-05-22 13:20:44 UTC (rev 8695)
@@ -0,0 +1,49 @@
+<?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=".rich-panel">
+ <u:style name="padding" value="0px" />
+ <u:style name="margin-bottom" value="5px" />
+ <u:style name="border-color" skin="newBorder" />
+ </u:selector>
+
+ <u:selector name=".rich-panel-header">
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="border-top" value="0px" />
+ <u:style name="border-right" value="0px" />
+ <u:style name="border-left" value="0px" />
+ <u:style name="border-color" skin="newBorder" />
+
+ <u:style name="background-position" value="0% 50%" />
+
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient">
+ <f:attribute name="valign" value="middle" />
+
+ <f:attribute name="gradientHeight" value="22px" />
+ <f:attribute name="baseColor" skin="headerBackgroundColor" />
+ <f:attribute name="gradientColor" skin="headerGradientColor" />
+ </f:resource>
+ </u:style>
+
+ <u:style name="padding" value="4px 4px 4px 14px" />
+ </u:selector>
+
+ <u:selector name=".rich-panel-body">
+ <u:style name="padding" value="10px 10px 10px 14px" />
+ <u:style name="background-position" value="0% -496px" />
+ <u:style name="background-repeat" value="repeat-x" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient">
+ <f:attribute name="valign" value="bottom" />
+ <f:attribute name="gradientType" value="plain" />
+ <f:attribute name="gradientColor" skin="intShadow" />
+ <f:attribute name="baseColor" skin="generalBackgroundColor" />
+
+ <f:attribute name="gradientHeight" value="4px" />
+ </f:resource>
+ </u:style>
+ </u:selector>
+</f:template>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/usage.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin/usage.xhtml 2008-05-22 13:20:44 UTC (rev 8695)
@@ -0,0 +1,92 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+ <style>
+ ul,ol {
+ font-size: 11px !important;
+ }
+ .viewsourcepanel {
+ padding:10px;
+ width:100%;
+ overflow:auto;
+ border-width:0;
+ }
+ .viewsourcebody {
+ padding:0;
+ }
+ </style>
+ <p>
+ Plug-n-Skin feature is designed to freely extend and override one of base
+ RichFaces skins. It allows to redefine the look of a set of components
+ by taking the base skin as basis and plugging-in custom styles.
+ </p>
+ <p>
+ You may freely create your own pluggable skin in a next way:
+ </p>
+ <ul>
+ <li>
+ <b>Create your new pluggable skins project with CDK</b> using
+ <i>mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk
+ -DarchetypeArtifactId=maven-archetype-plug-n-skin
+ -DarchetypeVersion=*RF-VERSION* -DartifactId=*ARTIFACT-ID*
+ -DgroupId=*GROUP-ID* -Dversion=*VERSION*</i> command from the
+ root folder of richfaces.
+ </li>
+ <li>
+ <b>Create new pluggable skin inside project</b> using
+ <i>mvn cdk:add-skin -Dname=*SKIN-NAME* -Dpackage=*SKIN-PACKAGE*</i>
+ from the folder created on the previous step.
+ </li>
+ </ul>
+ <p>
+ In the result you'll get new skin project.
+ </p>
+ <p class="note">
+ In order to check some other optional parameters for CDK commands and
+ more info about the feature in general - visit corresponding
+ developer guide section
+ and explore <b>Laguna</b> skin project in richfaces/samples svn.
+ </p>
+ <p>
+ Main files in the created pluggable skin project
+ <i>(createdSkinName\src\main\resources\META-INF\skins\ folder)</i> are:
+ </p>
+ <ul>
+ <li>
+ <b><createdSkinName>.skin.properties</b> which
+ should contains base parameters for the skin such as
+ <i>baseSkin</i>,
+ <i>generalStyleSheet</i>, <i>gradientType</i> and some others
+ and could contain skin parameters redefinitions for the skin.
+ </li>
+ <li>
+ <b><createdSkinName>.xcss</b> which defines all the components
+ xcss imports.
+ </li>
+ <li>
+ <b><createdSkinName>-ext.xcss</b> defines imports for standard skinning xcss files.
+ </li>
+ </ul>
+ <p>
+ All classes for all the components and standard skinning classes already
+ listed in corresponding imported xcss files. So you'll only need to fill them
+ with the properties you need.
+ </p>
+ <p>
+ Check for example classes defined in panel component xcss for Laguna skin:
+ </p>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">panel.xcss from laguna skin</legend>
+ <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody rich-laguna-panel-no-header">
+ <rich:insert src="/richfaces/plugnskin/snippets/panel.xcss" highlight="xhtml"/>
+ </rich:panel>
+ </fieldset>
+ </ui:define>
+</ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/plugnskin.xhtml 2008-05-22 13:20:44 UTC (rev 8695)
@@ -0,0 +1,20 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Plug'n'Skin Feature</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/plugnskin/usage.xhtml"/>
+ </rich:tab>
+ <ui:include src="/templates/include/tagInfo.xhtml">
+ <ui:param name="path" value="rich/plugnskin"/>
+ </ui:include>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/snippets/snippet2.css
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/snippets/snippet2.css 2008-05-22 13:14:58 UTC (rev 8694)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/snippets/snippet2.css 2008-05-22 13:20:44 UTC (rev 8695)
@@ -1,9 +1,9 @@
...
-rich-container select {
+.rich-container select {
//class content
}
-rich-container hr {
+.rich-container hr {
//class content
}
...
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8694 - trunk/test-applications/jsp/src/main/webapp/Paint2D.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-05-22 09:14:58 -0400 (Thu, 22 May 2008)
New Revision: 8694
Modified:
trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp
Log:
add submit onchange.
Modified: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2008-05-22 12:31:43 UTC (rev 8693)
+++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2008-05-22 13:14:58 UTC (rev 8694)
@@ -79,8 +79,7 @@
</h:inputText>
<h:outputText value="Rendered"></h:outputText>
- <h:selectBooleanCheckbox value="#{paint2D.rendered}">
- <a4j:support event="onclick" reRender="paint2dID"></a4j:support>
+ <h:selectBooleanCheckbox value="#{paint2D.rendered}" onchange="submit();">
</h:selectBooleanCheckbox>
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8693 - trunk/test-applications/seleniumTest/src/test/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-05-22 08:31:43 -0400 (Thu, 22 May 2008)
New Revision: 8693
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java
Log:
fixed some broken tests
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java 2008-05-22 12:26:38 UTC (rev 8692)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java 2008-05-22 12:31:43 UTC (rev 8693)
@@ -49,9 +49,8 @@
writeStatus("The sum has to be increased by 5 twice");
- clickById(addButtonId);
- clickById(addButtonId);
- delay(3000);
+ clickCommandAndWait(addButtonId);
+ clickCommandAndWait(addButtonId);
AssertValueEquals(sumElemId, "10");
writeStatus("The sum has to be increased by 5 twice again");
@@ -70,9 +69,8 @@
writeStatus("State is not saved between full submits. The sum always is 5");
- clickById(addButtonId);
- clickById(addButtonId);
- delay(3000);
+ clickCommandAndWait(addButtonId);
+ clickCommandAndWait(addButtonId);
AssertValueNotEquals(sumAjaxOnlyElemId, "10");
writeStatus("Ajax request! The sum has to be increased by 5 twice");
16 years, 7 months
JBoss Rich Faces SVN: r8692 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: toolTip and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-05-22 08:26:38 -0400 (Thu, 22 May 2008)
New Revision: 8692
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-398
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml 2008-05-22 12:18:22 UTC (rev 8691)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml 2008-05-22 12:26:38 UTC (rev 8692)
@@ -43,7 +43,7 @@
<li>
Several style classes are provided for different types of
elements. That style classes have predefined names. Application
- developer should manually assign classes to controls that needs
+ developer should manually assign classes to controls that need
skinning or assign class to an element that contains controls.
</li>
</ul>
@@ -60,10 +60,10 @@
</li>
</ol>
<p>
- Skinning level calculated automatically at server side depending on user agent info.
+ Skinning level is calculated automatically at server side depending on user agent info.
</p>
<p class="note">
- Extended skinning not applied to browsers having rich
+ Extended skinning is not applied to browsers having rich
visual styling for controls (e.g. Opera and Safari).
Also advanced level of skinning requires support of CSS 2 attribute selectors
either as implicit type attributes for button/textarea elements (e.g. IE7
@@ -76,7 +76,7 @@
</p>
<ul>
<li>
- <b>org.richfaces.CONTROL_SKINNING</b> context param set to <b>enabled</b> means that all
+ <b>org.richfaces.CONTROL_SKINNING</b> context param set to <b>enabled</b> means that all
standard elements on the page will be skinned. (CSS style classes for
elements based on their names and type attribute values will be applied)
</li>
@@ -87,12 +87,12 @@
</li>
<li>
Rich faces also provides predefined classes which can be applied by end developer
- to elements need to be skinned separately. This classes added to the page also
+ to elements need to be skinned separately. This classes added to the page also
according to <b>org.richfaces.CONTROL_SKINNING_CLASSES</b> context-param.
</li>
</ul>
<p>
- Using first way CSS with next definitions will be automatically added to pages:
+ Using first way CSS with the next definitions will be automatically added to pages:
</p>
<fieldset class="demo_fieldset">
<legend class="demo_legend">CSS for standard elements snippet</legend>
@@ -101,7 +101,7 @@
</rich:panel>
</fieldset>
<p>
- And using the second way next CSS will influence corresponding elements:
+ And using the second way the next CSS will influence corresponding elements:
</p>
<fieldset class="demo_fieldset">
<legend class="demo_legend">CSS for standard elements inside rich container snippet</legend>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml 2008-05-22 12:18:22 UTC (rev 8691)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/usage.xhtml 2008-05-22 12:26:38 UTC (rev 8692)
@@ -9,7 +9,7 @@
<ui:define name="sample">
<p>
- ToolTip is a little non-modal pop-up that could be used to display additional information, that is usually hidden.<br/>
+ ToolTip is a small non-modal pop-up that could be used to display additional information, that is usually hidden.<br/>
Major toolTip features:
</p>
16 years, 7 months
JBoss Rich Faces SVN: r8691 - in trunk/test-applications/seleniumTest/src: main/java/org/ajax4jsf/model and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-22 08:18:22 -0400 (Thu, 22 May 2008)
New Revision: 8691
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java
Log:
update dataTable Test
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java 2008-05-22 12:02:24 UTC (rev 8690)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java 2008-05-22 12:18:22 UTC (rev 8691)
@@ -15,6 +15,10 @@
private int rows = 20;
private int column = 3;
+
+ private int begin = 1;
+
+ private int end = 10;
private List model;
@@ -46,7 +50,7 @@
columns = new ArrayList();
for (int i = 0; i < column; i++) {
- columns.add(new Column("Header_" + i,"Footer_" + i));
+ columns.add(new Column("header","footer", i));
}
}
@@ -124,4 +128,32 @@
this.ordering = ordering;
}
+ /**
+ * @return the begin
+ */
+ public int getBegin() {
+ return begin;
+ }
+
+ /**
+ * @param begin the begin to set
+ */
+ public void setBegin(int begin) {
+ this.begin = begin;
+ }
+
+ /**
+ * @return the end
+ */
+ public int getEnd() {
+ return end;
+ }
+
+ /**
+ * @param end the end to set
+ */
+ public void setEnd(int end) {
+ this.end = end;
+ }
+
}
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java 2008-05-22 12:02:24 UTC (rev 8690)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java 2008-05-22 12:18:22 UTC (rev 8691)
@@ -4,6 +4,8 @@
public class Column {
+ private int i;
+
private String header;
private String footer;
@@ -15,8 +17,9 @@
* @param header
* @param footer
*/
- public Column(String header, String footer) {
+ public Column(String header, String footer, int i) {
super();
+ this.i = i;
this.header = header;
this.footer = footer;
}
@@ -25,7 +28,7 @@
* @return the header
*/
public String getHeader() {
- return header;
+ return header + i;
}
/**
@@ -39,7 +42,7 @@
* @return the footer
*/
public String getFooter() {
- return footer;
+ return footer + i;
}
/**
@@ -62,6 +65,20 @@
public void setOrdering(Ordering ordering) {
this.ordering = ordering;
}
+
+ /**
+ * @return the i
+ */
+ public int getI() {
+ return i;
+ }
+
+ /**
+ * @param i the i to set
+ */
+ public void setI(int i) {
+ this.i = i;
+ }
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-05-22 12:02:24 UTC (rev 8690)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-05-22 12:18:22 UTC (rev 8691)
@@ -26,22 +26,42 @@
<h:inputText id="column" value="#{dataTableBean.column}"></h:inputText>
</td>
</tr>
+ <tr>
+ <td>
+ Begin:
+ </td>
+ <td>
+ <h:inputText id="begin" value="#{dataTableBean.begin}"></h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ End:
+ </td>
+ <td>
+ <h:inputText id="end" value="#{dataTableBean.end}"></h:inputText>
+ </td>
+ </tr>
</table>
<a4j:commandLink value="Apply" id="apply" actionListener="#{dataTableBean.init}" reRender="table, date"></a4j:commandLink>
</h:form>
<h:form id="_form">
- <h:outputText id="date" value="#{dataTableBean.date}"></h:outputText>
+ <h:outputText id="date" value="#{dataTableBean.date}"></h:outputText>
<rich:dataTable value="#{dataTableBean.model}" id="table" var="var">
- <rich:columns value="#{dataTableBean.columns}" var="col" index="i" sortBy="#{var[i]}" sortOrder="#{col.ordering}">
+ <rich:columns
+ end="#{dataTableBean.end}"
+ begin="#{dataTableBean.begin}"
+ value="#{dataTableBean.columns}"
+ var="col" index="i" sortBy="#{var[i]}" sortOrder="#{col.ordering}">
<f:facet name="header">
- <h:outputText value="header"></h:outputText>
+ <h:outputText value="#{col.header}"></h:outputText>
</f:facet>
<f:facet name="footer">
- <h:outputText value="footer"></h:outputText>
+ <h:outputText value="#{col.footer}"></h:outputText>
</f:facet>
<h:inputText value="#{var[i]}"></h:inputText>
- <h:outputText value="#{var[i]}"></h:outputText>
+ <h:outputText value="#{col.i}"></h:outputText>
</rich:columns>
</rich:dataTable>
<br/>
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java 2008-05-22 12:02:24 UTC (rev 8690)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java 2008-05-22 12:18:22 UTC (rev 8691)
@@ -52,116 +52,144 @@
writeStatus("Check rows count equals to 22 ");
assertRowsCount(22, dataTableId);
+ String columnsId = getColumnId(dataTableId, 0);
+
writeStatus("Check inputs' values ");
- assertInputValue(dataTableId, 0, "j_id13", "0");
- assertInputValue(dataTableId, 5, "j_id13", "5");
- assertInputValue(dataTableId, 19, "j_id13", "19");
+ assertInputValue(dataTableId, 0, columnsId, "0");
+ assertInputValue(dataTableId, 5, columnsId, "5");
+ assertInputValue(dataTableId, 19, columnsId, "19");
- assertInputValue(dataTableId, 0, "j_id18", "1");
- assertInputValue(dataTableId, 7, "j_id18", "8");
- assertInputValue(dataTableId, 19, "j_id18", "20");
+ columnsId = getColumnId(dataTableId, 1);
- assertInputValue(dataTableId, 0, "j_id23", "2");
- assertInputValue(dataTableId, 11, "j_id23", "13");
- assertInputValue(dataTableId, 19, "j_id23", "21");
+ assertInputValue(dataTableId, 0, columnsId, "1");
+ assertInputValue(dataTableId, 7, columnsId, "8");
+ assertInputValue(dataTableId, 19, columnsId, "20");
+ columnsId = getColumnId(dataTableId, 2);
+
+ assertInputValue(dataTableId, 0, columnsId, "2");
+ assertInputValue(dataTableId, 11, columnsId, "13");
+ assertInputValue(dataTableId, 19, columnsId, "21");
+
writeStatus("Insert some values ");
- insertInputValue(dataTableId, 0, "j_id13", "000");
- insertInputValue(dataTableId, 19, "j_id23", "777");
+ insertInputValue(dataTableId, 0, getColumnId(dataTableId, 0), "000");
+ insertInputValue(dataTableId, 19, getColumnId(dataTableId, 2), "777");
writeStatus("Rerender table");
clickById("_form:submit");
waitForAjaxCompletion();
writeStatus("Check values entered ");
- assertInputValue(dataTableId, 0, "j_id13", "000");
- assertInputValue(dataTableId, 19, "j_id23", "777");
+ assertInputValue(dataTableId, 0, getColumnId(dataTableId, 0), "000");
+ assertInputValue(dataTableId, 19, getColumnId(dataTableId, 2), "777");
+ columnsId = getColumnId(dataTableId, 0);
+
writeStatus("Sort ASC by 1'st column ");
- sortColumn(dataTableId, "j_id13");
+ sortColumn(dataTableId, columnsId);
writeStatus("Check ordering");
- assertInputValue(dataTableId, 0, "j_id13", "000");
- assertInputValue(dataTableId, 1, "j_id13", "1");
- assertInputValue(dataTableId, 18, "j_id13", "8");
- assertInputValue(dataTableId, 19, "j_id13", "9");
+ assertInputValue(dataTableId, 0, columnsId, "000");
+ assertInputValue(dataTableId, 1, columnsId, "1");
+ assertInputValue(dataTableId, 18, columnsId, "8");
+ assertInputValue(dataTableId, 19, columnsId, "9");
writeStatus("Sort DESC by 1'st column ");
- sortColumn(dataTableId, "j_id13");
+ sortColumn(dataTableId, columnsId);
writeStatus("Check ordering");
- assertInputValue(dataTableId, 0, "j_id13", "9");
- assertInputValue(dataTableId, 1, "j_id13", "8");
- assertInputValue(dataTableId, 18, "j_id13", "1");
- assertInputValue(dataTableId, 19, "j_id13", "000");
+ assertInputValue(dataTableId, 0, columnsId, "9");
+ assertInputValue(dataTableId, 1, columnsId, "8");
+ assertInputValue(dataTableId, 18, columnsId, "1");
+ assertInputValue(dataTableId, 19, columnsId, "000");
- writeStatus("Sort ASC by 1'st column ");
- sortColumn(dataTableId, "j_id23");
+ columnsId = getColumnId(dataTableId, 2);
+
+ writeStatus("Sort ASC by 3'st column ");
+ sortColumn(dataTableId, columnsId);
writeStatus("Check ordering");
- assertInputValue(dataTableId, 0, "j_id23", "10");
- assertInputValue(dataTableId, 1, "j_id23", "11");
- assertInputValue(dataTableId, 18, "j_id23", "8");
- assertInputValue(dataTableId, 19, "j_id23", "9");
+ assertInputValue(dataTableId, 0, columnsId, "10");
+ assertInputValue(dataTableId, 1, columnsId, "11");
+ assertInputValue(dataTableId, 18, columnsId, "8");
+ assertInputValue(dataTableId, 19, columnsId, "9");
writeStatus("Set columns count == 5, rows count == 10");
- changeColumnCount(10, 5);
+ changeColumnCount(10, 5, 0 ,100);
- String lastColumnId = getLastColumnId(dataTableId, 5);
-
+
writeStatus("Check columns count equals to 5 ");
assertColumnsCount(5, dataTableId);
writeStatus("Check rows count equals to 12 ");
assertRowsCount(12, dataTableId);
+ columnsId = getColumnId(dataTableId, 0);
+
writeStatus("Check inputs' values ");
- assertInputValue(dataTableId, 0, "j_id13", "0");
- assertInputValue(dataTableId, 5, "j_id13", "5");
- assertInputValue(dataTableId, 9, "j_id13", "9");
+ assertInputValue(dataTableId, 0, columnsId, "0");
+ assertInputValue(dataTableId, 5, columnsId, "5");
+ assertInputValue(dataTableId, 9, columnsId, "9");
- assertInputValue(dataTableId, 0, "j_id18", "1");
- assertInputValue(dataTableId, 7, "j_id18", "8");
- assertInputValue(dataTableId, 9, "j_id18", "10");
+ columnsId = getColumnId(dataTableId, 1);
- assertInputValue(dataTableId, 0, lastColumnId, "4");
- assertInputValue(dataTableId, 2, lastColumnId, "6");
- assertInputValue(dataTableId, 9, lastColumnId, "13");
+ assertInputValue(dataTableId, 0, columnsId, "1");
+ assertInputValue(dataTableId, 7, columnsId, "8");
+ assertInputValue(dataTableId, 9, columnsId, "10");
+ columnsId = getColumnId(dataTableId, 4);
+
+ assertInputValue(dataTableId, 0, columnsId, "4");
+ assertInputValue(dataTableId, 2, columnsId, "6");
+ assertInputValue(dataTableId, 9, columnsId, "13");
+
writeStatus("Sort ASC by the last column ");
- sortColumn(dataTableId, lastColumnId);
+ sortColumn(dataTableId, columnsId);
writeStatus("Check ordering");
- assertInputValue(dataTableId, 0, lastColumnId, "10");
- assertInputValue(dataTableId, 2, lastColumnId, "12");
- assertInputValue(dataTableId, 9, lastColumnId, "9");
+ assertInputValue(dataTableId, 0, columnsId, "10");
+ assertInputValue(dataTableId, 2, columnsId, "12");
+ assertInputValue(dataTableId, 9, columnsId, "9");
writeStatus("Sort DESC by the last column ");
- sortColumn(dataTableId, lastColumnId);
+ sortColumn(dataTableId, columnsId);
writeStatus("Check ordering");
- assertInputValue(dataTableId, 0, lastColumnId, "9");
- assertInputValue(dataTableId, 2, lastColumnId, "7");
- assertInputValue(dataTableId, 9, lastColumnId, "10");
+ assertInputValue(dataTableId, 0, columnsId, "9");
+ assertInputValue(dataTableId, 2, columnsId, "7");
+ assertInputValue(dataTableId, 9, columnsId, "10");
+ columnsId = getColumnId(dataTableId, 2);
writeStatus("Sort ASC by the 3d column ");
- sortColumn(dataTableId, "j_id23");
+ sortColumn(dataTableId, columnsId);
writeStatus("Check ordering");
- assertInputValue(dataTableId, 0, "j_id23", "10");
- assertInputValue(dataTableId, 2, "j_id23", "2");
- assertInputValue(dataTableId, 9, "j_id23", "9");
+ assertInputValue(dataTableId, 0, columnsId, "10");
+ assertInputValue(dataTableId, 2, columnsId, "2");
+ assertInputValue(dataTableId, 9, columnsId, "9");
+ changeColumnCount(2, 5, 2 ,2);
+ assertColumnsCount(1, dataTableId);
+ assertRowsCount(4, dataTableId);
+ changeColumnCount(10, 5, 10 ,0);
+ assertRowsCount(0, dataTableId);
+
+
+
}
- private String getLastColumnId (String tableId, int columnsCount) {
- String script = "$('"+tableId+"').rows[0].cells["+String.valueOf(columnsCount - 1)+"].id";
+ private String getColumnId (String tableId, int i) {
+ String script = "$('"+tableId+"').rows[0].cells["+String.valueOf(i)+"].id";
String id = runScript(script);
id = id.replace(tableId + ":", "");
id = id.replace("header", "");
return id;
}
- private void changeColumnCount(int rows, int columns) {
+ private void changeColumnCount(int rows, int columns, int begin, int end) {
String script = "$('_controls:rows').value='" + String.valueOf(rows) + "';";
runScript(script);
script = "$('_controls:column').value='" + String.valueOf(columns) + "';";
runScript(script);
+ script = "$('_controls:begin').value='" + String.valueOf(begin) + "';";
+ runScript(script);
+ script = "$('_controls:end').value='" + String.valueOf(end) + "';";
+ runScript(script);
clickById("_controls:apply");
waitForAjaxCompletion();
}
@@ -185,6 +213,7 @@
Assert.assertEquals(runScript(script), value);
}
+
private void assertColumnsCount(int i, String tableId) {
StringBuffer script = new StringBuffer("$('");
script.append(tableId);
16 years, 7 months