JBoss Rich Faces SVN: r2745 - in trunk/samples: richfaces-ear-demo/ejb and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-04 15:13:37 -0400 (Tue, 04 Sep 2007)
New Revision: 2745
Modified:
trunk/samples/richfaces-ear-demo/ejb/pom.xml
trunk/samples/richfaces-ear-demo/pom.xml
trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml
trunk/samples/richfaces-ear-demo/webapp/pom.xml
trunk/samples/scrollableDataTableDemo/pom.xml
Log:
remove unprintable symbols from poms , add maven schema declarations
Modified: trunk/samples/richfaces-ear-demo/ejb/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-09-04 18:51:48 UTC (rev 2744)
+++ trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-09-04 19:13:37 UTC (rev 2745)
@@ -1,5 +1,7 @@
-<?xml version="1.0"?><project>
- <parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
<artifactId>richfaces-ear-demo</artifactId>
<groupId>org.richfaces.samples</groupId>
<version>3.1.0-SNAPSHOT</version>
Modified: trunk/samples/richfaces-ear-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/pom.xml 2007-09-04 18:51:48 UTC (rev 2744)
+++ trunk/samples/richfaces-ear-demo/pom.xml 2007-09-04 19:13:37 UTC (rev 2745)
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
Modified: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2007-09-04 18:51:48 UTC (rev 2744)
+++ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2007-09-04 19:13:37 UTC (rev 2745)
@@ -1,4 +1,6 @@
-<?xml version="1.0"?><project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>richfaces-ear-demo</artifactId>
<groupId>org.richfaces.samples</groupId>
Modified: trunk/samples/richfaces-ear-demo/webapp/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-09-04 18:51:48 UTC (rev 2744)
+++ trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-09-04 19:13:37 UTC (rev 2745)
@@ -1,5 +1,7 @@
-<?xml version="1.0"?><project>
- <parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
<artifactId>richfaces-ear-demo</artifactId>
<groupId>org.richfaces.samples</groupId>
<version>3.1.0-SNAPSHOT</version>
Modified: trunk/samples/scrollableDataTableDemo/pom.xml
===================================================================
--- trunk/samples/scrollableDataTableDemo/pom.xml 2007-09-04 18:51:48 UTC (rev 2744)
+++ trunk/samples/scrollableDataTableDemo/pom.xml 2007-09-04 19:13:37 UTC (rev 2745)
@@ -28,11 +28,11 @@
<artifactId>core</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>dataTable</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>dataTable</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
16 years, 8 months
JBoss Rich Faces SVN: r2744 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-09-04 14:51:48 -0400 (Tue, 04 Sep 2007)
New Revision: 2744
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
Log:
scrollableDataTable sample restored
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml 2007-09-04 17:50:18 UTC (rev 2743)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml 2007-09-04 18:51:48 UTC (rev 2744)
@@ -7,27 +7,39 @@
<h:form>
- <rich:messages/>
<rich:spacer height="30" />
-
- <rich:scrollableDataTable id="id_Table" height="500px" width="500px"
- rows="5" value="#{dataTableScrollerBean.allCars}" var="row">
+ <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px"
+ width="700px" id="carList" rows="40" columnClasses="col"
+ value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single">
- <rich:column id="id_Id">
- <f:facet name="header">
- <h:outputText value="ID" />
- </f:facet>
- <h:outputText value="#{row.make}" />
- </rich:column>
+ <rich:column id="make">
+ <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet>
+ <h:outputText value="#{category.make}" />
+ </rich:column>
+ <rich:column id="model">
+ <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /></f:facet>
+ <h:outputText value="#{category.model}" />
+ </rich:column>
+ <rich:column id="price">
+ <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet>
+ <h:outputText value="#{category.price}" />
+ </rich:column>
+ <rich:column id="mileage">
+ <f:facet name="header"><h:outputText styleClass="headerText" value="Mileage" /></f:facet>
+ <h:outputText value="#{category.mileage}" />
+ </rich:column>
+ <rich:column width="200px" id="vin">
+ <f:facet name="header"><h:outputText styleClass="headerText" value="VIN" /></f:facet>
+ <h:outputText value="#{category.vin}" />
+ </rich:column>
+ <rich:column id="stock">
+ <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet>
+ <h:outputText value="#{category.stock}" />
+ </rich:column>
- <rich:column id="id_name">
- <f:facet name="header">
- <h:outputText value="Name" />
- </f:facet>
- <h:outputText value="#{row.model}" />
- </rich:column>
- </rich:scrollableDataTable>
- </h:form>
+ </rich:scrollableDataTable>
+ </h:form>
+
</ui:composition>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r2743 - in trunk/ui/calendar/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-09-04 13:50:18 -0400 (Tue, 04 Sep 2007)
New Revision: 2743
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-824
some changes in selectDate and eventCellOnClick functions
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-04 17:13:33 UTC (rev 2742)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-04 17:50:18 UTC (rev 2743)
@@ -331,10 +331,10 @@
</description>
</property>
<property>
- <name>oncurrentdatechange</name>
+ <name>oncurrentdateselect</name>
<classname>java.lang.String</classname>
<description>
- onCurrentDateChange event handler
+ onCurrentDateSelect event handler
</description>
</property>
<property>
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-04 17:13:33 UTC (rev 2742)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-04 17:50:18 UTC (rev 2743)
@@ -772,7 +772,7 @@
}
eventObj.rich = {component:this};
- if (date) eventObj.rich.date = date;
+ eventObj.rich.date = date;
try
{
@@ -795,18 +795,8 @@
var date=new Date(this.currentDate);
date.setDate(daydata.day);
- if (this.invokeEvent("dateselect", obj, e, date))
+ if (this.selectDate(date,true))
{
- this.selectedDate=date;
- if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement, "rich-calendar-select");
- this.selectedDateElement = obj;
- Element.addClassName(obj, "rich-calendar-select");
-
- $(this.INPUT_DATE_ID).value=this.getSelectedDateString(this.params.datePattern);
- this.renderHeader();
- this.renderFooter();
-
- // popup mode
this.doCollapse();
}
@@ -816,11 +806,8 @@
else if (this.params.boundaryDatesMode == "select")
{
var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.invokeEvent("dateselect", obj, e, date))
+ if (this.selectDate(date))
{
- this.selectDate(date, true);
- $(this.INPUT_DATE_ID).value=this.getSelectedDateString(this.params.datePattern);
- // popup mode
this.doCollapse();
}
}
@@ -1150,7 +1137,7 @@
changeCurrentDate: function(yearOffset, monthOffset) {
var date = new Date(this.currentDate.getFullYear()+yearOffset, this.currentDate.getMonth()+monthOffset,1);
- if (this.invokeEvent("currentdatechange", $(this.id), null, date))
+ if (this.invokeEvent("currentdateselect", $(this.id), null, date))
{
this.currentDate = date;
this.onUpdate();
@@ -1199,67 +1186,99 @@
object.element.style['backgroundColor'] = '';
},
- selectDate: function(date, noUpdate) {
+ selectDate: function(date, noUpdate, eventData) {
+ if (!eventData)
+ {
+ eventData = {event: null, element: null};
+ }
+
var oldSelectedDate = this.selectedDate;
+ var newSelectedDate;
if (date)
{
if (typeof date=='string') date = Date.parseDate(date,this.params.datePattern, this.params.monthLabels, this.params.monthLabelsShort);
- /*if (date!=null)
- {
- if (this.selectedDate!=null && this.selectedDate.toLocaleDateString()==date.toLocaleDateString()) return;
- this.selectedDate = date;
- }*/
- this.selectedDate = date;
- } else this.selectedDate = null;
+ newSelectedDate = date;
+ }
+ else
+ {
+ newSelectedDate = null;
+ }
+
+ // fire user event
+ var flag = true;
+ if ( (oldSelectedDate - newSelectedDate) && (oldSelectedDate!=null || newSelectedDate!=null) )
+ {
+ flag = this.invokeEvent("dateselect", eventData.element, eventData.event, date)
+ }
- if (this.selectedDate!=null)
- {
- var d = new Date(this.selectedDate);
- if (d.getMonth()==this.currentDate.getMonth() && d.getFullYear()==this.currentDate.getFullYear())
+ if (flag)
+ {
+ this.selectedDate = newSelectedDate;
+ if (this.selectedDate!=null)
{
- if (oldSelectedDate.getDate()!=d.getDate())
+ $(this.INPUT_DATE_ID).value=this.getSelectedDateString(this.params.datePattern);
+
+ var d = new Date(this.selectedDate);
+ if (d.getMonth()==this.currentDate.getMonth() && d.getFullYear()==this.currentDate.getFullYear())
{
- // find cell and call onclick event
- var e = $(this.DATE_ELEMENT_ID+(this.firstDateIndex + this.selectedDate.getDate()-1));
- if (e) Richfaces.createEvent ('click', e).fire();
+ if (!oldSelectedDate || oldSelectedDate.getDate()!=d.getDate())
+ {
+ // find cell and change style class
+ var e = $(this.DATE_ELEMENT_ID+(this.firstDateIndex + this.selectedDate.getDate()-1));
+ if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement, "rich-calendar-select");
+ this.selectedDateElement = e;
+ Element.addClassName(e, "rich-calendar-select");
+
+ this.renderHeader();
+ this.renderFooter();
+ }
+ } else {
+ // change currentDate and call this.onUpdate();
+ d.setDate(1);
+ this.currentDate = d;
+ if (noUpdate) this.render(); else this.onUpdate();
}
- return;
- } else {
- // change currentDate and call this.onUpdate();
- d.setDate(1);
- this.currentDate = d;
- if (noUpdate) this.render(); else this.onUpdate();
- return;
}
+ else
+ {
+ this.selectedDate = null;
+ $(this.INPUT_DATE_ID).value = "";
+ if (this.selectedDateElement)
+ {
+ Element.removeClassName(this.selectedDateElement, "rich-calendar-select");
+ this.selectedDateElement = null;
+ this.renderHeader();
+ this.renderFooter();
+ }
+ this.today(noUpdate);
+ }
}
- else
+
+ return flag;
+ },
+
+ resetSelectedDate: function()
+ {
+ if (!this.selectedDate) return;
+ if (this.selectDate(null))
{
- if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement, "rich-calendar-select");
- if (oldSelectedDate!=null) if (noUpdate) this.render(); else this.onUpdate();
- this.today(noUpdate);
+ this.doCollapse();
}
},
- resetSelectedDate: function()
+ showSelectedDate: function()
{
if (!this.selectedDate) return;
- this.selectedDate=null;
- this.render();
- $(this.INPUT_DATE_ID).value="";
-
- if (this.params.popup) this.doCollapse();
+ if (this.currentDate.getMonth()!=this.selectedDate.getMonth() || this.currentDate.getFullYear()!=this.selectedDate.getFullYear())
+ {
+ this.currentDate = new Date(this.selectedDate);
+ this.currentDate.setDate(1);
+ this.onUpdate();
+ }
}
});
-/*CalendarEventContainer = {};
-CalendarEventContainer.invokeToday = function (e)
-{
- alert("today");
- //Richfaces.invokeOnComponent('richfaces:calendar',this,'today',e);
- return false;
-};*/
-
CalendarView = {};
CalendarView.getControl = function(text, functionName) {
var attr = {
@@ -1272,7 +1291,7 @@
CalendarView.getSelectedDateControl = function(text, functionName) {
var attr = {
- onclick: "Richfaces.invokeOnComponent('richfaces:calendar',this,'selectDate'); return false;",
+ onclick: "Richfaces.invokeOnComponent('richfaces:calendar',this,'showSelectedDate'); return false;",
className: "rich-calendar-btn"
};
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-04 17:13:33 UTC (rev 2742)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-04 17:50:18 UTC (rev 2743)
@@ -46,7 +46,7 @@
<f:call name="writeEventHandlerFunction"><f:parameter value="ondatemouseout" /></f:call>
<f:call name="writeEventHandlerFunction"><f:parameter value="onexpand" /></f:call>
<f:call name="writeEventHandlerFunction"><f:parameter value="oncollapse" /></f:call>
- <f:call name="writeEventHandlerFunction"><f:parameter value="oncurrentdatechange" /></f:call>
+ <f:call name="writeEventHandlerFunction"><f:parameter value="oncurrentdateselect" /></f:call>
<jsp:scriptlet> /*<![CDATA[*/
if (component.getFacet("optionalHeader")!= null&& component.getFacet("optionalHeader").isRendered()){
16 years, 8 months
JBoss Rich Faces SVN: r2742 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-09-04 13:13:33 -0400 (Tue, 04 Sep 2007)
New Revision: 2742
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java
Log:
removed last UOE
Modified: trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java 2007-09-04 17:02:02 UTC (rev 2741)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java 2007-09-04 17:13:33 UTC (rev 2742)
@@ -176,9 +176,9 @@
* Row indexes navigation is no longer supported
*/
public void setRowIndex(int index) {
- if(index != -1)
- throw new UnsupportedOperationException("setRowIndex");
- setRowKey(null);
+ //if(index != -1)
+ //throw new UnsupportedOperationException("setRowIndex");
+ //setRowKey(null);
}
public Object getRowKey() {
16 years, 8 months
JBoss Rich Faces SVN: r2741 - in trunk/test-applications/jsp/src/main: webapp/DataTable and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-04 13:02:02 -0400 (Tue, 04 Sep 2007)
New Revision: 2741
Modified:
trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java
trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp
Log:
add rendered
Modified: trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-09-04 16:53:46 UTC (rev 2740)
+++ trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-09-04 17:02:02 UTC (rev 2741)
@@ -6,10 +6,11 @@
public class DataTable {
private ArrayList SubTable;
+ private boolean rendered;
-
+
public DataTable() {
-
+ rendered = true;
SubTable = new ArrayList();
for(int i=0;i<3;i++)
@@ -27,4 +28,11 @@
SubTable = subTable;
}
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-09-04 16:53:46 UTC (rev 2740)
+++ trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-09-04 17:02:02 UTC (rev 2741)
@@ -9,7 +9,7 @@
</head>
<f:subview id="dtID">
<h:form>
- <rich:dataTable value="#{dataScroller.dataTable}" var="dG" id="dGid">
+ <rich:dataTable id="dGid" value="#{dataScroller.dataTable}" rendered="#{dataTable.rendered}" var="dG" >
<f:facet name="header">
<h:outputText value="Header" />
</f:facet>
@@ -62,11 +62,16 @@
<h:outputText value="SubColumnFooter" />
</f:facet>
</rich:column>
-
</rich:subTable>
-
</rich:dataTable>
-
+
+ <h:panelGrid columns="2">
+ <h:outputText value="rendered:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{dataTable.rendered}" >
+ <a4j:support event="onchange" reRender="dGid"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </h:panelGrid>
+
` <h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:subview>
16 years, 8 months
JBoss Rich Faces SVN: r2740 - trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-09-04 12:53:46 -0400 (Tue, 04 Sep 2007)
New Revision: 2740
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
RF-805
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-09-04 15:27:08 UTC (rev 2739)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-09-04 16:53:46 UTC (rev 2740)
@@ -92,7 +92,7 @@
function getSizeElement() {
var element;
- if (document.compatMode=='CSS1Compat') {
+ if (RichFaces.navigatorType() != "OPERA" && document.compatMode=='CSS1Compat') {
element = document.documentElement;
} else {
element = document.body;
@@ -567,7 +567,7 @@
var cw = getSizeElement().clientWidth;
if (RichFaces.navigatorType() == "OPERA")
_left = (cw - eContentDiv.style.width.replace("px", "")) / 2;
- else {
+ else {
var _width = Richfaces.getComputedStyleSize(eContentDiv, "width");
if (isNaN(_width))
_width = eContentDiv.clientWidth;
@@ -585,10 +585,16 @@
_top = parseInt(options.top, 10);
} else {
var cw = getSizeElement().clientHeight;
- var _height = Richfaces.getComputedStyleSize(eContentDiv, "height");
- if (isNaN(_height))
- _height = eContentDiv.clientHeight;
- _top = (cw - _height) / 2;
+ if (RichFaces.navigatorType() == "OPERA")
+ {
+ _top = (cw - eContentDiv.style.height.replace("px", "")) / 2;
+ }
+ else {
+ var _height = Richfaces.getComputedStyleSize(eContentDiv, "height");
+ if (isNaN(_height))
+ _height = eContentDiv.clientHeight;
+ _top = (cw - _height) / 2;
+ }
}
this.setTop(_top);
@@ -748,7 +754,12 @@
}
}
- var newSize = Richfaces.getComputedStyleSize(eContentDiv, "height");
+ // Avoid currentStyle bug in opera
+ if (RichFaces.navigatorType() != "OPERA")
+ newSize = Richfaces.getComputedStyleSize(eContentDiv, "height");
+ else
+ newSize = parseInt(eContentDiv.style.height.replace("px", ""), 10);
+
var oldSize = newSize;
newSize += diff.deltaHeight || 0;
16 years, 8 months
JBoss Rich Faces SVN: r2739 - in trunk/ui/scrollableDataTable/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-09-04 11:27:08 -0400 (Tue, 04 Sep 2007)
New Revision: 2739
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
Log:
RF-780
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-04 15:26:24 UTC (rev 2738)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-04 15:27:08 UTC (rev 2739)
@@ -126,6 +126,14 @@
variables.setVariable("cell_index", new Integer(cell_index));
variables.setVariable("sepOffset", new Integer(sepOffset));
variables.setVariable("headerColumnClass", state.getColumnClass());
+ Boolean sorting = getColumnSorting(state.getGrid(), cell_index);
+ if (sorting != null) {
+ if (sorting.booleanValue()) {
+ variables.setVariable("headerColumnSortClass", "rich-sdt-header-sort-up");
+ } else {
+ variables.setVariable("headerColumnSortClass", "rich-sdt-header-sort-down");
+ }
+ }
//variables.setVariable("headerCellClass", state.get);
headerCellTemplate.encodeBegin(context, column);
@@ -170,34 +178,6 @@
}
- private Boolean getColumnSorting(UIScrollableDataTable grid, int columnIndex) {
-
- Boolean sorting = null;
-
- Column column =
- (Column) grid.getChildren().get(columnIndex);
-
- String name = ColumnUtil.getColumnSorting(column);
-
- SortOrder sortOrder = grid.getSortOrder();
-
- if (sortOrder != null) {
- SortField[] sortFields = sortOrder.getFields();
-
- if (sortFields != null) {
- for (int i = 0; i < sortFields.length && sorting == null; i++) {
- SortField sortField = sortFields[i];
-
- if ((name != null && name.equals(sortField.getName()))
- || columnIndex == sortField.getIndex()) {
- sorting = sortField.getAscending();
- }
- }
- }
- }
-
- return sorting;
- }
};
@@ -215,6 +195,14 @@
variables.setVariable("cell_index", new Integer(cell_index));
variables.setVariable("footerColumnClass", state.getColumnClass());
+ Boolean sorting = getColumnSorting(state.getGrid(), cell_index);
+ if (sorting != null) {
+ if (sorting.booleanValue()) {
+ variables.setVariable("footerColumnSortClass", "rich-sdt-footer-sort-up");
+ } else {
+ variables.setVariable("footerColumnSortClass", "rich-sdt-footer-sort-down");
+ }
+ }
UIComponent component = column.getFacet(FOOTER_PART);
if(component != null){
@@ -243,6 +231,14 @@
variables.setVariable("client_id", client_id);
variables.setVariable("cell_index", new Integer(cell_index));
variables.setVariable("columnClass", state.getColumnClass());
+ Boolean sorting = getColumnSorting(state.getGrid(), cell_index);
+ if (sorting != null) {
+ if (sorting.booleanValue()) {
+ variables.setVariable("columnSortClass", "rich-sdt-column-sort-up");
+ } else {
+ variables.setVariable("columnSortClass", "rich-sdt-column-sort-down");
+ }
+ }
cellTemplate.encodeBegin(context, column);
if(!state.isFake()) {
@@ -844,4 +840,34 @@
}
}
}
+
+ private Boolean getColumnSorting(UIScrollableDataTable grid, int columnIndex) {
+
+ Boolean sorting = null;
+
+ Column column =
+ (Column) grid.getChildren().get(columnIndex);
+
+ String name = ColumnUtil.getColumnSorting(column);
+
+ SortOrder sortOrder = grid.getSortOrder();
+
+ if (sortOrder != null) {
+ SortField[] sortFields = sortOrder.getFields();
+
+ if (sortFields != null) {
+ for (int i = 0; i < sortFields.length && sorting == null; i++) {
+ SortField sortField = sortFields[i];
+
+ if ((name != null && name.equals(sortField.getName()))
+ || columnIndex == sortField.getIndex()) {
+ sorting = sortField.getAscending();
+ }
+ }
+ }
+ }
+
+ return sorting;
+ }
+
}
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2007-09-04 15:26:24 UTC (rev 2738)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-cell.jspx 2007-09-04 15:27:08 UTC (rev 2739)
@@ -11,7 +11,7 @@
component="javax.faces.component.UIComponent"
>
- <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass} #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}">
+ <td class="dr-sdt-bc rich-sdt-column-cell #{columnClass} #{columnSortClass} #{component.attributes['styleClass']}" id="#{client_id}:c_#{cell_id}">
<div id="#{client_id}:bc_#{cell_id}" class="dr-sdt-bcbody #{component.attributes['cellClass']}" style="#{component.attributes['cellStyle']}">
<vcp:body/>
</div>
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2007-09-04 15:26:24 UTC (rev 2738)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-footer-cell.jspx 2007-09-04 15:27:08 UTC (rev 2739)
@@ -11,7 +11,7 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass} #{component.attributes['footerClass']}">
+ <th class="dr-sdt-fc rich-sdt-footer-cell #{footerColumnClass} #{footerColumnSortClass} #{component.attributes['footerClass']}">
<span id="#{client_id}:fc_#{cell_index}" class="dr-sdt-fcbody1">
<span class="dr-sdt-fcbody">
<vcp:body/>
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-04 15:26:24 UTC (rev 2738)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-04 15:27:08 UTC (rev 2739)
@@ -12,7 +12,7 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass}" id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}" sortable="#{component.attributes['sortable']}">
+ <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}" sortable="#{component.attributes['sortable']}">
<jsp:scriptlet>
16 years, 8 months
JBoss Rich Faces SVN: r2738 - trunk/ui/datascroller/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-04 11:26:24 -0400 (Tue, 04 Sep 2007)
New Revision: 2738
Modified:
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
Log:
fix test
Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
--- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-09-04 14:55:48 UTC (rev 2737)
+++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-09-04 15:26:24 UTC (rev 2738)
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Set;
+import javax.faces.FacesException;
import javax.faces.application.FacesMessage;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -230,36 +231,41 @@
scroller.processDecodes(facesContext);
scroller.processValidators(facesContext);
scroller.processUpdates(facesContext);
+
scroller.setFor("xxx");
+
try {
page = renderView();
assertTrue(false);
- } catch(Exception ex) {
- }
- scroller.processDecodes(facesContext);
- scroller.processValidators(facesContext);
- scroller.processUpdates(facesContext);
+ }catch(FacesException ex) {
+ }catch(IllegalArgumentException ex){
+ }
+
scroller.setFor("form");
+
try {
page = renderView();
assertTrue(false);
- } catch(Exception ex) {
+ }catch(FacesException ex) {
+ }catch(IllegalArgumentException ex){
}
+
+ scroller.setFor(data.getId());
scroller.processDecodes(facesContext);
scroller.processValidators(facesContext);
- scroller.processUpdates(facesContext);
- scroller.setFor(data.getId());
+ scroller.processUpdates(facesContext);
}
public void testNotRender() throws Exception {
data.setRows(25);
scroller.setRenderIfSinglePage(false);
- HtmlPage page = renderView();
+ HtmlPage page = renderView();
+
assertNotNull(page);
System.out.println(page.asXml());
try {
- page.getHtmlElementById(scroller.getClientId(facesContext));
+ page.getHtmlElementById(scroller.getClientId(facesContext)+"_table");
assertTrue(false);
} catch(Exception ex) {
}
16 years, 8 months
JBoss Rich Faces SVN: r2737 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: dataFilterSlider and 11 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-09-04 10:55:48 -0400 (Tue, 04 Sep 2007)
New Revision: 2737
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator/usage.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-524
language is checked
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxListener/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -8,11 +8,11 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
<p>
- Additionally to the listeners provided by JSF specification, RichFaces add one more:
+ Additionally to the listeners provided by the JSF specification, RichFaces adds one more:
Ajax Listener (a4j:ajaxListener). Ajax Listener is invoked before the Render Response
- phase. Instead of Action Listener of Value Change Listener which are not invoked when
- Validation of Update Model phases failed, Ajax Listener is guarantied to be invoked
- for each Ajax Response. Hence, it is a good place to update the list of re-rendered
+ phase. Instead of Action Listener or Value Change Listener which is not invoked when
+ Validation of the Update Model phases fails, Ajax Listener is guarantied to be invoked
+ for each Ajax Response. Hence, it is a good way to update a list of re-rendered
components, for example.
</p>
<p>
@@ -22,7 +22,7 @@
</p>
<p>
- <b>type</b> attribute defines the fully qualified Java class name for listener. This
+ <b>type</b> attribute defines the fully qualified Java class name for the listener. This
class should implement org.ajax4jsf.events.AjaxListener interface. You can access to
the source of the event (Ajax component) using event.getSource() call.
</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -11,7 +11,7 @@
<p>The Slider component can be used to filter any UIData object or
can be used independently to send its values to the backing bean. It
- has 2 modes, the first mode stores the UIData object on session so user interaction will work smoothly. The second just sends the
+ has 2 modes, the first mode stores the UIData object on session, so as user interaction will work smoothly. The second just sends the
previous and new values as a "sliderEvent" to the backing bean.</p>
<div class="sample-container">
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -13,7 +13,7 @@
<p>The component takes a list from a model and outputs it the same way as with
<h:PanelGrid> for inline data. To define grid properties and styles, use the same
definitions as for <h:panelGrid>.<br />
- The folowing example shows the dataGrid component in use:
+ The following example shows the dataGrid component in use:
</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -13,8 +13,7 @@
<p>Data Lists components allows to generate DL, DT and DD lists using lists
from the model bean.
<br />
- The folowing example shows the dataList component in use. Two another comopnents
- has the same usage.
+ The following example shows the dataList component in use. Two another components could be used in the same way.
</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -14,7 +14,7 @@
enables row and column spans for columns, a flexible layout for a header and a footer.
DataTable supports "master-detail" pattern and allows to show the combination
of a master table and detail sub-tables.<br />
- The folowing example shows the dataTable component in use:
+ The following example shows the dataTable component in use:
</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -23,21 +23,21 @@
</p>
<p>Drag Indicator is a special visual representation of a dragged object. It contains
- a drag marker and a drag label by default, but you can freely define the layout you want using
+ a drag marker and a drag label by default, but you can freely define the necessary layout using
a "single" facet for drag-n-drop of a single object or "multiple" for drag-n-drop on the group of
objects</p>
<p>
- <i>Note: The parent component for dragSupport and dropSupport should be designed to render
+ <i>Note: The parent component for dragSupport and dropSupport should be designed to render
its children and has two attribute "onmouseover" and "onmouseout". You can use <a4j:outputPanel> as
- an container if the component is not satisfy this requirements. Use <a4j:outputPanel> layout="block"
- to wrap the component with a block type layout. We will work to eliminate this restriction in the
+ a container if the component is not satisfy this requirements. Use <a4j:outputPanel> layout="block"
+ to wrap the component with a block type layout. We will work to eliminate this restriction in
future.</i>
</p>
<p>The following example demonstrates the drag-n-drop functionality on practice. The left list
- contains the examples of Ajax frameworks. Do you know them? The demo helps you to sort them.
+ contains the examples of Ajax frameworks. Do you know them? The demo helps you to sort them out.
Drag one and drag over the headers of three panels. If the draggable framework is suitable for a certain
framework family, it will be accepted. Otherwise, the drag indicator shows the "reject" icon.</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -10,8 +10,8 @@
- <p>RichFaces Drop Down menu is a component that allows orginize the hierarchical menu
- similar to one that almost every desktop application have.
+ <p>RichFaces Drop Down menu is a component that allows to organize the hierarchical menu
+ similar to one that almost every desktop application has.
</p>
<div class="sample-container">
@@ -22,17 +22,17 @@
</ui:include>
</div>
- <p>The drop down menu has label that always appears on the page and invisible panel
- that appears by particular client side event (onmouseover, onclick etc). The event is
- defined with 'event' attribute.</p>
- <p>Drop Down Menu can contains set of Menu Items, Menu Groups and Menu Separators.
- Group plays the role of label for secondary levels on the menu. Separator is represented with
- horizontal lines between the items or groups. Item is a active element that might produce
+ <p>The drop down menu has a label that always appears on the page and invisible panel
+ that appears with a particular client side event (onmouseover, onclick etc). The event is
+ defined with an 'event' attribute.</p>
+ <p>Drop Down Menu can contains a set of Menu Items, Menu Groups and Menu Separators.
+ Group plays a role of label for secondary levels on the menu. Separator is represented with
+ horizontal lines between the items or groups. An item is an active element that might produce
Ajax or non-Ajax requests. The submittion mode is defined with 'submitMode' attribute that has
three possible options - "server", "ajax" or "none". Mode "none" does not produce any request, but
- allows developers to provide own functionality inside the menu item with inline content.
+ allows you to provide your own functionality inside the menu item with an inline content.
</p>
- <p>You can place the block of drop down menus horizontally or vertially how it is shown below.
+ <p>You can place a block of drop down menus horizontally or vertially how it is shown below.
</p>
<div class="sample-container">
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -10,15 +10,15 @@
<p>The
- Richfaces Gmap component is a wrapper for standard Google Map widgets. You can use the whole set of
+ Richfaces Gmap component is a wrapper for the standard Google Map widgets. You can use the whole set of
functionality Google Map API provides for you.
See <a target="_blank" href="http://www.google.com/apis/maps/documentation/">
- Google Maps API Version 2 Documentation</a> for Google Map API fetures.
+ Google Maps API Version 2 Documentation</a> for Google Map API features.
</p>
<p>
Gmap has built-in Ajax capability. You do not need to uptade the component using reRender to see
the changes. RichFaces Gmap component is good together with Ajax4jsf jsFunction
- component that allows to invoke the server side data and return it in a JSON format.
+ component that allows to invoke the server side data and convert it into a JSON format.
</p>
<ui:include src="/richfaces/gmap/examples/mapUsage.xhtml"/>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -12,15 +12,15 @@
</p>
<p>
- h:commandLink renderer generates the javascript code that is used to submit the form when the link
+ h:commandLink renderer generates the JavaScript code that is used to submit a form when a link
is clicked. However, if the h:commandLink is rendered outside of the form, for example, when
- you point to it with reRender, the wrong code is generated that causes the broken functionality.
+ you point to it with reRender, the wrong code is generated that causes incorrect functionality.
This issue could be solved by a4j:form usage.
</p>
- <p>But another problem that the link should render hidden inputs
- for its parameters encoding. And this fields will not be generated if the link was not initially rendered and
- then updated via ajax. So this problems solves with the a4j:htmlCommandLink usage. Nesessary fields encodes
- even when link is not rendered initially. So it may be ajax updated and parameters will work correctly.
+ <p>But another problem is that the link should render hidden inputs
+ for its parameters encoding. And these fields are not generated if the link is not initially rendered and
+ then updated via Ajax. Such problems could be solved with the a4j:htmlCommandLink usage. Necessary fields are encoded
+ even when the link is not rendered initially. Hence it may be Ajax updated and parameters work correctly.
</p>
<rich:insert highlight="xhtml" src="/richfaces/htmlCommandLink/snippets/commandLinkProblem.xhtml"></rich:insert>
</ui:define>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -8,7 +8,7 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
<p>
- InputNumberSlider is highly customizable components used to define numeric input in a given range. User can use slider or just type in input field.
+ InputNumberSlider is a highly customizable component that is used to define numeric input in a given range. You can use a slider or just type some text into an input field.
</p>
<div class="sample-container" >
<ui:include src="/richfaces/inputNumberSlider/examples/sliderUsage.xhtml"/>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSpinner/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -8,7 +8,7 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
<p>
- InputNumberSpinner is a highly customizable component used to define numeric input in a given range. A user can use a spinner control or just type in an input field.
+ InputNumberSpinner is a highly customizable component that is used to define a numeric input in a given range. A user can use a spinner control or just type some text into an input field.
</p>
<div class="sample-container" >
<ui:include src="/richfaces/inputNumberSpinner/examples/spinnerUsage.xhtml"/>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -15,7 +15,7 @@
Additionally to facelets <ui:repeat> component it allows to update
a set of its children instead of the whole using AJAX reuqests.
<br />
- The folowing example shows the repeat component in use.
+ The following example shows the repeat component in use.
There you could explore how to make updatable the only two concrete
cells of the table using Ajax Keys.
</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator/usage.xhtml 2007-09-04 14:50:47 UTC (rev 2736)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/separator/usage.xhtml 2007-09-04 14:55:48 UTC (rev 2737)
@@ -7,8 +7,8 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
<p>
- Separator is used to draw a horizontal line on a page. You may specify different types of a line, possible values are "beveled" (default), "dotted", "dashed", "double" and "solid".
- You also may specify width, height and alignment for the separator.
+ Separator is used to draw a horizontal line on a page. You may specify different types of a line, the possible values are "beveled" (default), "dotted", "dashed", "double" and "solid".
+ You also can specify width, height and alignment for the separator.
</p>
<div class="sample-container">
16 years, 8 months
JBoss Rich Faces SVN: r2736 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-09-04 10:50:47 -0400 (Tue, 04 Sep 2007)
New Revision: 2736
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml
trunk/docs/userguide/en/src/main/docbook/included/form.xml
Log:
tags errors in xml files are fixed
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-09-04 12:40:47 UTC (rev 2735)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-09-04 14:50:47 UTC (rev 2736)
@@ -276,7 +276,7 @@
<!--Nested menu components-->
</rich:dropDownMenu>
...
- </programlisting>
+ ]]></programlisting>
<para>This is the result:</para>
@@ -542,14 +542,11 @@
<para>To change the style peculiarities of the particular drop-down menus define your own style
classes in the corresponding dropDownMenu attributes.</para>
</section>
+
<section>
<title>Relevant resources links</title>
<para>
- <ulink
- url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr..."
- >Here</ulink> you can see the example of <emphasis role="bold"
- ><rich:dropDownMenu></emphasis> usage and sources for the given example.
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dropDownMenu></emphasis> usage and sources for the given example.
</para>
</section>
-
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-09-04 12:40:47 UTC (rev 2735)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-09-04 14:50:47 UTC (rev 2736)
@@ -62,7 +62,6 @@
<para>This simple example shows how to make a panel component a potential drop target for
drag-and-drop operations using "text" elements as the dragged items.</para>
-
<para>
<emphasis role="bold">Example:</emphasis>
</para>
@@ -92,27 +91,27 @@
<title>Details of Usage</title>
<para>As shown in the example, the key attribute for <emphasis role="bold">
- <property><rich:dropSupport></property>
+ <property><rich:dropSupport></property>
</emphasis> is <emphasis>
<property>"acceptedTypes"</property>
</emphasis>. This attribute defines the types of draggable items that can be dropped onto the
designated drop zone.</para>
<para>The second most important attribute for <emphasis role="bold">
- <property><rich:dropSupport></property>
+ <property><rich:dropSupport></property>
</emphasis> is <emphasis>
<property>"typeMapping"</property>
</emphasis>. This attribute maps a specific type among the acceptable types for draggable
items to a specific <emphasis role="bold">
- <property><rich:dndParam></property>
+ <property><rich:dndParam></property>
</emphasis> child element under <emphasis role="bold">
- <property><rich:dropSupport></property>
+ <property><rich:dropSupport></property>
</emphasis>.</para>
<para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <emphasis role="bold">Example:</emphasis> </para>
+
<programlisting role="XML"><![CDATA[...
<rich:dropSupport acceptedTypes="[iconsDragged, textDragged]" typeMapping="{iconsDragged: DropIcon}">
<rich:dndParam name="DropIcon">
@@ -135,8 +134,8 @@
<para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <emphasis role="bold">Example:</emphasis></para>
+
<programlisting role="XML"><![CDATA[...
<rich:dataTable value="#{capitalsBean.capitals}" var="caps">
<f:facet name="caption">Capitals List</f:facet>
@@ -157,8 +156,8 @@
<para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <emphasis role="bold">Example:</emphasis> </para>
+
<programlisting role="XML"><![CDATA[...
<rich:panel style="width:100px;height:100px;">
<f:facet name="header">Drop Zone</f:facet>
@@ -217,7 +216,7 @@
common Ajax request is performed that renders results in the third table.</para>
<para>As with every Ajax action component, <emphasis role="bold">
- <property><rich:dropSupport></property>
+ <property><rich:dropSupport></property>
</emphasis> has all the common attributes (<emphasis><property>"timeout"</property>,</emphasis>
<emphasis><property>"limitToList"</property>,</emphasis>
<emphasis><property>"reRender"</property>,</emphasis> etc.) for Ajax request customization. To
@@ -252,7 +251,7 @@
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dro..."
>Here</ulink> you can see the example of <emphasis role="bold"
- ><rich:dropSupport></emphasis> usage and sources for the given example.
+ ><rich:dropSupport></emphasis> usage and sources for the given example.
</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/form.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/form.xml 2007-09-04 12:40:47 UTC (rev 2735)
+++ trunk/docs/userguide/en/src/main/docbook/included/form.xml 2007-09-04 14:50:47 UTC (rev 2736)
@@ -87,8 +87,7 @@
<title>Relevant resources links</title>
<para>
Some additional information about usage of component can be found
- <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/form.jsf?c=form">here.
- </ulink>
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/form.jsf?c=form">here.</ulink>
</para>
</section>
</chapter>
16 years, 8 months