Author: yradtsevich
Date: 2009-05-13 10:33:34 -0400 (Wed, 13 May 2009)
New Revision: 15242
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/main.css
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
Log:
Patch from Yura Zhishko (yzhishko) is applied: some JUnit tests are fixed.
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml 2009-05-13
14:15:09 UTC (rev 15241)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml 2009-05-13
14:33:34 UTC (rev 15242)
@@ -7,6 +7,7 @@
xmlns:rich="http://richfaces.org/rich">
<head>
+ <link rel="stylesheet" href="main.css"
type="text/css"/>
</head>
<body>
<h1>comboBox</h1>
@@ -48,5 +49,25 @@
<f:selectItem itemValue="suggestion 5" />
</rich:comboBox>
+<rich:panel styleClass="btn" id="complexCombo">
+ <f:facet name="header">
+ <h:outputText value="Combo Box"/>
+ </f:facet>
+ <form>
+ <rich:comboBox defaultLabel="Enter some value" width="150">
+ <f:selectItem itemValue="item 1"/>
+ <f:selectItem itemValue="item 2"/>
+ <f:selectItem itemValue="item 3"/>
+ <f:selectItem itemValue="item 4"/>
+ <f:selectItem itemValue="item 5" />
+ <f:selectItem itemValue="item 6" escape="false"/>
+ <f:selectItem itemValue="item 7" itemDisabled="true"/>
+ <f:selectItem itemValue="item 8" itemDescription="some
descriprion"/>
+ <f:selectItem itemValue="item 10"/>
+ <f:selectItem itemValue="item 11"/>
+ <f:selectItem itemValue="item 12"/>
+ </rich:comboBox>
+ </form>
+</rich:panel>
</body>
</html>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml.xml 2009-05-13
14:15:09 UTC (rev 15241)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/comboBox.xhtml.xml 2009-05-13
14:33:34 UTC (rev 15242)
@@ -34,7 +34,7 @@
<INPUT TYPE="text"
CLASS="rich-combobox-font-inactive rich-combobox-button-icon-inactive
rich-combobox-button-inactive"
READONLY="true" VPE-USER-TOGGLE-ID="0" />
- <DIV CLASS="rich-combobox-strut rich-combobox-font"
STYLE="width: 140px;">
+ <DIV CLASS="rich-combobox-strut rich-combobox-font" STYLE="width:
140px;">
Struts</DIV>
</DIV>
</DIV>
@@ -83,4 +83,41 @@
</DIV>
</DIV>
</test>
+ <test id="complexCombo">
+ <DIV CLASS="dr-pnl rich-panel btn">
+ <DIV CLASS="dr-pnl-h rich-panel-header"
+ STYLE="/background-image: url\(.*resources/common/background.gif\);/">
+ <SPAN CLASS="vpe-text">
+ Combo Box
+ </SPAN>
+ </DIV>
+ <DIV CLASS="dr-pnl-b rich-panel-body">
+ <FORM STYLE="-moz-user-modify: read-write;">
+ <DIV STYLE="width: 150px;">
+ <DIV STYLE="position: static; z-index: 0;">
+ <DIV CLASS="rich-combobox-font rich-combobox" STYLE="position:
static; z-index: 0;">
+ <DIV CLASS="rich-combobox-font rich-combobox-shell"
STYLE="width: 150px; z-index: 1;">
+ <INPUT TYPE="text"
+ CLASS="rich-combobox-font-disabled rich-combobox-input-inactive"
+ STYLE="width: 133px;" VALUE="Enter some value" />
+
+ <INPUT TYPE="text"
+ CLASS="rich-combobox-font-inactive rich-combobox-button-background
rich-combobox-button-inactive"
+ READONLY="true" VPE-USER-TOGGLE-ID="0" STYLE=""
/>
+
+ <INPUT TYPE="text"
+ CLASS="rich-combobox-font-inactive rich-combobox-button-icon-inactive
rich-combobox-button-inactive"
+ READONLY="true" VPE-USER-TOGGLE-ID="0" STYLE=""
/>
+
+ <DIV CLASS="rich-combobox-strut rich-combobox-font"
STYLE="width: 140px;">
+ Struts
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </FORM>
+ </DIV>
+ </DIV>
+ </test>
</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml 2009-05-13
14:15:09 UTC (rev 15241)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml 2009-05-13
14:33:34 UTC (rev 15242)
@@ -3,58 +3,83 @@
<SPAN VPE-USER-TOGGLE-ID="false" CLASS="rich-inplace
rich-inplace-view"
STYLE="display: inline;"> click to enter your name</SPAN>
</test>
- <!-- test id="inplaceInputWithoutFacet">
- <SPAN VPE-USER-TOGGLE-ID="true" CLASS="rich-inplace
rich-inplace-edit"
- STYLE="position: relative; display: inline;">
- <INPUT TYPE="text" VPE-USER-TOGGLE-ID="0"
CLASS="rich-inplace-field" STYLE="top: 0px; width: 66px;"
- AUTOCOMPLETE="off" VALUE="Mama mila ram"/>
- <DIV CLASS="rich-inplace-input-controls-set" STYLE="position:
absolute; top: 0px; left: 66px;">
- <DIV CLASS="rich-inplace-shadow">
- <TABLE CELLSPACING="0" CELLPADDING="0"
BORDER="0">
- <TBODY>
- <TR>
- <TD CLASS="rich-inplace-shadow-tl">
- <IMG WIDTH="10" HEIGHT="1"
BORDER="0" SRC="/.*resources/inplaceInput/spacer.gif/"/>
- </TD>
- <TD CLASS="rich-inplace-shadow-tr">
- <IMG WIDTH="1" HEIGHT="10"
BORDER="0" SRC="/.*resources/resources/inplaceInput/spacer.gif/"/>
- </TD>
- </TR>
- <TR>
- <TD CLASS="rich-inplace-shadow-bl">
- <IMG WIDTH="1" HEIGHT="10"
BORDER="0" SRC="/.*resources/inplaceInput/spacer.gif/"/>
- </TD>
- <TD CLASS="rich-inplace-shadow-br">
- <IMG WIDTH="10" HEIGHT="1"
BORDER="0" SRC="/.*resources/inplaceInput/spacer.gif/"/>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- <DIV STYLE="position: relative; height: 18px;">
- <INPUT TYPE="image" CLASS="rich-inplace-control"
- SRC="/.*resources/inplaceInput/applyButton.gif/"
VPE-USER-TOGGLE-ID="0"/>
- <INPUT TYPE="image" CLASS="rich-inplace-control"
- SRC="/.*resources/inplaceInput/cancelButton.gif/"
VPE-USER-TOGGLE-ID="0"/>
- </DIV>
- </DIV>
- </SPAN>
+ <!--
+ test id="inplaceInputWithoutFacet"> <SPAN
VPE-USER-TOGGLE-ID="true"
+ CLASS="rich-inplace rich-inplace-edit" STYLE="position: relative;
+ display: inline;"> <INPUT TYPE="text"
VPE-USER-TOGGLE-ID="0"
+ CLASS="rich-inplace-field" STYLE="top: 0px; width: 66px;"
+ AUTOCOMPLETE="off" VALUE="Mama mila ram"/> <DIV
+ CLASS="rich-inplace-input-controls-set" STYLE="position: absolute;
+ top: 0px; left: 66px;"> <DIV CLASS="rich-inplace-shadow">
<TABLE
+ CELLSPACING="0" CELLPADDING="0" BORDER="0">
<TBODY> <TR> <TD
+ CLASS="rich-inplace-shadow-tl"> <IMG WIDTH="10"
HEIGHT="1" BORDER="0"
+ SRC="/.*resources/inplaceInput/spacer.gif/"/> </TD> <TD
+ CLASS="rich-inplace-shadow-tr"> <IMG WIDTH="1"
HEIGHT="10" BORDER="0"
+ SRC="/.*resources/resources/inplaceInput/spacer.gif/"/> </TD>
</TR>
+ <TR> <TD CLASS="rich-inplace-shadow-bl"> <IMG
WIDTH="1" HEIGHT="10"
+ BORDER="0" SRC="/.*resources/inplaceInput/spacer.gif/"/>
</TD> <TD
+ CLASS="rich-inplace-shadow-br"> <IMG WIDTH="10"
HEIGHT="1" BORDER="0"
+ SRC="/.*resources/inplaceInput/spacer.gif/"/> </TD> </TR>
</TBODY>
+ </TABLE> </DIV> <DIV STYLE="position: relative; height:
18px;"> <INPUT
+ TYPE="image" CLASS="rich-inplace-control"
+ SRC="/.*resources/inplaceInput/applyButton.gif/"
+ VPE-USER-TOGGLE-ID="0"/> <INPUT TYPE="image"
+ CLASS="rich-inplace-control"
+ SRC="/.*resources/inplaceInput/cancelButton.gif/"
+ VPE-USER-TOGGLE-ID="0"/> </DIV> </DIV> </SPAN>
</test> <test
+ id="inplaceInputWithFacet"> <SPAN VPE-USER-TOGGLE-ID="true"
+ CLASS="rich-inplace rich-inplace-edit" STYLE="position: relative;
+ display: inline;"> <INPUT TYPE="text"
VPE-USER-TOGGLE-ID="0"
+ CLASS="rich-inplace-field" STYLE="top: 0px; width: 66px;"
+ AUTOCOMPLETE="off" VALUE="Mama mila ramu"/> <DIV
+ CLASS="rich-inplace-input-controls-set" STYLE="position: absolute;
+ top: 18px; left: 0px;"> <DIV STYLE="position: relative; height:
+ 18px;"> <DIV> <SPAN TITLE="h:panelGroup"
STYLE="-moz-user-modify:
+ read-write;" CLASS=""> <INPUT TYPE="button"
VALUE="Save"
+ STYLE="-moz-user-modify: read-only;"/> <INPUT TYPE="button"
+ VALUE="Cancel" STYLE="-moz-user-modify: read-only;"/>
</SPAN> </DIV>
+ </DIV> </DIV> </SPAN> </test
+ -->
+ <test id="inplaceInput1">
+ <DIV CLASS="dr-pnl rich-panel oddRow" STYLE="width: 240px;">
+ <DIV CLASS="dr-pnl-h rich-panel-header"
+ STYLE="/background-image: url\(.*resources/common/background.gif\);/">
+ <SPAN CLASS="vpe-text">
+ Person Info
+ </SPAN>
+ </DIV>
+ <DIV CLASS="dr-pnl-b rich-panel-body">
+ <TABLE BORDER="0" STYLE="-moz-user-modify: read-write;">
+ <TBODY>
+ <TR>
+ <TD>
+ <SPAN CLASS="vpe-text">
+ Name:
+ </SPAN>
+ </TD>
+ <TD>
+ <SPAN VPE-USER-TOGGLE-ID="false"
+ CLASS="rich-inplace rich-inplace-view btn" STYLE="display:
inline;">
+ click to enter your NamE
+ </SPAN>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <SPAN CLASS="vpe-text">
+ Email:
+ </SPAN>
+ </TD>
+ <TD>
+ <SPAN VPE-USER-TOGGLE-ID="false"
+ CLASS="rich-inplace rich-inplace-view evenRow" STYLE="display:
inline;">
+ click to enter your email
+ </SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </DIV>
</test>
- <test id="inplaceInputWithFacet">
- <SPAN VPE-USER-TOGGLE-ID="true" CLASS="rich-inplace
rich-inplace-edit"
- STYLE="position: relative; display: inline;">
- <INPUT TYPE="text" VPE-USER-TOGGLE-ID="0"
CLASS="rich-inplace-field" STYLE="top: 0px; width: 66px;"
- AUTOCOMPLETE="off" VALUE="Mama mila ramu"/>
- <DIV CLASS="rich-inplace-input-controls-set" STYLE="position:
absolute; top: 18px; left: 0px;">
- <DIV STYLE="position: relative; height: 18px;">
- <DIV>
- <SPAN TITLE="h:panelGroup"
STYLE="-moz-user-modify: read-write;" CLASS="">
- <INPUT TYPE="button" VALUE="Save"
STYLE="-moz-user-modify: read-only;"/>
- <INPUT TYPE="button" VALUE="Cancel"
STYLE="-moz-user-modify: read-only;"/>
- </SPAN>
- </DIV>
- </DIV>
- </DIV>
- </SPAN>
- </test-->
</tests>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/main.css
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/main.css
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/main.css 2009-05-13
14:33:34 UTC (rev 15242)
@@ -0,0 +1,40 @@
+.evenRow {
+ text-align: center;
+ background-color: green;
+ font-style: italic;
+
+}
+
+.oddRow{
+ text-align: right;
+ background-color: blue;
+ font-style: oblique;
+
+}
+
+.btn {
+ text-align: center;
+ color: DodgerBlue;
+ font-size: x-large;
+ font-style: italic;
+ background-color: Turquoise;
+ border-style: ridge;
+ border-color: DarkViolet;
+ text-decoration: overline;
+ font-weight: bolder;
+ border-width: thick;
+}
+
+
+.btn {
+
+}
+
+.vpe-text {
+ color:red;
+}
+
+#editor {
+ background-color: red;
+
+}
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2009-05-13
14:15:09 UTC (rev 15241)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2009-05-13
14:33:34 UTC (rev 15242)
@@ -33,7 +33,8 @@
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*resources/pickList/arrow_copy.gif/"/> Copy
+ SRC="/.*resources/pickList/arrow_remove.gif/" />
+ Remove
</DIV>
</DIV>
</DIV>
@@ -43,7 +44,8 @@
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*resources/pickList/arrow_remove.gif/"/> Remove
+ SRC="/.*resources/pickList/arrow_copy_all.gif/" />
+ Copy all
</DIV>
</DIV>
</DIV>
@@ -53,7 +55,8 @@
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*resources/pickList/arrow_remove_all.gif/"/> Remove All
+ SRC="/.*resources/pickList/arrow_copy.gif/" />
+ Copy
</DIV>
</DIV>
</DIV>
@@ -63,7 +66,8 @@
CLASS="rich-list-picklist-button">
<DIV CLASS="rich-list-picklist-button-content">
<IMG WIDTH="15" HEIGHT="15"
- SRC="/.*resources/pickList/arrow_copy_all.gif/"/> Copy all
+ SRC="/.*resources/pickList/arrow_remove_all.gif/" />
+ Remove All
</DIV>
</DIV>
</DIV>
@@ -75,12 +79,12 @@
CLASS="rich-picklist-body">
<TR>
<TD STYLE="border: 0px none ; padding: 0px;">
- <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
</TABLE>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
</TBODY>