JBoss Rich Faces SVN: r8680 - trunk/ui/modal-panel/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-21 12:29:08 -0400 (Wed, 21 May 2008)
New Revision: 8680
Modified:
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-3480
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-05-21 16:01:46 UTC (rev 8679)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-05-21 16:29:08 UTC (rev 8680)
@@ -223,6 +223,10 @@
<name>valid</name>
<description>valid</description>
</property>
+ <property hidden="true">
+ <name>valueChangeListener</name>
+ <description>valueChangeListener</description>
+ </property>
<property>
<name>onmaskclick</name>
<classname>java.lang.String</classname>
16 years, 7 months
JBoss Rich Faces SVN: r8679 - in trunk/test-applications/jsp/src/main: webapp/PanelBar and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-05-21 12:01:46 -0400 (Wed, 21 May 2008)
New Revision: 8679
Modified:
trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java
trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp
trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java 2008-05-21 15:56:06 UTC (rev 8678)
+++ trunk/test-applications/jsp/src/main/java/panelBar/PanelBar.java 2008-05-21 16:01:46 UTC (rev 8679)
@@ -1,11 +1,15 @@
package panelBar;
+import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
+import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlPanelBar;
+import javax.faces.application.Application;
public class PanelBar {
private String width;
-
+ private HtmlPanelBar panelBar;
private String height;
private String contentStyle;
private String style=null;
@@ -26,6 +30,14 @@
//headerStyle=null;
}
+ public void actionListener(ActionEvent e) {
+ //Application application = FacesContext.getCurrentInstance().getApplication();
+ String pId = panelBar.getId();
+ if(pId != null){
+ System.out.println("Binding test passed. PanelBar ID = " + pId);
+ }
+ }
+
public void doStyles()
{
if (getContentStyle() == null) {
@@ -150,4 +162,12 @@
setHeight("400px");
setLabel(new String [] {"Test5", "Test 5", "Test_5", "Test-5"});
}
+
+ public HtmlPanelBar getPanelBar() {
+ return panelBar;
+ }
+
+ public void setPanelBar(HtmlPanelBar panelBar) {
+ this.panelBar = panelBar;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2008-05-21 15:56:06 UTC (rev 8678)
+++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2008-05-21 16:01:46 UTC (rev 8679)
@@ -4,32 +4,43 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="panelBarSubviewID">
- <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}"
- styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="#{event.onclick}" onitemchange="#{event.onitemchange}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}">
- <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}"
- headerClass="#{panelBar.headerStyle}">
- <h:outputText value="Some text..."></h:outputText>
- <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
- </rich:panelBarItem>
+ <rich:panelBar binding="#{panelBar.panelBar}" id="pBId" height="#{panelBar.height}"
+ width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}"
+ styleClass="#{panelBar.style}" selectedPanel="pBiId4"
+
+ onclick="#{event.onclick}" onitemchange="#{event.onitemchange}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}">
+ <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1"
+ label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}">
+ <h:outputText value="Some text..."></h:outputText>
+ <h:outputLink value="http://www.jboss.com/">
+ <f:verbatim>Link</f:verbatim>
+ </h:outputLink>
+ </rich:panelBarItem>
- <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}" headerClass="#{panelBar.headerStyle}">
- <h:graphicImage value="/pics/masshtaby_01.jpg" width="300" height="200"></h:graphicImage>
- </rich:panelBarItem>
+ <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}"
+ headerClass="#{panelBar.headerStyle}">
+ <h:graphicImage value="/pics/masshtaby_01.jpg" width="300"
+ height="200"></h:graphicImage>
+ </rich:panelBarItem>
- <rich:panelBarItem id="pBiId3" label="#{panelBar.label[2]}" headerClass="#{panelBar.headerStyle}">
- <f:facet name="openMarker">
- <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage>
- </f:facet>
- <f:facet name="closeMarker">
- <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage>
- </f:facet>
- <h:graphicImage value="/pics/podb109_61.jpg" width="300" height="200"></h:graphicImage>
- </rich:panelBarItem>
+ <rich:panelBarItem id="pBiId3" label="#{panelBar.label[2]}"
+ headerClass="#{panelBar.headerStyle}">
+ <f:facet name="openMarker">
+ <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage>
+ </f:facet>
+ <f:facet name="closeMarker">
+ <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage>
+ </f:facet>
+ <h:graphicImage value="/pics/podb109_61.jpg" width="300" height="200"></h:graphicImage>
+ </rich:panelBarItem>
- <rich:panelBarItem id="pBiId4" label="#{panelBar.label[3]}" headerClass="#{panelBar.headerStyle}">
- <h:outputText value="Select Panel"></h:outputText>
- </rich:panelBarItem>
- </rich:panelBar>
+ <rich:panelBarItem id="pBiId4" label="#{panelBar.label[3]}"
+ headerClass="#{panelBar.headerStyle}">
+ <h:outputText value="Select Panel"></h:outputText>
+ </rich:panelBarItem>
+ </rich:panelBar>
- <rich:spacer height="20px"></rich:spacer>
+ <rich:spacer height="20px"></rich:spacer>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2008-05-21 15:56:06 UTC (rev 8678)
+++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2008-05-21 16:01:46 UTC (rev 8679)
@@ -27,5 +27,8 @@
<h:outputText value="Switch Styles:" />
<h:commandButton action="#{panelBar.doStyles}" value="#{panelBar.btnLabel}" />
+
+ <h:outputText value="Binding test:" />
+ <a4j:commandButton value="Go" actionListener="#{panelBar.actionListener}"></a4j:commandButton>
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8678 - in trunk/test-applications/seleniumTest/src: main/webapp/pages/dataTable and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-21 11:56:06 -0400 (Wed, 21 May 2008)
New Revision: 8678
Added:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
Log:
dataTable test completed
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-21 15:02:25 UTC (rev 8677)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java 2008-05-21 15:56:06 UTC (rev 8678)
@@ -14,7 +14,7 @@
private int rows = 20;
- private int column = 1;
+ private int column = 3;
private List model;
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-21 15:02:25 UTC (rev 8677)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-05-21 15:56:06 UTC (rev 8678)
@@ -9,25 +9,43 @@
<ui:composition template="#{templateBean.template}">
<ui:define name="component">
<h:form id="_controls">
- <a4j:commandLink value="Rerender" id="apply2" reRender="table1, date"></a4j:commandLink>
+ <table>
+ <tr>
+ <td>
+ Rows:
+ </td>
+ <td>
+ <h:inputText id="rows" value="#{dataTableBean.rows}"></h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Columns:
+ </td>
+ <td>
+ <h:inputText id="column" value="#{dataTableBean.column}"></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>
- <rich:dataTable value="#{dataTableBean.model}" id="table1" var="var">
- <rich:column sortBy="#{var[0]}" sortOrder="#{dataTableBean.ordering}">
+ <rich:dataTable value="#{dataTableBean.model}" id="table" var="var">
+ <rich:columns value="#{dataTableBean.columns}" var="col" index="i" sortBy="#{var[i]}" sortOrder="#{col.ordering}">
<f:facet name="header">
<h:outputText value="header"></h:outputText>
</f:facet>
<f:facet name="footer">
<h:outputText value="footer"></h:outputText>
</f:facet>
- <h:inputText value="#{var[0]}"></h:inputText>
- <h:outputText value="#{var[0]}"></h:outputText>
- </rich:column>
+ <h:inputText value="#{var[i]}"></h:inputText>
+ <h:outputText value="#{var[i]}"></h:outputText>
+ </rich:columns>
</rich:dataTable>
<br/>
-
+ <a4j:commandLink value="Submit" id="submit" reRender="table, date"></a4j:commandLink>
</h:form>
</ui:define>
Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-05-21 15:02:25 UTC (rev 8677)
+++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-05-21 15:56:06 UTC (rev 8678)
@@ -133,6 +133,7 @@
* @param message
*/
public void writeStatus(String message) {
+ message = message.replace("'", "\\'");
StringBuffer buffer = new StringBuffer("writeStatus('");
buffer.append(message);
buffer.append("')");
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DataTableTest.java 2008-05-21 15:56:06 UTC (rev 8678)
@@ -0,0 +1,206 @@
+package org.richfaces;
+
+import org.ajax4jsf.test.base.RichSeleniumTest;
+import org.ajax4jsf.test.base.SeleniumTestBase;
+import org.ajax4jsf.test.base.Templates;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+public class DataTableTest extends SeleniumTestBase implements RichSeleniumTest {
+
+ public DataTableTest() {
+ super("http", "localhost", "8080");
+ }
+
+ /**
+ * This method are invoking before selenium tests started
+ */
+ @BeforeTest
+ @Parameters( { "browser" })
+ public void startSelenium(String browser) {
+ super.startSelenium(browser);
+ }
+
+ /**
+ * This method are invoking after selenium tests completed
+ */
+ @AfterTest
+ public void stopSelenium() {
+ super.stopSelenium();
+ }
+
+ public String getTestUrl() {
+ return "/faces/pages/dataTable/dataTableTest.xhtml";
+ }
+
+ @Test
+ public void testDataTable() {
+ _testDataTable(Templates.SIMPLE);
+ }
+
+ private void _testDataTable(Templates template) {
+ renderPage(getTestUrl(), template);
+
+ String parentId = getParentId() + "_form:";
+ String dataTableId = parentId + "table";
+
+ writeStatus("Check columns count equals to 3 ");
+ assertColumnsCount(3, dataTableId);
+ writeStatus("Check rows count equals to 22 ");
+ assertRowsCount(22, dataTableId);
+
+ 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, "j_id18", "1");
+ assertInputValue(dataTableId, 7, "j_id18", "8");
+ assertInputValue(dataTableId, 19, "j_id18", "20");
+
+ assertInputValue(dataTableId, 0, "j_id23", "2");
+ assertInputValue(dataTableId, 11, "j_id23", "13");
+ assertInputValue(dataTableId, 19, "j_id23", "21");
+
+ writeStatus("Insert some values ");
+ insertInputValue(dataTableId, 0, "j_id13", "000");
+ insertInputValue(dataTableId, 19, "j_id23", "777");
+
+ writeStatus("Rerender table");
+ clickById("_form:submit");
+ waitForAjaxCompletion();
+
+ writeStatus("Check values entered ");
+ assertInputValue(dataTableId, 0, "j_id13", "000");
+ assertInputValue(dataTableId, 19, "j_id23", "777");
+
+ writeStatus("Sort ASC by 1'st column ");
+ sortColumn(dataTableId, "j_id13");
+ 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");
+
+ writeStatus("Sort DESC by 1'st column ");
+ sortColumn(dataTableId, "j_id13");
+ 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");
+
+ writeStatus("Sort ASC by 1'st column ");
+ sortColumn(dataTableId, "j_id23");
+ 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");
+
+ writeStatus("Set columns count == 5, rows count == 10");
+ changeColumnCount(10, 5);
+
+ 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);
+
+ 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, "j_id18", "1");
+ assertInputValue(dataTableId, 7, "j_id18", "8");
+ assertInputValue(dataTableId, 9, "j_id18", "10");
+
+ assertInputValue(dataTableId, 0, lastColumnId, "4");
+ assertInputValue(dataTableId, 2, lastColumnId, "6");
+ assertInputValue(dataTableId, 9, lastColumnId, "13");
+
+ writeStatus("Sort ASC by the last column ");
+ sortColumn(dataTableId, lastColumnId);
+ writeStatus("Check ordering");
+ assertInputValue(dataTableId, 0, lastColumnId, "10");
+ assertInputValue(dataTableId, 2, lastColumnId, "12");
+ assertInputValue(dataTableId, 9, lastColumnId, "9");
+
+ writeStatus("Sort DESC by the last column ");
+ sortColumn(dataTableId, lastColumnId);
+ writeStatus("Check ordering");
+ assertInputValue(dataTableId, 0, lastColumnId, "9");
+ assertInputValue(dataTableId, 2, lastColumnId, "7");
+ assertInputValue(dataTableId, 9, lastColumnId, "10");
+
+ writeStatus("Sort ASC by the 3d column ");
+ sortColumn(dataTableId, "j_id23");
+
+ writeStatus("Check ordering");
+ assertInputValue(dataTableId, 0, "j_id23", "10");
+ assertInputValue(dataTableId, 2, "j_id23", "2");
+ assertInputValue(dataTableId, 9, "j_id23", "9");
+
+
+ }
+
+ private String getLastColumnId (String tableId, int columnsCount) {
+ String script = "$('"+tableId+"').rows[0].cells["+String.valueOf(columnsCount - 1)+"].id";
+ String id = runScript(script);
+ id = id.replace(tableId + ":", "");
+ id = id.replace("header", "");
+ return id;
+ }
+
+ private void changeColumnCount(int rows, int columns) {
+ String script = "$('_controls:rows').value='" + String.valueOf(rows) + "';";
+ runScript(script);
+ script = "$('_controls:column').value='" + String.valueOf(columns) + "';";
+ runScript(script);
+ clickById("_controls:apply");
+ waitForAjaxCompletion();
+ }
+
+ private void sortColumn(String tableId, String columnId) {
+ clickById(tableId + ":" + columnId + "header");
+ waitForAjaxCompletion();
+ }
+
+
+ private void insertInputValue(String tableId, int row, String inputId, String value) {
+ String id = tableId + ":"+row+":"+inputId;
+ String script = ("$('" + id + "').firstChild.value='" + value + "';");
+ runScript(script);
+ }
+
+
+ private void assertInputValue(String tableId, int row, String inputId, String value) {
+ String id = tableId + ":"+row+":"+inputId;
+ String script = "$('" + id + "').firstChild.value";
+ Assert.assertEquals(runScript(script), value);
+ }
+
+ private void assertColumnsCount(int i, String tableId) {
+ StringBuffer script = new StringBuffer("$('");
+ script.append(tableId);
+ script.append("').rows[0].cells.length");
+
+ String count = runScript(script.toString());
+ Assert.assertEquals(count, String.valueOf(i));
+ }
+
+ private void assertRowsCount(int i, String tableId) {
+ StringBuffer script = new StringBuffer("$('");
+ script.append(tableId);
+ script.append("').rows.length");
+
+ String count = runScript(script.toString());
+ Assert.assertEquals(count, String.valueOf(i));
+ }
+
+}
16 years, 7 months
JBoss Rich Faces SVN: r8677 - trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-21 11:02:25 -0400 (Wed, 21 May 2008)
New Revision: 8677
Modified:
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss
trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss
Log:
http://jira.jboss.com/jira/browse/RF-3494
Modified: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss
===================================================================
--- trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2008-05-21 15:02:19 UTC (rev 8676)
+++ trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2008-05-21 15:02:25 UTC (rev 8677)
@@ -54,11 +54,21 @@
<u:selector name="*|button[disabled]">
<u:style name="color" skin="tabDisabledTextColor" />
+ <u:style name="border-color" skin="tableFooterBackgroundColor" />
+ <u:style name="background-color" skin="tableFooterBackgroundColor" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/>
+ </u:style>
</u:selector>
<u:selector name="button[type="button"][disabled], button[type="reset"][disabled], button[type="submit"][disabled],
input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled]">
<u:style name="color" skin="tabDisabledTextColor" />
+ <u:style name="border-color" skin="tableFooterBackgroundColor" />
+ <u:style name="background-color" skin="tableFooterBackgroundColor" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/>
+ </u:style>
</u:selector>
<f:verbatim>
Modified: trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss
===================================================================
--- trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2008-05-21 15:02:19 UTC (rev 8676)
+++ trunk/ui/core/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2008-05-21 15:02:25 UTC (rev 8677)
@@ -73,6 +73,11 @@
<u:selector name=".rich-container *|button[disabled]">
<u:style name="color" skin="tabDisabledTextColor" />
+ <u:style name="background-color" skin="tableFooterBackgroundColor" />
+ <u:style name="border-color" skin="tableFooterBackgroundColor" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/>
+ </u:style>
</u:selector>
<u:selector name=".rich-button-disabled,
@@ -83,6 +88,11 @@
.rich-container input[type="submit"][disabled], .rich-input-submit-disabled,
.rich-container input[type="button"][disabled], .rich-input-button-disabled">
<u:style name="color" skin="tabDisabledTextColor" />
+ <u:style name="background-color" skin="tableFooterBackgroundColor" />
+ <u:style name="border-color" skin="tableFooterBackgroundColor" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/>
+ </u:style>
</u:selector>
16 years, 7 months
JBoss Rich Faces SVN: r8676 - trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-21 11:02:19 -0400 (Wed, 21 May 2008)
New Revision: 8676
Added:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java
Log:
http://jira.jboss.com/jira/browse/RF-3494
Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonDisabledBackgroundImage.java 2008-05-21 15:02:19 UTC (rev 8676)
@@ -0,0 +1,34 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html.images;
+
+
+/**
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public class ButtonDisabledBackgroundImage extends BaseControlBackgroundImage {
+ public ButtonDisabledBackgroundImage() {
+ super("tableSubfooterBackgroundColor", "tableFooterBackgroundColor", 1);
+ }
+}
16 years, 7 months
JBoss Rich Faces SVN: r8675 - trunk/samples/laguna/src/main/resources/org/richfaces/laguna.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-05-21 10:59:57 -0400 (Wed, 21 May 2008)
New Revision: 8675
Modified:
trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss
Log:
Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss
===================================================================
--- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss 2008-05-21 14:49:21 UTC (rev 8674)
+++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/modalPanel.xcss 2008-05-21 14:59:57 UTC (rev 8675)
@@ -68,10 +68,10 @@
<u:selector name=".rich-mpnl-body">
<u:style name="padding" value="10px 10px 10px 14px" />
- <u:style name="background-position" value="0% 0%" />
+ <u:style name="background-position" value="0% -496px" />
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient">
- <f:attribute name="valign" value="top" />
+ <f:attribute name="valign" value="bottom" />
<f:attribute name="gradientType" value="plain" />
<f:attribute name="gradientColor" skin="intShadow" />
<f:attribute name="baseColor" skin="generalBackgroundColor" />
@@ -83,8 +83,6 @@
<u:selector name=".rich-mpnl-mask-div">
</u:selector>
- <u:selector name=".rich-laguna-mpnl-no-header">
- <u:style name="background-image" value="none"/>
- </u:selector>
+
</f:template>
16 years, 7 months
JBoss Rich Faces SVN: r8674 - trunk/samples/laguna/src/main/resources/org/richfaces/laguna.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-05-21 10:49:21 -0400 (Wed, 21 May 2008)
New Revision: 8674
Modified:
trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss
Log:
Modified: trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss
===================================================================
--- trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss 2008-05-21 14:30:57 UTC (rev 8673)
+++ trunk/samples/laguna/src/main/resources/org/richfaces/laguna/panel.xcss 2008-05-21 14:49:21 UTC (rev 8674)
@@ -33,11 +33,11 @@
<u:selector name=".rich-panel-body">
<u:style name="padding" value="10px 10px 10px 14px" />
- <u:style name="background-position" value="0% 0%" />
+ <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="top" />
+ <f:attribute name="valign" value="bottom" />
<f:attribute name="gradientType" value="plain" />
<f:attribute name="gradientColor" skin="intShadow" />
<f:attribute name="baseColor" skin="generalBackgroundColor" />
@@ -46,7 +46,4 @@
</f:resource>
</u:style>
</u:selector>
- <u:selector name=".rich-laguna-panel-no-header">
- <u:style name="background-image" value="none"/>
- </u:selector>
</f:template>
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8673 - in trunk/test-applications/jsp/src/main: webapp/DataScroller and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-05-21 10:30:57 -0400 (Wed, 21 May 2008)
New Revision: 8673
Modified:
trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
Log:
update datascroller
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-05-21 13:13:27 UTC (rev 8672)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-05-21 14:30:57 UTC (rev 8673)
@@ -4,6 +4,7 @@
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlDatascroller;
import org.richfaces.event.DataScrollerEvent;
public class DataScroller {
@@ -19,7 +20,14 @@
public int maxPages;
private String action;
private String actionListener;
-
+ private boolean ajaxSingle = false;
+ private String boundaryControls = "auto";
+ private HtmlDatascroller binding = null;
+ private String fastStep = "0";
+ private String page = "10";
+ private Object value = null;
+ private String stepControls = "auto";
+
public String act() {
action = "action work!";
return null;
@@ -192,4 +200,102 @@
setMaxPages(40);
setRenderIfSinglePage(true);
}
+
+ /**
+ * @return the ajaxSingle
+ */
+ public boolean isAjaxSingle() {
+ return ajaxSingle;
+ }
+
+ /**
+ * @param ajaxSingle the ajaxSingle to set
+ */
+ public void setAjaxSingle(boolean ajaxSingle) {
+ this.ajaxSingle = ajaxSingle;
+ }
+
+ /**
+ * @return the boundaryControls
+ */
+ public String getBoundaryControls() {
+ return boundaryControls;
+ }
+
+ /**
+ * @param boundaryControls the boundaryControls to set
+ */
+ public void setBoundaryControls(String boundaryControls) {
+ this.boundaryControls = boundaryControls;
+ }
+
+ /**
+ * @return the binding
+ */
+ public HtmlDatascroller getBinding() {
+ return binding;
+ }
+
+ /**
+ * @param binding the binding to set
+ */
+ public void setBinding(HtmlDatascroller binding) {
+ this.binding = binding;
+ }
+
+ /**
+ * @return the fastStep
+ */
+ public String getFastStep() {
+ return fastStep;
+ }
+
+ /**
+ * @param fastStep the fastStep to set
+ */
+ public void setFastStep(String fastStep) {
+ this.fastStep = fastStep;
+ }
+
+ /**
+ * @return the page
+ */
+ public String getPage() {
+ return page;
+ }
+
+ /**
+ * @param page the page to set
+ */
+ public void setPage(String page) {
+ this.page = page;
+ }
+
+ /**
+ * @return the value
+ */
+ public Object getValue() {
+ return value;
+ }
+
+ /**
+ * @param value the value to set
+ */
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ /**
+ * @return the stepControls
+ */
+ public String getStepControls() {
+ return stepControls;
+ }
+
+ /**
+ * @param stepControls the stepControls to set
+ */
+ public void setStepControls(String stepControls) {
+ this.stepControls = stepControls;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-05-21 13:13:27 UTC (rev 8672)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2008-05-21 14:30:57 UTC (rev 8673)
@@ -4,10 +4,16 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="DataScrollerSubviewID">
+
<rich:dataTable id="dataTableId" value="#{dataScroller.dataTable}"
var="dT" cellpadding="5px" rows="5" border="1">
<f:facet name="header">
- <rich:datascroller inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}" selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}" styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}"
+ <rich:datascroller ajaxSingle="#{dataScroller.ajaxSingle}"
+ boundaryControls="#{dataScroller.boundaryControls}"
+ binding="#{dataScroller.binding}" data="datascrData" fastStep="#{dataScroller.fastStep}" id="dsID"
+ page="#{dataScroller.page}" pagesVar="pages" pageIndexVar="index"
+ value="#{dataScroller.value}" status="a4jStatusID" stepControls="#{dataScroller.stepControls}"
+ eventsQueue="eventsQueue" inactiveStyle="#{style.inactiveStyle}" inactiveStyleClass="#{style.inactiveStyleClass}" selectedStyle="#{style.selectedStyle}" selectedStyleClass="#{style.selectedStyleClass}" style="#{style.style}" styleClass="#{style.styleClass}" tableStyle="#{style.tableStyle}" tableStyleClass="#{style.tableStyleClass}"
fastControls="#{dataScroller.fastControls}" action="#{dataScroller.act}" actionListener="#{dataScroller.actListener}"
align="#{dataScroller.align}" rendered="#{dataScroller.render}"
limitToList="#{dataScroller.limitToList}"
@@ -19,8 +25,15 @@
onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
- onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"/>
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ <f:facet name="pages">
+ <h:outputText value="#{index} / #{pages}" />
+ </f:facet>
+ </rich:datascroller>
</f:facet>
+ <f:facet name="footer">
+
+ </f:facet>
<h:column>
<h:outputText value="#{dT.data0}" />
</h:column>
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-05-21 13:13:27 UTC (rev 8672)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2008-05-21 14:30:57 UTC (rev 8673)
@@ -42,5 +42,33 @@
<f:selectItem itemLabel="center" itemValue="center" />
<a4j:support event="onclick" reRender="dataTableId"></a4j:support>
</h:selectOneRadio>
+
+ <h:outputText value="ajaxSingle" />
+ <h:selectBooleanCheckbox value="#{dataScroller.ajaxSingle}"></h:selectBooleanCheckbox>
+
+ <h:outputText value="boundaryControls" />
+ <h:selectOneRadio value="#{dataScroller.boundaryControls}">
+ <f:selectItem itemLabel="auto" itemValue="auto" />
+ <f:selectItem itemLabel="show" itemValue="show" />
+ <f:selectItem itemLabel="hide" itemValue="hide" />
+ <a4j:support event="onclick" reRender="dataTableId"></a4j:support>
+ </h:selectOneRadio>
+
+ <h:outputText value="fastStep"></h:outputText>
+ <h:inputText value="#{dataScroller.fastStep}"/>
+
+ <h:outputText value="page"/>
+ <h:inputText value="#{dataScroller.page}"></h:inputText>
+
+ <h:outputText value="value"></h:outputText>
+ <h:outputText value="#{dataScroller.value}"></h:outputText>
+
+ <h:outputText value="stepControls"></h:outputText>
+ <h:selectOneRadio value="#{dataScroller.stepControls}">
+ <f:selectItem itemLabel="auto" itemValue="auto" />
+ <f:selectItem itemLabel="show" itemValue="show" />
+ <f:selectItem itemLabel="hide" itemValue="hide" />
+ <a4j:support event="onclick" reRender="dataTableId"></a4j:support>
+ </h:selectOneRadio>
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8672 - trunk/samples/laguna/src/main/resources/META-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-21 09:13:27 -0400 (Wed, 21 May 2008)
New Revision: 8672
Added:
trunk/samples/laguna/src/main/resources/META-INF/resources-config.xml
Log:
http://jira.jboss.com/jira/browse/RF-3338
Added: trunk/samples/laguna/src/main/resources/META-INF/resources-config.xml
===================================================================
--- trunk/samples/laguna/src/main/resources/META-INF/resources-config.xml (rev 0)
+++ trunk/samples/laguna/src/main/resources/META-INF/resources-config.xml 2008-05-21 13:13:27 UTC (rev 8672)
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+
+ <resource>
+ <name>META-INF/skins/laguna.xcss</name>
+ <path>META-INF/skins/laguna.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/calendar.xcss</name>
+ <path>org/richfaces/laguna/calendar.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/combobox.xcss</name>
+ <path>org/richfaces/laguna/combobox.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/comtextmenu.xcss</name>
+ <path>org/richfaces/laguna/comtextmenu.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/dataFilterSlider.xcss</name>
+ <path>org/richfaces/laguna/dataFilterSlider.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/datascroller.xcss</name>
+ <path>org/richfaces/laguna/datascroller.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/dataTable.xcss</name>
+ <path>org/richfaces/laguna/dataTable.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/dragIndicator.xcss</name>
+ <path>org/richfaces/laguna/dragIndicator.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/dropdownmenu.xcss</name>
+ <path>org/richfaces/laguna/dropdownmenu.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/fileUpload.xcss</name>
+ <path>org/richfaces/laguna/fileUpload.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/gmap.xcss</name>
+ <path>org/richfaces/laguna/gmap.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/inplaceinput.xcss</name>
+ <path>org/richfaces/laguna/inplaceinput.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/inplaceselect.xcss</name>
+ <path>org/richfaces/laguna/inplaceselect.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/inputNumberSlider.xcss</name>
+ <path>org/richfaces/laguna/inputNumberSlider.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/inputNumberSpinner.xcss</name>
+ <path>org/richfaces/laguna/inputNumberSpinner.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/listShuttle.xcss</name>
+ <path>org/richfaces/laguna/listShuttle.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/menuItem.xcss</name>
+ <path>org/richfaces/laguna/menuItem.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/modalPanel.xcss</name>
+ <path>org/richfaces/laguna/modalPanel.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/msgs.xcss</name>
+ <path>org/richfaces/laguna/msgs.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/orderingList.xcss</name>
+ <path>org/richfaces/laguna/orderingList.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/paint2D.xcss</name>
+ <path>org/richfaces/laguna/paint2D.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/panel.xcss</name>
+ <path>org/richfaces/laguna/panel.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/panelBar.xcss</name>
+ <path>org/richfaces/laguna/panelBar.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/panelMenu.xcss</name>
+ <path>org/richfaces/laguna/panelMenu.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/picklist.xcss</name>
+ <path>org/richfaces/laguna/picklist.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/progressBar.xcss</name>
+ <path>org/richfaces/laguna/progressBar.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/sdt.xcss</name>
+ <path>org/richfaces/laguna/sdt.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/separator.xcss</name>
+ <path>org/richfaces/laguna/separator.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/simpleTogglePanel.xcss</name>
+ <path>org/richfaces/laguna/simpleTogglePanel.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/spacer.xcss</name>
+ <path>org/richfaces/laguna/spacer.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/standard.xcss</name>
+ <path>org/richfaces/laguna/standard.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/suggestionbox.xcss</name>
+ <path>org/richfaces/laguna/suggestionbox.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/tabPanel.xcss</name>
+ <path>org/richfaces/laguna/tabPanel.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/togglePanel.xcss</name>
+ <path>org/richfaces/laguna/togglePanel.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/toolBar.xcss</name>
+ <path>org/richfaces/laguna/toolBar.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/tooltip.xcss</name>
+ <path>org/richfaces/laguna/tooltip.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/tree.xcss</name>
+ <path>org/richfaces/laguna/tree.xcss</path>
+ </resource>
+
+ <resource>
+ <name>org/richfaces/laguna/virtualEarth.xcss</name>
+ <path>org/richfaces/laguna/virtualEarth.xcss</path>
+ </resource>
+</resource-config>
16 years, 7 months
JBoss Rich Faces SVN: r8671 - trunk/ui/contextMenu/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-21 08:46:21 -0400 (Wed, 21 May 2008)
New Revision: 8671
Modified:
trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-3483
Modified: trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java
===================================================================
--- trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2008-05-21 11:11:55 UTC (rev 8670)
+++ trunk/ui/contextMenu/src/test/java/org/richfaces/component/ContextMenuComponentTest.java 2008-05-21 12:46:21 UTC (rev 8671)
@@ -65,6 +65,8 @@
javaScripts.add("org/richfaces/renderkit/html/scripts/json/json-dom.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/context-menu.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/menu.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/available.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/jquery/jquery.js");
}
/**
@@ -180,7 +182,7 @@
assertNotNull(scriptText);
scriptText = scriptText.replaceAll("\\s", "");
- assertTrue(scriptText.startsWith("newRichfaces.ContextMenu"));
+ assertTrue(scriptText.startsWith("varcontextMenu=newRichfaces.ContextMenu"));
assertTrue(scriptText.contains(PARAM_SEQUENCE));
assertNull(script.getNextSibling());
16 years, 7 months