richfaces-svn-commits
October 2007
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 486 discussions
JBoss Rich Faces SVN: r3264 - branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-10-04 16:58:27 -0400 (Thu, 04 Oct 2007)
New Revision: 3264
Modified:
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java
Log:
fix for a http://jira.jboss.com/jira/browse/RF-1064
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2007-10-04 19:02:45 UTC (rev 3263)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2007-10-04 20:58:27 UTC (rev 3264)
@@ -54,7 +54,7 @@
public class ResourceLifecycle extends Lifecycle {
private Lifecycle lifecycle;
-
+
private static final Log _log = LogFactory.getLog(ResourceLifecycle.class);
/*
@@ -122,77 +122,107 @@
phaseListeners = facesLifecycle.getPhaseListeners();
PhaseEvent restoreViewEvent = new PhaseEvent(facesContext,
PhaseId.RESTORE_VIEW, this);
- // Invoke before restore view phase listeners
- for (int i = 0; i < phaseListeners.length; i++) {
- PhaseListener phaseListener = phaseListeners[i];
- if (PhaseId.RESTORE_VIEW.equals(phaseListener.getPhaseId())
- || PhaseId.ANY_PHASE.equals(phaseListener.getPhaseId())) {
- try {
- phaseListener.beforePhase(restoreViewEvent);
+ processPhaseListeners(phaseListeners, restoreViewEvent, true);
+ // Fix for a http://jira.jboss.org/jira/browse/RF-1056
+ if (facesContext.getResponseComplete())
+ return;
+ // fix for a http://jira.jboss.com/jira/browse/RF-1064 .
+ // viewRoot can be created outside.
+ UIViewRoot savedViewRoot = facesContext.getViewRoot();
+ try {
+ // create "dummy" viewRoot, to avoid problems in phase
+ // listeners.
+ UIViewRoot root = new UIViewRoot();
+ root.setViewId(resource.getKey());
+ root.setLocale(Locale.getDefault());
+ root.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
+ facesContext.setViewRoot(root);
+ // Invoke after restore view phase listeners
+ processPhaseListeners(phaseListeners, restoreViewEvent, false);
+ // Fix for a http://jira.jboss.org/jira/browse/RF-1056
+ if (!facesContext.getResponseComplete()) {
+ // Invoke before render view phase listeners
+ renderViewEvent = new PhaseEvent(facesContext,
+ PhaseId.RENDER_RESPONSE, this);
+ processPhaseListeners(phaseListeners, renderViewEvent, true);
+ sendResource(resourceContext, resource);
+ processPhaseListeners(phaseListeners, renderViewEvent,
+ false);
+ }
- } catch (Exception e) {
- _log.error("Exception in PhaseListener, restore view : beforePhase", e);
- }
+ } finally {
+ if (null != savedViewRoot) {
+ facesContext.setViewRoot(savedViewRoot);
}
}
- // Fix for a http://jira.jboss.org/jira/browse/RF-1056
- if(facesContext.getResponseComplete()) return;
- // create "dummy" viewRoot, to avoid problems in phase listeners.
- UIViewRoot root = new UIViewRoot();
- root.setViewId(resource.getKey());
- root.setLocale(Locale.getDefault());
- root.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
- facesContext.setViewRoot(root);
- // Invoke after restore view phase listeners
- for (int i = phaseListeners.length - 1; i > 0; i--) {
- PhaseListener phaseListener = phaseListeners[i];
- if (PhaseId.RESTORE_VIEW.equals(phaseListener.getPhaseId())
- || PhaseId.ANY_PHASE.equals(phaseListener.getPhaseId())) {
- try {
- phaseListener.afterPhase(restoreViewEvent);
+ } else {
+ sendResource(resourceContext, resource);
+ }
+ }
- } catch (Exception e) {
- _log.error("Exception in PhaseListener, restore view : afterPhase", e);
- }
- }
- }
- // Fix for a http://jira.jboss.org/jira/browse/RF-1056
- if(facesContext.getResponseComplete()) return;
- // Invoke before render view phase listeners
- renderViewEvent = new PhaseEvent(facesContext,
- PhaseId.RENDER_RESPONSE, this);
+ /**
+ * Send phase event to all apropriate PhaseListener's
+ *
+ * @param phaseListeners
+ * @param phaseEvent
+ * @param beforePhase
+ * TODO
+ */
+ private void processPhaseListeners(PhaseListener[] phaseListeners,
+ PhaseEvent phaseEvent, boolean beforePhase) {
+ if (beforePhase) {
+ // Invoke before phase listeners
for (int i = 0; i < phaseListeners.length; i++) {
PhaseListener phaseListener = phaseListeners[i];
- if (PhaseId.RENDER_RESPONSE.equals(phaseListener.getPhaseId())
- || PhaseId.ANY_PHASE.equals(phaseListener.getPhaseId())) {
- try {
- phaseListener.beforePhase(renderViewEvent);
+ invokePhaseListener(phaseListener, phaseEvent, beforePhase);
+ }
- } catch (Exception e) {
- _log.error("Exception in PhaseListener, render view : beforePhase", e);
- }
- }
- }
- }
- resource.sendHeaders(resourceContext);
- resource.send(resourceContext);
- if (null != facesContext) {
- // Invoke after restore view phase listeners
+ } else {
+ // Invoke after phase listeners, in reverse order.
for (int i = phaseListeners.length - 1; i > 0; i--) {
PhaseListener phaseListener = phaseListeners[i];
- if (PhaseId.RENDER_RESPONSE.equals(phaseListener.getPhaseId())
- || PhaseId.ANY_PHASE.equals(phaseListener.getPhaseId())) {
- try {
- phaseListener.afterPhase(renderViewEvent);
+ invokePhaseListener(phaseListener, phaseEvent, beforePhase);
+ }
- } catch (Exception e) {
- _log.error("Exception in PhaseListener, render view : afterPhase", e);
- }
+ }
+ }
+
+ /**
+ * @param phaseListener
+ * @param phaseEvent
+ * @param beforePhase
+ */
+ private void invokePhaseListener(PhaseListener phaseListener,
+ PhaseEvent phaseEvent, boolean beforePhase) {
+ if (phaseEvent.getPhaseId().equals(phaseListener.getPhaseId())
+ || PhaseId.ANY_PHASE.equals(phaseListener.getPhaseId())) {
+ try {
+ if (beforePhase) {
+ phaseListener.beforePhase(phaseEvent);
+ } else {
+ phaseListener.afterPhase(phaseEvent);
}
+ } catch (Exception e) {
+ _log
+ .error("Exception in PhaseListener, phase :"
+ + phaseEvent.getPhaseId().toString()
+ + (beforePhase ? " : beforePhase"
+ : " : afterPhase"), e);
}
}
}
+ /**
+ * @param resourceContext
+ * @param resource
+ * @throws IOException
+ */
+ private void sendResource(ResourceContext resourceContext,
+ InternetResource resource) throws IOException {
+ resource.sendHeaders(resourceContext);
+ resource.send(resourceContext);
+ }
+
protected synchronized Lifecycle getFacesLifecycle() {
if (lifecycle == null) {
// Acquire our Lifecycle instance
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3263 - trunk/test-applications/jsp/src/main/java.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-10-04 15:02:45 -0400 (Thu, 04 Oct 2007)
New Revision: 3263
Removed:
trunk/test-applications/jsp/src/main/java/div/
Log:
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3262 - in trunk/test-applications/jsp/src/main: java/dataTable and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-10-04 15:01:18 -0400 (Thu, 04 Oct 2007)
New Revision: 3262
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java
trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java
trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java
trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java
trunk/test-applications/jsp/src/main/java/effect/Effect.java
trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java
trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp
trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -29,17 +29,19 @@
import java.util.StringTokenizer;
import java.util.TimeZone;
import javax.faces.event.ValueChangeEvent;
+import javax.faces.webapp.UIComponentTag;
+
import org.richfaces.event.CurrentDateChangeEvent;
public class CalendarBean {
private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|",
- "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" };
+ "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" };
private static final String [] WEEK_DAY = new String[] { "|>Saturday*<|", "|>Monday+<|",
- "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"};
- private static final String [] MOUNT_LABELS = new String[] { "January",
- "February", "March", "April", "May", "June", "July", "August",
- "September", "October", "November", "December" };
+ "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"};
+ private static final String [] MOUNT_LABELS = new String[] { "January +",
+ "February +", "March +", "April +", "May +", "June +", "July +", "August +",
+ "September +", "October +", "November +", "December +" };
private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +",
"Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +",
"Sep +", "Oct +", "Nov +", "Dec +" };
@@ -68,7 +70,6 @@
private String boundary;
private String icon;
private String toolTipMode;
- private String scrollMode;
private String label;
private String timeZone;
private String mode;
@@ -145,13 +146,12 @@
rendered = true;
zindex = 2;
toolTipMode = "none";
- scrollMode = "client";
required = false;
- weekDay = "none";
+ weekDay = "long";
month = "none";
mode = "client";
timeZone = "Eastern European Time";
- preloadDateRangeBegin = "10.09.2007";
+ preloadDateRangeBegin = "10.08.2007"; //d.m.y
preloadDateRangeEnd = "11.10.2007";
}
@@ -163,11 +163,9 @@
while(st.hasMoreTokens()) {
date.add(Integer.parseInt(st.nextToken()));
}
-
cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
- System.out.println(cal.getTime());
+ System.out.println("prBegin " + cal.getTime());
return cal.getTime();
-
}
public Date getPrDateRangeEnd() {
@@ -179,7 +177,7 @@
date.add(Integer.parseInt(st.nextToken()));
}
cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
- System.out.println(cal.getTime());
+ System.out.println("prEnd " + cal.getTime());
return cal.getTime();
}
@@ -219,7 +217,7 @@
public Object getWeekDayLabels() {
if(weekDay.equals("long"))
return CalendarBean.WEEK_DAY;
- else return null;
+ else return null;
}
public Object getWeekDayLabelsShort() {
@@ -234,10 +232,6 @@
else return null;
}
- public void weekDay(ValueChangeEvent event) {
- weekDay = (String) event.getNewValue();
- }
-
public Object getMonthLabelsShort() {
if(month.equals("short"))
return CalendarBean.MOUNT_LABELS_SHORT;
@@ -245,9 +239,12 @@
}
+ public String getMonth() {
+ return month;
+ }
- public void month(ValueChangeEvent event) {
- month = (String) event.getNewValue();
+ public void setMonth(String month) {
+ this.month = month;
}
public String getCurrentDateAsText() {
@@ -379,14 +376,6 @@
this.toolTipMode = toolTipMode;
}
- public String getScrollMode() {
- return scrollMode;
- }
-
- public void setScrollMode(String scrollMode) {
- this.scrollMode = scrollMode;
- }
-
public int getZindex() {
return zindex;
}
@@ -450,4 +439,12 @@
public void setMode(String mode) {
this.mode = mode;
}
+
+ public String getWeekDay() {
+ return weekDay;
+ }
+
+ public void setWeekDay(String weekDay) {
+ this.weekDay = weekDay;
+ }
}
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelImpl.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -55,7 +55,6 @@
protected CalendarDataModelItem createDataModelItem(Date date) {
CalendarDataModelItemImpl item = new CalendarDataModelItemImpl();
- item.setDate(date);
Map data = new HashMap();
DateFormat enFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH);
DateFormat frFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRENCH);
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -21,8 +21,6 @@
package calendar;
-import java.util.Date;
-
import org.richfaces.model.CalendarDataModelItem;
/**
@@ -33,7 +31,6 @@
public class CalendarDataModelItemImpl implements CalendarDataModelItem {
private Object data;
- private Date date;
private String styleClass;
private Object toolTip;
private boolean enabled = true;
@@ -46,13 +43,6 @@
}
/* (non-Javadoc)
- * @see org.richfaces.component.CalendarDataModelItem#getDate()
- */
- public Date getDate() {
- return date;
- }
-
- /* (non-Javadoc)
* @see org.richfaces.component.CalendarDataModelItem#getStyleClass()
*/
public String getStyleClass() {
@@ -88,13 +78,6 @@
}
/**
- * @param date the date to set
- */
- public void setDate(Date date) {
- this.date = date;
- }
-
- /**
* @param styleClass the styleClass to set
*/
public void setStyleClass(String styleClass) {
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarValidator.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -1,6 +1,3 @@
-/**
- *
- */
package calendar;
import java.util.Calendar;
Modified: trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -13,7 +13,6 @@
private List mounths = new ArrayList();
private List numbers = new ArrayList();
private String align;
- private String bgcolor;
private String border;
private String width;
private String columnsWidth;
@@ -22,7 +21,6 @@
public DataTable() {
align = "center";
- bgcolor = "aqua";
border = "1";
width = "400px";
columnsWidth = "200px";
@@ -109,14 +107,6 @@
this.align = align;
}
- public String getBgcolor() {
- return bgcolor;
- }
-
- public void setBgcolor(String bgcolor) {
- this.bgcolor = bgcolor;
- }
-
public String getBorder() {
return border;
}
Modified: trunk/test-applications/jsp/src/main/java/effect/Effect.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/effect/Effect.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -1,3 +1,24 @@
+/**
+ * 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 effect;
public class Effect {
@@ -35,4 +56,3 @@
this.state = state;
}
}
-
Modified: trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -2,12 +2,12 @@
public class SimpleTogglePanel {
- private String switchType; // "client", "server"(default), "ajax"
- private String width;
- private String height;
+ private String switchType; // "client", "server"(default), "ajax"
+ private String width;
+ private String height;
- private boolean focus;
- private boolean rendered;
+ private boolean focus;
+ private boolean rendered;
public SimpleTogglePanel() {
// TODO Auto-generated constructor stub
Modified: trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-10-04 19:01:18 UTC (rev 3262)
@@ -14,6 +14,14 @@
private String style;
private String layout;
+ public String getLayout() {
+ return layout;
+ }
+
+ public void setLayout(String layout) {
+ this.layout = layout;
+ }
+
public Tooltip() {
followMouse = false;
rendered = true;
@@ -23,6 +31,7 @@
direction = "top-right";
horizontalOffset = 0;
verticalOffset = 0;
+ delay = 0;
style = "none";
layout = "inline";
}
@@ -107,12 +116,4 @@
this.delay = delay;
}
- public String getLayout() {
- return layout;
- }
-
- public void setLayout(String layout) {
- this.layout = layout;
- }
-
}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-04 19:01:18 UTC (rev 3262)
@@ -20,10 +20,8 @@
<rich:calendar id="calendarID" dataModel="#{calendarDataModel}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
datePattern="#{calendarBean.pattern}"
- preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}"
- preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}"
weekDayLabels="#{calendarBean.weekDayLabels}"
- weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}"
+ weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}"
monthLabels="#{calendarBean.monthLabels}"
monthLabelsShort="#{calendarBean.monthLabelsShort}"
value="#{calendarBean.selectedDate}"
@@ -45,16 +43,17 @@
width="#{calendarBean.width}"
zindex="#{calendarBean.zindex}"
toolTipMode="#{calendarBean.toolTipMode}"
- scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
focus="popupModeID"
- mode="#{calendarBean.mode}"
+ mode="#{calendarBean.mode}"
required="#{calendarBean.required}"
- requiredMessage="Required Message">
+ requiredMessage="Required Message"
+ >
+
<f:facet name="weekDay">
- <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</span></f:verbatim>
+ <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim>
</f:facet>
-
+
<f:facet name="optionalHeader">
<h:outputText value="optionalHeader Facet" />
</f:facet>
@@ -92,19 +91,19 @@
onclick="submit()" />
<h:outputText value="Custom day labels" />
- <h:selectOneRadio valueChangeListener="#{calendarBean.weekDay}"
- onclick="submit()" >
+ <h:selectOneRadio value="#{calendarBean.weekDay}">
<f:selectItem itemLabel="none" itemValue="none"/>
<f:selectItem itemLabel="day labels" itemValue="long"/>
<f:selectItem itemLabel="day labels short" itemValue="short"/>
+ <a4j:support event="onclick" reRender="calendarID"></a4j:support>
</h:selectOneRadio>
<h:outputText value="Custom month labels" />
- <h:selectOneRadio valueChangeListener="#{calendarBean.month}"
- onclick="submit()" >
+ <h:selectOneRadio value="#{calendarBean.month}">
<f:selectItem itemLabel="none" itemValue="none"/>
<f:selectItem itemLabel="day labels" itemValue="long"/>
<f:selectItem itemLabel="day labels short" itemValue="short"/>
+ <a4j:support event="onclick" reRender="calendarID"></a4j:support>
</h:selectOneRadio>
<h:outputText value="Select Date Pattern:" />
@@ -189,12 +188,6 @@
<f:selectItem itemLabel="single" itemValue="single"/>
<f:selectItem itemLabel="batch" itemValue="batch"/>
</h:selectOneRadio>
-
- <h:outputText value="Scroll Mode:" />
- <h:selectOneRadio value="#{calendarBean.scrollMode}" onchange="submit();">
- <f:selectItem itemLabel="client" itemValue="client"/>
- <f:selectItem itemLabel="ajax" itemValue="ajax"/>
- </h:selectOneRadio>
<h:outputText value="BoundaryDatesMode:" />
<h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}">
@@ -231,11 +224,5 @@
<f:verbatim></f:verbatim>
<h:commandButton value="Submit" />
</h:panelGrid>
-
- <f:verbatim>
- <br />
- </f:verbatim>
-
- <h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-10-04 19:01:18 UTC (rev 3262)
@@ -1,108 +1,106 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
- <f:subview id="DataTableID">
- <h:form>
- <rich:dataTable id="dataTableID" var="dataTableID"
- value="#{dataTable.mounths}" rowKeyVar="key" styleClass="dtStyle"
- captionClass="caption" rowClasses="rowa,rowb,rowc rowcc"
- headerClass="header" footerClass="footer"
- onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}"
- align="#{dataTable.align}" bgcolor="#{dataTable.bgcolor}"
- border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}"
- width="#{dataTable.width}" title="DataTableTite">
- <f:facet name="caption">
- <h:outputText value="caption" />
- </f:facet>
- <f:facet name="header">
- <rich:columnGroup columnClasses="cola, colb ,rowc rowcc">
- <rich:column rowspan="2" rendered="#{dataTable.r2rendered}">
- <h:outputText value="2-row head" />
- </rich:column>
- <h:column rendered="#{dataTable.r2rendered}">
- <h:outputText value="head in UIColumn" />
- </h:column>
- <rich:column breakBefore="true">
- <h:outputText value="2-d row head" />
- </rich:column>
- </rich:columnGroup>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="table foot" />
- </f:facet>
- <rich:columnGroup>
- <rich:column id="mounth" styleClass="column" rowspan="2"
- headerClass="cheader" footerClass="cfooter">
- <f:facet name="header">
- <h:outputText value="mounth" />
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="-//-" />
- </f:facet>
- <h:outputText value="#{dataTableID.mounth}" />
- </rich:column>
- <rich:column styleClass="column" headerClass="cheader"
- footerClass="cfooter" rendered="#{dataTable.r2rendered}">
- <f:facet name="header">
- <h:outputText value="mounth" />
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="-//-" />
- </f:facet>
- <h:outputText value="#{dataTableID.town}" />
- </rich:column>
- </rich:columnGroup>
- <rich:column styleClass="column" headerClass="cheader"
- footerClass="cfooter" rendered="#{dataTable.r2rendered}">
- <h:outputText value="#{dataTableID.day}" />
- </rich:column>
- <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}">
- <rich:column id="name">
- <h:outputText value="#{detail.name}" />
- </rich:column>
- <rich:column id="qty" rendered="#{dataTable.r2rendered}">
- <h:outputText value="#{detail.qty}" />
- </rich:column>
- </rich:subTable>
- <rich:column id="total" styleClass="total" colspan="2">
- <h:outputText value="#{dataTableID.total}" />
- </rich:column>
- </rich:dataTable>
-
- <h:panelGrid columns="2">
- <h:outputText value="Align:"></h:outputText>
- <h:selectOneMenu value="#{dataTable.align}">
- <f:selectItem itemLabel="center" itemValue="*center" />
- <f:selectItem itemLabel="left" itemValue="*left" />
- <f:selectItem itemLabel="right " itemValue="*right" />
- <a4j:support event="onclick" reRender="dataTableID"></a4j:support>
- </h:selectOneMenu>
-
- <h:outputText value="Border: "></h:outputText>
- <h:inputText value="#{dataTable.border}">
- <a4j:support event="onchange" reRender="dataTableID"></a4j:support>
- </h:inputText>
-
- <h:outputText value="Columns Width: "></h:outputText>
- <h:inputText value="#{dataTable.columnsWidth}">
- <a4j:support event="onchange" reRender="dataTableID"></a4j:support>
- </h:inputText>
-
- <h:outputText value="Width: "></h:outputText>
- <h:inputText value="#{dataTable.width}">
- <a4j:support event="onchange" reRender="dataTableID"></a4j:support>
- </h:inputText>
-
- <h:outputText value="rendered:" />
- <h:selectBooleanCheckbox value="#{dataTable.rendered}"
- onclick="submit();" />
-
- <h:outputText value=" row 2 rendered" />
- <h:selectBooleanCheckbox value="#{dataTable.r2rendered}"
- onclick="submit();" />
- </h:panelGrid>
-
- </h:form>
- </f:subview>
-
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+ <f:subview id="DataTableID">
+ <h:form>
+ <rich:dataTable id="dataTableID" var="dataTableID"
+ value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table"
+ captionClass="caption" rowClasses="rowa,rowb,rowc rowcc"
+ headerClass="header" footerClass="footer" cellpadding="" cellspacing=""
+ onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red"
+ border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite">
+ <f:facet name="caption">
+ <h:outputText value="caption" />
+ </f:facet>
+ <f:facet name="header">
+ <rich:columnGroup columnClasses="cola, colb ,rowc rowcc">
+ <rich:column rowspan="2" rendered="#{dataTable.r2rendered}">
+ <h:outputText value="2-row head" />
+ </rich:column>
+ <h:column rendered="#{dataTable.r2rendered}">
+ <h:outputText value="head in UIColumn" />
+ </h:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="2-d row head" />
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="table foot" />
+ </f:facet>
+ <rich:columnGroup>
+ <rich:column id="mounth" styleClass="column" rowspan="2"
+ headerClass="cheader" footerClass="cfooter">
+ <f:facet name="header">
+ <h:outputText value="mounth" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="-//-" />
+ </f:facet>
+ <h:outputText value="#{dataTableID.mounth}" />
+ </rich:column>
+ <rich:column styleClass="column" headerClass="cheader"
+ footerClass="cfooter" rendered="#{dataTable.r2rendered}">
+ <f:facet name="header">
+ <h:outputText value="mounth" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="-//-" />
+ </f:facet>
+ <h:outputText value="#{dataTableID.town}" />
+ </rich:column>
+ </rich:columnGroup>
+ <rich:column styleClass="column" headerClass="cheader"
+ footerClass="cfooter" rendered="#{dataTable.r2rendered}">
+ <h:outputText value="#{dataTableID.day}" />
+ </rich:column>
+ <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}">
+ <rich:column id="name">
+ <h:outputText value="#{detail.name}" />
+ </rich:column>
+ <rich:column id="qty" rendered="#{dataTable.r2rendered}">
+ <h:outputText value="#{detail.qty}" />
+ </rich:column>
+ </rich:subTable>
+ <rich:column id="total" styleClass="total" colspan="2">
+ <h:outputText value="#{dataTableID.total}" />
+ </rich:column>
+ </rich:dataTable>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="Align:"></h:outputText>
+ <h:selectOneMenu value="#{dataTable.align}">
+ <f:selectItem itemLabel="center" itemValue="*center" />
+ <f:selectItem itemLabel="left" itemValue="*left" />
+ <f:selectItem itemLabel="right " itemValue="*right" />
+ <a4j:support event="onclick" reRender="dataTableID"></a4j:support>
+ </h:selectOneMenu>
+
+ <h:outputText value="Border: "></h:outputText>
+ <h:inputText value="#{dataTable.border}">
+ <a4j:support event="onchange" reRender="dataTableID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="Columns Width: "></h:outputText>
+ <h:inputText value="#{dataTable.columnsWidth}">
+ <a4j:support event="onchange" reRender="dataTableID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="Width: "></h:outputText>
+ <h:inputText value="#{dataTable.width}">
+ <a4j:support event="onchange" reRender="dataTableID"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="rendered:" />
+ <h:selectBooleanCheckbox value="#{dataTable.rendered}"
+ onclick="submit();" />
+
+ <h:outputText value=" row 2 rendered" />
+ <h:selectBooleanCheckbox value="#{dataTable.r2rendered}"
+ onclick="submit();" />
+ </h:panelGrid>
+
+ </h:form>
+ </f:subview>
+
Modified: trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-04 19:01:18 UTC (rev 3262)
@@ -5,42 +5,48 @@
<f:subview id="effectID">
<h:messages />
- <rich:panel id="indexID">
- <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink>
+ <h:form>
+ <rich:panel id="indexID">
+ <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink>
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+
+ <h:outputText value="Menu:" />
+ <h:panelGrid columns="2" >
+ <h:outputText value="1." />
<f:verbatim>
- <br />
+ <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF
+ Components</font></span>
</f:verbatim>
-
- <h:outputText value="Menu:" />
- <h:panelGrid columns="2">
- <h:outputText value="1." />
- <f:verbatim>
- <span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF Components</font></span>
- </f:verbatim>
- <h:outputText value="2." />
- <f:verbatim>
- <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF Component with Event and non-jsf target</font></span>
- </f:verbatim>
+ <h:outputText value="2." />
+ <f:verbatim>
+ <span onclick="showFrm2(),hideIndexID()"><font color="blue">JSF
+ Component with Event and non-jsf target</font></span>
+ </f:verbatim>
- <h:outputText value="3." />
- <f:verbatim>
- <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF Component with Event and jsf target</font></span>
- </f:verbatim>
+ <h:outputText value="3." />
+ <f:verbatim>
+ <span onclick="showFrm3(),hideIndexID()"><font color="blue">JSF
+ Component with Event and jsf target</font></span>
+ </f:verbatim>
- <h:outputText value="4." />
- <f:verbatim>
- <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF Component with Event.</font></span>
- </f:verbatim>
-
- <h:outputText value="5." />
- <f:verbatim>
- <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace Components.</font></span>
- </f:verbatim>
- </h:panelGrid>
- </rich:panel>
+ <h:outputText value="4." />
+ <f:verbatim>
+ <span onclick="showFrm4(),hideIndexID()"><font color="blue">JSF
+ Component with Event.</font></span>
+ </f:verbatim>
+ <h:outputText value="5." />
+ <f:verbatim>
+ <span onclick="showFrm5(),hideIndexID()"><font color="blue">RichFace
+ Components.</font></span>
+ </f:verbatim>
+ </h:panelGrid>
+ </rich:panel>
+
<rich:panel id="frm1">
<h:outputText value="JSF Components:" />
@@ -86,21 +92,21 @@
<h:panelGroup id="form_1b_ID">
<h:inputText value="onmouse and onclick">
- <rich:effect event="onclick" type="Highlight"
+ <rich:effect event="onclick" type="Fold"
params="duration:0.5,from:0.4,to:1.0" />
- <rich:effect event="onmouseout" type="Opacity"
- params="duration:0.5,from:0.4,to:1.0" />
+ <rich:effect event="onmouseout" type="Highlight"
+ params="duration:0.5,from:1.0,to:0.4" />
</h:inputText>
</h:panelGroup>
</h:panelGrid>
<rich:effect for="panel_1_ID" name="hidePanel1" type="Fade"
params="duration:#{effect.time}" />
- <rich:effect for="panel_1_ID" event="" name="showPanel1" type="Appear" />
+ <rich:effect for="panel_1_ID" name="showPanel1" type="Appear" />
- <rich:effect for="asusID" event="" name="hideImage1" type="Fold"
+ <rich:effect for="asusID" name="hideImage1" type="Fold"
params="duration:#{effect.time}" />
- <rich:effect for="asusID" event="" name="showImage1" type="Grow" />
+ <rich:effect for="asusID" name="showImage1" type="Grow" />
<f:verbatim>
<br />
@@ -108,61 +114,61 @@
</f:verbatim>
</rich:panel>
- <rich:panel id="frm2">
- <h:outputText
- value="JSF Component with Event and non-jsf target (onclick, onmouseout)" />
+ <rich:panel id="frm2">
+ <h:outputText
+ value="JSF Component with Event and non-jsf target (onclick, onmouseout)" />
- <h:panelGrid columns="2">
- <h:graphicImage id="imageID" value="/pics/podb109_61.jpg"
- width="100" height="50">
- <rich:effect event="onclick" targetId="divID" type="Opacity"
- params="duration:0.5,from:0.4,to:1.0" />
- <rich:effect event="onmouseout" type="Opacity"
- params="targetId:'divID',duration:0.5,from:1.0,to:0.4" />
- </h:graphicImage>
+ <h:panelGrid columns="2">
+ <h:graphicImage id="imageID" value="/pics/podb109_61.jpg" width="100"
+ height="50">
+ <rich:effect event="onclick" targetId="divID" type="Opacity"
+ params="duration:0.5,from:0.4,to:1.0" />
+ <rich:effect event="onmouseout" type="Opacity"
+ params="targetId:'divID',duration:0.5,from:1.0,to:0.4" />
+ </h:graphicImage>
- <f:verbatim>
- <div id="divID"
- style="width: 100px; height: 50px; background-color: red"><rich:effect
- event="onclick" targetId="imageID" type="Opacity"
- params="duration:0.5,from:0.4,to:1.0" /> <rich:effect
- event="onmouseout" type="Opacity"
- params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div>
- </f:verbatim>
- </h:panelGrid>
-
<f:verbatim>
- <br />
- <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span>
+ <div id="divID"
+ style="width: 100px; height: 50px; background-color: red"><rich:effect
+ event="onclick" targetId="imageID" type="Opacity"
+ params="duration:0.5,from:0.4,to:1.0" /> <rich:effect
+ event="onmouseout" type="Opacity"
+ params="targetId:'imageID',duration:0.5,from:1.0,to:0.4" /></div>
</f:verbatim>
- </rich:panel>
+ </h:panelGrid>
- <rich:panel id="frm3">
- <h:outputText
- value="JSF Component with Event and jsf target (onclick, onmouseout)" />
+ <f:verbatim>
+ <br />
+ <span onclick="hideFrm2(),showIndexID()"><font color="blue">Close</font></span>
+ </f:verbatim>
+ </rich:panel>
- <h:panelGrid id="gridID" border="1" style="background-color:green">
- <h:outputText value="Panel Content" />
- <rich:effect event="onclick" targetId="imgID" type="Opacity"
- params="duration:0.5,from:0.4,to:1.0" />
- <rich:effect event="onmouseout" targetId="imgID" type="Opacity"
- params="duration:0.5,from:1.0,to:0.4" />
- </h:panelGrid>
+ <rich:panel id="frm3">
+ <h:outputText
+ value="JSF Component with Event and jsf target (onclick, onmouseout)" />
- <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93"
- height="30px">
- <rich:effect event="onmouseout" targetId="gridID" type="Opacity"
- params="duration:0.5,from:0.4,to:1.0" />
- <rich:effect event="onclick" targetId="gridID" type="Opacity"
- params="duration:0.5,from:1.0,to:0.4" />
- </h:graphicImage>
+ <h:panelGrid id="gridID" border="1" style="background-color:green">
+ <h:outputText value="Panel Content" />
+ <rich:effect event="onclick" targetId="imgID" type="Opacity"
+ params="duration:0.5,from:0.4,to:1.0" />
+ <rich:effect event="onmouseout" targetId="imgID" type="Opacity"
+ params="duration:0.5,from:1.0,to:0.4" />
+ </h:panelGrid>
- <f:verbatim>
- <br />
- <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span>
- </f:verbatim>
- </rich:panel>
+ <h:graphicImage id="imgID" value="/pics/podb109_61.jpg" width="93"
+ height="30px">
+ <rich:effect event="onmouseout" targetId="gridID" type="Opacity"
+ params="duration:0.5,from:0.4,to:1.0" />
+ <rich:effect event="onclick" targetId="gridID" type="Opacity"
+ params="duration:0.5,from:1.0,to:0.4" />
+ </h:graphicImage>
+ <f:verbatim>
+ <br />
+ <span onclick="hideFrm3(),showIndexID()"><font color="blue">Close</font></span>
+ </f:verbatim>
+ </rich:panel>
+
<rich:panel id="frm4">
<h:outputText value="1. (Event 2)" />
<h:graphicImage id="img_1_ID" value="/pics/asus.jpg" width="200px"
@@ -194,9 +200,9 @@
<span onclick="hideFrm4(),showIndexID()"><font color="blue">Close</font></span>
</f:verbatim>
</rich:panel>
-
+
<rich:panel id="frm5">
- <h:panelGrid id="panGrID" columns="2">
+ <h:panelGrid id="panelGrdID" columns="2">
<f:verbatim>
<span onclick="hideRichPanel()"><font color="blue">Hide
Panel</font> </span>
@@ -270,29 +276,25 @@
</f:verbatim>
</rich:panel>
- <rich:effect for="indexID" event="" name="hideIndexID" type="BlindUp" />
- <rich:effect for="indexID" event="" name="showIndexID" type="BlindDown" />
- <rich:effect for="frm1" event="" name="hideFrm1" type="Fade" />
- <rich:effect for="frm1" event="" name="showFrm1" type="Appear" />
+ <rich:effect for="indexID" name="hideIndexID" type="SlideUp" />
+ <rich:effect for="indexID" name="showIndexID" type="SlideDown" />
- <rich:effect for="frm2" event="" name="hideFrm2" type="Fade" />
- <rich:effect for="frm2" event="" name="showFrm2" type="Appear" />
+ <rich:effect for="frm1" name="hideFrm1" type="Fade" />
+ <rich:effect for="frm1" name="showFrm1" type="Appear" />
- <rich:effect for="frm3" event="" name="hideFrm3" type="Fade" />
- <rich:effect for="frm3" event="" name="showFrm3" type="Appear" />
-
- <rich:effect for="frm4" event="" name="hideFrm4" type="Fade" />
- <rich:effect for="frm4" event="" name="showFrm4" type="Appear" />
+ <rich:effect for="frm2" name="hideFrm2" type="Fade" />
+ <rich:effect for="frm2" name="showFrm2" type="Appear" />
- <rich:effect for="frm5" event="" name="hideFrm5" type="Fade" />
- <rich:effect for="frm5" event="" name="showFrm5" type="Appear" />
+ <rich:effect for="frm3" name="hideFrm3" type="Fade" />
+ <rich:effect for="frm3" name="showFrm3" type="Appear" />
- <rich:effect for="backFrmID" event="" name="hideBackFrm" type="Fade" />
- <rich:effect for="backFrmID" event="" name="showBackFrm" type="Appear" />
- <rich:panel id="backFrmID">
- <h:commandLink value="Back" action="main"></h:commandLink>
- </rich:panel>
+ <rich:effect for="frm4" name="hideFrm4" type="Fade" />
+ <rich:effect for="frm4" name="showFrm4" type="Appear" />
+
+ <rich:effect for="frm5" name="hideFrm5" type="Fade" />
+ <rich:effect for="frm5" name="showFrm5" type="Appear" />
+ </h:form>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-10-04 19:01:18 UTC (rev 3262)
@@ -13,13 +13,15 @@
}
</style>
-<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
<f:subview id="simpleTogglePanelID">
<h:messages></h:messages>
<h:form>
- <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" width="#{simpleTogglePanel.width}"
- height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" opened="false">
+ <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head"
+ label="simpleTogglePanel with some text"
+ width="#{simpleTogglePanel.width}"
+ height="#{simpleTogglePanel.height}"
+ switchType="#{simpleTogglePanel.switchType}" opened="false">
<f:facet name="closeMarker">
<h:outputText value="Close It" />
</f:facet>
@@ -27,21 +29,26 @@
<h:outputText value="Open It" />
</f:facet>
<f:verbatim>
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- </f:verbatim>
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ </f:verbatim>
</rich:simpleTogglePanel>
- <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}"
- height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" opened="false">
+ <rich:simpleTogglePanel id="sTP1" headerClass="head"
+ label="simpleTogglePanel wiht image"
+ width="#{simpleTogglePanel.width}"
+ height="#{simpleTogglePanel.height}"
+ rendered="#{simpleTogglePanel.rendered}"
+ switchType="#{simpleTogglePanel.switchType}" opened="false">
<h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage>
</rich:simpleTogglePanel>
- <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true"
+ <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle"
+ width="#{simpleTogglePanel.width}" ignoreDupResponses="true"
focus="#{simpleTogglePanel.focus}">
<f:facet name="closeMarker">
<h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage>
@@ -51,14 +58,15 @@
</f:facet>
<rich:simpleTogglePanel id="INsTP">
<h:panelGrid columns="2">
- <h:graphicImage value="/pics/podb109_61.jpg"></h:graphicImage>
- <h:outputText
- value="Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
- Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." />
+ <h:graphicImage value="/pics/podb109_61.jpg" width="250px" height="200px"></h:graphicImage>
+ <f:verbatim>
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text...
+ </f:verbatim>
</h:panelGrid>
</rich:simpleTogglePanel>
</rich:simpleTogglePanel>
@@ -87,13 +95,11 @@
</h:selectOneRadio>
<h:outputText value="Rendered:"></h:outputText>
- <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()">
+ <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}"
+ onclick="submit()">
</h:selectBooleanCheckbox>
</h:panelGrid>
-
-
- <h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-10-04 19:01:18 UTC (rev 3262)
@@ -6,36 +6,43 @@
<h:messages></h:messages>
<h:form id="tooggleTest">
+ <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}"
+ initialState="asus" stateOrder="asus,blank"
+ style="width:300px!important">
+ <f:facet name="blank">
+ <rich:panel>
+ <f:facet name="header">
+ <h:panelGroup>
+ <rich:toggleControl id="toggleControl_blank"
+ for="tooggleTest:panel1">
+ <h:outputText value="Expand" style="font-weight: bold;" />
+ <h:graphicImage url="/pics/collapse.gif"
+ style="border-width: 0px;" />
+ </rich:toggleControl>
+ </h:panelGroup>
+ </f:facet>
+ </rich:panel>
+ </f:facet>
- <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank"
- style="width:300px" >
- <f:facet name="blank">
- <rich:panel>
- <f:facet name="header">
- <h:panelGroup>
- <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1" >
- <h:outputText value="Expand" style="font-weight: bold;" />
- <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" />
- </rich:toggleControl>
- </h:panelGroup>
- </f:facet>
- </rich:panel>
- </f:facet>
-
- <f:facet name="asus">
- <rich:panel>
- <f:facet name="header">
- <h:panelGroup>
- <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1">
- <h:outputText value="Collapse" style="font-weight: bold;" />
- <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
- </rich:toggleControl>
- </h:panelGroup>
- </f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;">
- <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/>
+ <f:facet name="asus">
+ <rich:panel>
+ <f:facet name="header">
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" />
+ <rich:toggleControl id="toggleControl_panel1"
+ for="tooggleTest:panel1">
+ <h:outputText value="Collapse" style="font-weight: bold;" />
+ <h:graphicImage url="/pics/expand.gif"
+ style="border-width: 0px;" />
+ </rich:toggleControl>
+ </h:panelGroup>
+ </f:facet>
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: white;">
+ <h:graphicImage url="/pics/asus.jpg" height="300" width="300"
+ alt="asus.jpg" />
+ <h:panelGroup>
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="Asus F 3 Tc" />
<f:verbatim>
Processor: AMD Turion 64 X 2 - 1600 Mhz<br />
RAM: 1024 Mb<br />
@@ -47,30 +54,35 @@
</h:panelGroup>
</h:panelGrid>
</rich:panel>
- </f:facet>
- </rich:togglePanel>
-
- <f:verbatim>
- <br /><br />
- </f:verbatim>
+ </f:facet>
+ </rich:togglePanel>
+ <br />
+ <br />
- <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}"
- stateOrder="#{togglePanel.stateOrder}">
- <f:facet name="asus">
- <rich:panel>
- <f:facet name="header">
- <h:panelGroup>
- <h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2">
- <h:outputText value="Next"></h:outputText>
- <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
- </rich:toggleControl>
- </h:panelGroup>
- </f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;">
- <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg"/>
+ <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}"
+ initialState="#{togglePanel.initialState}"
+ stateOrder="#{togglePanel.stateOrder}">
+ <f:facet name="asus">
+ <rich:panel>
+ <f:facet name="header">
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" />
+ <h:outputText value="Customizable toggle panel"
+ style="font-weight: bold;" />
+ <rich:toggleControl id="toggleControl_panel_1"
+ for="tooggleTest:panel2">
+ <h:outputText value="Next"></h:outputText>
+ <h:graphicImage url="/pics/expand.gif"
+ style="border-width: 0px;" />
+ </rich:toggleControl>
+ </h:panelGroup>
+ </f:facet>
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: white;">
+ <h:graphicImage url="/pics/asus.jpg" height="300" width="300"
+ alt="asus.jpg" />
+ <h:panelGroup>
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="Asus F 3 Tc" />
<f:verbatim>
Processor: AMD Turion 64 X 2 - 1600 Mhz<br />
RAM: 1024 Mb<br />
@@ -83,22 +95,28 @@
</h:panelGrid>
</rich:panel>
</f:facet>
-
- <f:facet name="benq">
- <rich:panel>
- <f:facet name="header">
- <h:panelGroup>
- <h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2">
- <h:outputText value="Next"></h:outputText>
- <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
- </rich:toggleControl>
- </h:panelGroup>
- </f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;">
- <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg"/>
+
+ <f:facet name="benq">
+ <rich:panel>
+ <f:facet name="header">
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" />
+ <h:outputText value="Customizable toggle panel"
+ style="font-weight: bold;" />
+ <rich:toggleControl id="toggleControl_panel_2"
+ for="tooggleTest:panel2">
+ <h:outputText value="Next"></h:outputText>
+ <h:graphicImage url="/pics/expand.gif"
+ style="border-width: 0px;" />
+ </rich:toggleControl>
+ </h:panelGroup>
+ </f:facet>
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: yellow;">
+ <h:graphicImage url="/pics/benq.jpg" height="300" width="300"
+ alt="benq.jpg" />
+ <h:panelGroup>
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="BenQ A 52" />
<f:verbatim>
Processor: Core Duo T2250 (1.73GHz)<br />
RAM: 1024 Mb<br />
@@ -111,22 +129,28 @@
</h:panelGrid>
</rich:panel>
</f:facet>
-
- <f:facet name="toshiba">
- <rich:panel>
- <f:facet name="header">
- <h:panelGroup>
- <h:outputText value="Customizable toggle panel" style="font-weight: bold;" />
- <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2">
- <h:outputText value="Next"></h:outputText>
- <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" />
- </rich:toggleControl>
- </h:panelGroup>
- </f:facet>
- <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;">
- <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg"/>
+
+ <f:facet name="toshiba">
+ <rich:panel>
+ <f:facet name="header">
<h:panelGroup>
- <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" />
+ <h:outputText value="Customizable toggle panel"
+ style="font-weight: bold;" />
+ <rich:toggleControl id="toggleControl_panel_3"
+ for="tooggleTest:panel2">
+ <h:outputText value="Next"></h:outputText>
+ <h:graphicImage url="/pics/expand.gif"
+ style="border-width: 0px;" />
+ </rich:toggleControl>
+ </h:panelGroup>
+ </f:facet>
+ <h:panelGrid columns="2" border="0"
+ style="width: 100%;background-color: orange;">
+ <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300"
+ alt="toshiba.jpg" />
+ <h:panelGroup>
+ <h:outputText style="font: 18px;font-weight: bold;"
+ value="Toshiba Satellite A 100-784" />
<f:verbatim>
Processor: Intel Core Duo T2250 - 1.73GHz<br />
RAM: 1024 Mb<br />
@@ -138,41 +162,41 @@
</h:panelGroup>
</h:panelGrid>
</rich:panel>
- </f:facet>
- </rich:togglePanel>
-
- <f:verbatim>
- <br /><br />
- </f:verbatim>
-
- <rich:separator height="5px" width="500px" />
+ </f:facet>
+ </rich:togglePanel>
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
+ <rich:separator height="5px" width="500px" />
- <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
- <h:outputText value="InitialState:"></h:outputText>
- <h:selectOneRadio value="#{togglePanel.initialState}">
- <f:selectItem itemLabel="Asus" itemValue="asus" />
- <f:selectItem itemLabel="Benq" itemValue="benq" />
- <f:selectItem itemLabel="toshiba" itemValue="toshiba" />
- <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support>
- </h:selectOneRadio>
+ <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
+ <h:outputText value="InitialState:"></h:outputText>
+ <h:selectOneRadio value="#{togglePanel.initialState}">
+ <f:selectItem itemLabel="Asus" itemValue="asus" />
+ <f:selectItem itemLabel="Benq" itemValue="benq" />
+ <f:selectItem itemLabel="toshiba" itemValue="toshiba" />
+ <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support>
+ </h:selectOneRadio>
- <h:outputText value="StateOrder:"></h:outputText>
- <h:selectOneRadio value="#{togglePanel.stateOrder}">
- <f:selectItem itemLabel="Asus,Benq,Toshiba" itemValue="asus,benq,toshiba" />
- <f:selectItem itemLabel="Toshiba, Asus, Benq" itemValue="toshiba,asus,benq" />
- <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support>
- </h:selectOneRadio>
+ <h:outputText value="StateOrder:"></h:outputText>
+ <h:selectOneRadio value="#{togglePanel.stateOrder}">
+ <f:selectItem itemLabel="Asus,Benq,Toshiba"
+ itemValue="asus,benq,toshiba" />
+ <f:selectItem itemLabel="Toshiba, Asus, Benq"
+ itemValue="toshiba,asus,benq" />
+ <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support>
+ </h:selectOneRadio>
- <h:outputText value="switchType:"></h:outputText>
- <h:selectOneRadio value="#{togglePanel.switchType}">
- <f:selectItem itemLabel="client" itemValue="client" />
- <f:selectItem itemLabel="server" itemValue="server" />
- <f:selectItem itemLabel="ajax" itemValue="ajax" />
- <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support>
- </h:selectOneRadio>
- </h:panelGrid>
- <h:commandLink value="Back" action="main"></h:commandLink>
- <ui:debug hotkey="L"></ui:debug>
+ <h:outputText value="switchType:"></h:outputText>
+ <h:selectOneRadio value="#{togglePanel.switchType}">
+ <f:selectItem itemLabel="client" itemValue="client" />
+ <f:selectItem itemLabel="server" itemValue="server" />
+ <f:selectItem itemLabel="ajax" itemValue="ajax" />
+ <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support>
+ </h:selectOneRadio>
+ </h:panelGrid>
+
</h:form>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-04 16:52:49 UTC (rev 3261)
+++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-10-04 19:01:18 UTC (rev 3262)
@@ -4,20 +4,20 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="tooltipID">
<h:form>
- <h:messages />
-
+ <h:messages></h:messages>
+
<h:outputText value="DEFAULT VALUE:"></h:outputText>
-
+
<f:verbatim>
<br />
</f:verbatim>
-
+
<h:graphicImage value="/pics/ajax_process.gif" width="15px"
height="15px">
<rich:toolTip value="ajax progress">
</rich:toolTip>
</h:graphicImage>
-
+
<h:inputText value="Text" id="inp1" size="50">
<rich:toolTip value="toolTip for input text">
<f:facet name="defaultContent">
@@ -43,10 +43,10 @@
<f:verbatim>
<br />
</f:verbatim>
-
+
<rich:panel style="width:50px; height:50px; background-color: gray">
- <rich:toolTip id="tooltipID" value="#{tooltip.value}"
- mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}"
+ <rich:toolTip id="tooltipID" value="#{tooltip.value}"
+ mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}"
horizontalOffset="#{tooltip.horizontalOffset}"
verticalOffset="#{tooltip.verticalOffset}"
followMouse="#{tooltip.followMouse}"
@@ -59,6 +59,7 @@
<f:verbatim>
<br />
</f:verbatim>
+
<h:panelGrid columns="2">
<h:outputText value="Text:"></h:outputText>
<h:inputText value="#{tooltip.value}">
@@ -132,12 +133,6 @@
<a4j:support event="onclick" reRender="tooltipID" />
</h:selectBooleanCheckbox>
</h:panelGrid>
- <!-- h:inputText value="ddd"
- onclick="toolTipAttach();alert(document.getElementById('lkjl'))" /-->
-
- </h:form>
- <h:form>
- <h:commandLink value="Back" action="main"></h:commandLink>
- </h:form>
+ </h:form>
</f:subview>
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3261 - trunk/samples/suggestionbox-sample.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-10-04 12:52:49 -0400 (Thu, 04 Oct 2007)
New Revision: 3261
Modified:
trunk/samples/suggestionbox-sample/pom.xml
Log:
fixed dependenices
Modified: trunk/samples/suggestionbox-sample/pom.xml
===================================================================
--- trunk/samples/suggestionbox-sample/pom.xml 2007-10-04 16:47:57 UTC (rev 3260)
+++ trunk/samples/suggestionbox-sample/pom.xml 2007-10-04 16:52:49 UTC (rev 3261)
@@ -14,13 +14,13 @@
<finalName>suggestionbox-sample</finalName>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
<artifactId>suggestionbox</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3260 - 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-10-04 12:47:57 -0400 (Thu, 04 Oct 2007)
New Revision: 3260
Modified:
trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
Log:
RF-1063
Modified: trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-10-04 16:40:21 UTC (rev 3259)
+++ trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-10-04 16:47:57 UTC (rev 3260)
@@ -88,7 +88,6 @@
border-right: 1px dashed;
cursor: col-resize;
z-index: 100;
- display: none;
}
/**
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2007-10-04 16:40:21 UTC (rev 3259)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2007-10-04 16:47:57 UTC (rev 3260)
@@ -68,7 +68,7 @@
<div id="#{clientId}" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="dr-sdt rich-sdt #{component.attributes['styleClass']}" >
- <div id="#{clientId}:cs" class="dr-sdt-hsplit" />
+ <div id="#{clientId}:cs" class="dr-sdt-hsplit" style="display: none;"/>
<div id="#{clientId}_GridHeaderTemplate" class="dr-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};">
<iframe id="#{clientId}:hs" class="dr-sdt-substrate" src="" scrolling="no" frameborder="0" > <br/> </iframe>
<div style="display: block; left: 0px; top: 0px; width: #{sumWidth}px;">
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3259 - in branches/3.1.x/ui/scrollableDataTable/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-10-04 12:40:21 -0400 (Thu, 04 Oct 2007)
New Revision: 3259
Modified:
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
Log:
RF-1063
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-10-04 16:17:32 UTC (rev 3258)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-10-04 16:40:21 UTC (rev 3259)
@@ -132,6 +132,7 @@
this.getBody().adjustColumnWidth(index, width);
if(this.getFooter()) this.getFooter().adjustColumnWidth(index, width);
this.updateLayout();
+ this.getHeader().agjustSeparators();
this.eventOnResizeColumn.fire(index, width);
},
adjustScrollPosition: function(pos) {
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-10-04 16:17:32 UTC (rev 3258)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-10-04 16:40:21 UTC (rev 3259)
@@ -468,7 +468,6 @@
this._columns[column].col.width = width>0 ? width : 1;
if(width<=0) this.getColumns()[column].sep.hide();
this._columns[column].width = width;
- this.agjustSeparators();
},
setFakeColumnWidth: function() {
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-10-04 16:17:32 UTC (rev 3258)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-10-04 16:40:21 UTC (rev 3259)
@@ -88,7 +88,6 @@
border-right: 1px dashed;
cursor: col-resize;
z-index: 100;
- display: none;
}
/**
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2007-10-04 16:17:32 UTC (rev 3258)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2007-10-04 16:40:21 UTC (rev 3259)
@@ -68,7 +68,7 @@
<div id="#{clientId}" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="dr-sdt rich-sdt #{component.attributes['styleClass']}" >
- <div id="#{clientId}:cs" class="dr-sdt-hsplit" />
+ <div id="#{clientId}:cs" class="dr-sdt-hsplit" style="display:none;"/>
<div id="#{clientId}_GridHeaderTemplate" class="dr-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};">
<iframe id="#{clientId}:hs" class="dr-sdt-substrate" src="" scrolling="no" frameborder="0" > <br/> </iframe>
<div style="display: block; left: 0px; top: 0px; width: #{sumWidth}px;">
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3258 - in trunk: ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-10-04 12:17:32 -0400 (Thu, 04 Oct 2007)
New Revision: 3258
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
RF-1035
+ positioning improved (auto center didn't work in opera)
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2007-10-04 14:47:33 UTC (rev 3257)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2007-10-04 16:17:32 UTC (rev 3258)
@@ -149,6 +149,7 @@
}
Richfaces.browser= {
+ isIE: (!window.opera && /MSIE/.test(navigator.userAgent)),
isIE6: (!window.opera && /MSIE\s*[6][\d,\.]+;/.test(navigator.userAgent)),
isSafari: /Safari/.test(navigator.userAgent)
};
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-10-04 14:47:33 UTC (rev 3257)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-10-04 16:17:32 UTC (rev 3258)
@@ -104,7 +104,7 @@
ModalPanel.Context = Class.create();
ModalPanel.Context.prototype = {
initialize: function(modalPanel) {
- this.cdiv = modalPanel.contentDiv;
+ this.cdiv = modalPanel.contentTable;
this.isPositionFixed = Richfaces.getComputedStyle(this.cdiv, "position") == "fixed";
},
@@ -155,6 +155,7 @@
this.cursorDiv = id + "CursorDiv";
this.cdiv = id + "CDiv";
this.contentDiv = id + "ContentDiv";
+ this.contentTable = id + "ContentTable";
this.shadowDiv = id + "ShadowDiv";
this.context = new ModalPanel.Context(this);
@@ -504,10 +505,14 @@
}
var eContentDiv = $(this.contentDiv);
- var eShadowDiv = $(this.shadowDiv);
if (this.options.autosized) {
eContentDiv.style.overflow = "";
+ options.width = -1;
+ options.height = -1;
+ eContentDiv.style.width="100%";
+ eContentDiv.style.height="100%";
+
} else {
if (options.width && options.width == -1)
options.width = 300;
@@ -520,11 +525,7 @@
options.width = this.minWidth;
}
- if (eIframe) {
- eIframe.style.width = options.width + (/px/.test(options.width) ? '' : 'px');
- }
eContentDiv.style.width = options.width + (/px/.test(options.width) ? '' : 'px');
- eShadowDiv.style.width = options.width + (/px/.test(options.width) ? '' : 'px');
}
if (options.height && options.height != -1) {
@@ -532,13 +533,9 @@
options.height = this.minHeight;
}
- if (eIframe) {
- eIframe.style.height = options.height + (/px/.test(options.height) ? '' : 'px');
- }
eContentDiv.style.height = options.height + (/px/.test(options.height) ? '' : 'px');
- eShadowDiv.style.height = options.height + (/px/.test(options.height) ? '' : 'px');
}
-
+
eCdiv.mpSet = true;
//Element.setStyle(this.dialogWindow.document.body, { "margin" : "0px 0px 0px 0px" });
@@ -593,7 +590,8 @@
element.style.visibility = "hidden";
Element.show(element);
-
+ this.correctShadowSizeEx(eContentDiv);
+
if (options.left) {
var _left;
if (options.left != "auto") {
@@ -601,11 +599,13 @@
} else {
var cw = getSizeElement().clientWidth;
if (RichFaces.navigatorType() == "OPERA")
- _left = (cw - eContentDiv.style.width.replace("px", "")) / 2;
+ {
+ _left = (cw - eContentDiv.parentNode.getWidth()) / 2;
+ }
else {
- var _width = Richfaces.getComputedStyleSize(eContentDiv, "width");
+ var _width = Richfaces.getComputedStyleSize(eContentDiv.parentNode, "width");
if (isNaN(_width))
- _width = eContentDiv.clientWidth;
+ _width = eContentDiv.parentNode.clientWidth;
_left = (cw - _width) / 2;
}
@@ -622,12 +622,12 @@
var cw = getSizeElement().clientHeight;
if (RichFaces.navigatorType() == "OPERA")
{
- _top = (cw - eContentDiv.style.height.replace("px", "")) / 2;
+ _top = (cw - eContentDiv.parentNode.getHeight()) / 2;
}
else {
- var _height = Richfaces.getComputedStyleSize(eContentDiv, "height");
+ var _height = Richfaces.getComputedStyleSize(eContentDiv.parentNode, "height");
if (isNaN(_height))
- _height = eContentDiv.clientHeight;
+ _height = eContentDiv.parentNode.clientHeight;
_top = (cw - _height) / 2;
}
}
@@ -739,11 +739,12 @@
var newSize;
var eContentDiv = $(this.contentDiv);
- var eShadowDiv = $(this.shadowDiv);
// Avoid currentStyle bug in opera
if (RichFaces.navigatorType() != "OPERA")
+ {
newSize = Richfaces.getComputedStyleSize(eContentDiv, "width");
+ }
else
newSize = parseInt(eContentDiv.style.width.replace("px", ""), 10);
@@ -790,7 +791,9 @@
// Avoid currentStyle bug in opera
if (RichFaces.navigatorType() != "OPERA")
+ {
newSize = Richfaces.getComputedStyleSize(eContentDiv, "height");
+ }
else
newSize = parseInt(eContentDiv.style.height.replace("px", ""), 10);
@@ -837,10 +840,7 @@
Element.setStyle(eCdiv, cssHash);
Element.setStyle(eContentDiv, cssHashWH);
- Element.setStyle(eShadowDiv, cssHashWH);
- if (this.iframe) {
- Element.setStyle($(this.iframe), cssHashWH);
- }
+ this.correctShadowSizeEx(eContentDiv);
Object.extend(this.userOptions, cssHash);
Object.extend(this.userOptions, cssHashWH);
@@ -899,17 +899,27 @@
correctShadowSize: function(event) {
var eContentDiv = $(this.contentDiv);
+ this.correctShadowSizeEx($(this.contentDiv));
+ },
+
+ correctShadowSizeEx: function(eContentDiv) {
var eShadowDiv = $(this.shadowDiv);
var eIframe = $(this.iframe);
- var cWidth = eContentDiv.clientWidth;
- var cHeight = eContentDiv.clientHeight;
-
- eShadowDiv.style.width = cWidth+"px";
- eShadowDiv.style.height = cHeight+"px";
+ var dx = 0;
+ var dy = 0;
+ if (!Richfaces.browser.isIE)
+ {
+ dx = eShadowDiv.offsetWidth-eShadowDiv.clientWidth;
+ dy = eShadowDiv.offsetHeight-eShadowDiv.clientHeight;
+ }
+ var w = eContentDiv.parentNode.offsetWidth;
+ var h = eContentDiv.parentNode.offsetHeight;
+ eShadowDiv.style.width = (w-dx)+"px";
+ eShadowDiv.style.height = (h-dy)+"px";
if (eIframe) {
- eIframe.style.width = cWidth+"px";
- eIframe.style.height = cHeight+"px";
+ eIframe.style.width = w+"px";
+ eIframe.style.height = h+"px";
}
}
}
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-10-04 14:47:33 UTC (rev 3257)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-10-04 16:17:32 UTC (rev 3258)
@@ -72,9 +72,8 @@
<div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow"
style="#{component.shadowStyle}" >
</div>
-
- <div style="position: absolute; overflow: hidden; z-index: 2; #{component.attributes['style']}"
- class="dr-mpnl-pnl" id="#{clientId}ContentDiv">
+ <table id="#{clientId}ContentTable" cellpadding="0" cellspacing="0" border="0" style="position: absolute; z-index: 2;"><tbody><tr><td class="dr-mpnl-pnl">
+ <div id="#{clientId}ContentDiv" style="overflow: hidden; #{component.attributes['style']}">
<a href="#" class="dr-mpnl-pnl-a" id="#{clientId}FirstHref" >_</a>
<table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0">
@@ -113,6 +112,7 @@
</tr>
</table>
</div>
+ </td></tr></tbody></table>
</div>
<script type="text/javascript">
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3257 - in branches/3.1.x/docs/userguide/en/src/main/docbook: modules and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-10-04 10:47:33 -0400 (Thu, 04 Oct 2007)
New Revision: 3257
Modified:
branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dndParam.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/effect.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/insert.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionBox.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/tooltip.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml
Log:
http://jira.jboss.com/jira/browse/RF-971 - updated branch version.
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -430,7 +430,7 @@
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a popup element</title>
@@ -987,7 +987,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/calendar.jsf?c=calendar"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:calendar></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -31,7 +31,7 @@
<section>
- <title>Creating on a page</title>
+ <title>Creating the Component with a Page Tag</title>
<para>Simple Component definition on a page:</para>
<para>
@@ -45,7 +45,7 @@
</section>
<section>
- <title>Dynamical creation of a component from Java code</title>
+ <title>Creating the Component Dynamically Using Java</title>
<para>
<emphasis role="bold">Example:</emphasis></para>
<programlisting role="JAVA"><![CDATA[package demo;
@@ -65,7 +65,7 @@
</section>
<section>
- <title>Key attributes and ways of usage</title>
+ <title>Details of usage</title>
<para>
The <property><rich:changeExpandListener></property> is used as a nested tag with <property><rich:tree></property>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -196,14 +196,14 @@
</itemizedlist>
</section>
<section>
- <title>Definition Custom Style Classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>To redefine an appearance of all <property>columns</property> on a page, redefine the corresponding class in the CSS file used with the page.</para>
<para>To redefine a style of a particular page, use component class attributes which list is the same as the <property>column</property> one and is known to you.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=column"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:column></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -181,7 +181,7 @@
</itemizedlist>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>To redefine an appearance of all <property>columnGroups</property> on a page, redefine the corresponding class in the
CSS file used with the page.</para>
@@ -190,7 +190,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=colum..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:columnGroup></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -156,7 +156,7 @@
<para>To redefine a style of a particular <property>dataDefinitionList</property>, use corresponding class attributes on the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataLists.jsf?c=dataD..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:dataDefinitionList></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -123,7 +123,7 @@
defined.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataFilterSlider.jsf?..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -117,17 +117,17 @@
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
- <para>To redefine an appearance of all <property>dataGrids</property> on a page, redefine the corresponding class in
+ <para>To redefine an appearance of all <property>dataGrids</property> on a page, redefine the corresponding class in
the CSS file used with the page.</para>
<para>To redefine a style of a particular table, use <emphasis ><property>"component class"</property></emphasis> attributes which list is the same
as the <property>dataTable</property> one and is known to you.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataGrid.jsf?c=dataGrid"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:dataGrid></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -153,7 +153,7 @@
<para>To redefine a style of a particular dataList, use corresponding class attributes on the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataLists.jsf?c=dataList"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:dataList></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -151,7 +151,7 @@
<para>To redefine a style of a particular dataOrderedList, use corresponding class attributes on the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataLists.jsf?c=dataO..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:dataOrderedList ></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -58,7 +58,7 @@
]]></programlisting>
</section>
<section>
- <title>Dynamical creation from Java code</title>
+ <title>Creating the Component Dynamically from Java</title>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -126,7 +126,7 @@
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a table</title>
@@ -329,7 +329,7 @@
known to you.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=dataT..."
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -60,7 +60,7 @@
]]></programlisting>
</section>
<section>
- <title>Dynamical creation from Java code</title>
+ <title>Creating the Component Dynamically Using Java</title>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -214,7 +214,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a wrapper element</title>
<tgroup cols="2">
@@ -394,7 +394,7 @@
attributes on the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dndParam.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dndParam.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dndParam.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -170,7 +170,7 @@
processes it on the next drop event.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevan Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dnd..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:dndParam></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -248,7 +248,7 @@
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -31,7 +31,7 @@
<section>
- <title>Creating on a page</title>
+ <title>Creating the Component with a Page Tag</title>
<para>Simple Component definition on a page:</para>
<para>
@@ -45,7 +45,7 @@
</section>
<section>
- <title>Dynamical creation of a component from Java code</title>
+ <title>Creating the Component Dynamically Using Java</title>
<para>
<emphasis role="bold">Example:</emphasis></para>
<programlisting role="JAVA"><![CDATA[package demo;
@@ -65,7 +65,7 @@
</section>
<section>
- <title>Key attributes and ways of usage</title>
+ <title>Details of Usage</title>
<para>
The <property><rich:dragListener></property> is used as nested tag with components like
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -197,7 +197,7 @@
<para>The component doesn't have its own representation.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra..."
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -316,7 +316,7 @@
</section>
<section>
- <title> Skin parameters redefinition</title>
+ <title> Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a label <div> element</title>
@@ -548,7 +548,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <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"><property><rich:dropDownMenu></property></emphasis> usage and sources for the given example.
</para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -31,7 +31,7 @@
<section>
- <title>Creating on a page</title>
+ <title>Creating the Component with a Page Tag</title>
<para>Simple Component definition on a page:</para>
<para>
@@ -45,7 +45,7 @@
</section>
<section>
- <title>Dynamical creation of a component from Java code</title>
+ <title>Creating the Component Dynamically Using Java</title>
<para>
<emphasis role="bold">Example:</emphasis></para>
<programlisting role="JAVA"><![CDATA[package demo;
@@ -65,7 +65,7 @@
</section>
<section>
- <title>Key attributes and ways of usage</title>
+ <title>Details of Usage</title>
<para>
The <property><rich:dropListener></property> is used as nested tag with components like
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -244,7 +244,7 @@
<para>The component doesn't have its own visual presentation.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<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"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/effect.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/effect.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/effect.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -103,7 +103,7 @@
<rich:effect name="showDiv" for="contentDiv" type="Appear" />
<!-- attaching to window on load and applying on particular page element -->
-<rich:effect for="window" event="onload" type="Appear" params="id:'contentDiv',duration:0.8,from:0.3,to:1.0" />
+<rich:effect for="window" event="onload" type="Appear" params="targetId:'contentDiv',duration:0.8,from:0.3,to:1.0" />
...
]]></programlisting>
@@ -151,7 +151,7 @@
not, the value is left as is for possible wiring with on the DOM element's id on the client
side. By default, the target of the effect is the same element that effect pointed to.
However, the target element is might be overridden with <emphasis>
- <property>"effectId"</property>
+ <property>"targetId"</property>
</emphasis> option passed with <emphasis>
<property>"params"</property>
</emphasis> attribute of with function paramenter. </para>
@@ -164,21 +164,21 @@
itself, there are two option that might override the <property>rich:effect</property>
attribute. Those are: <itemizedlist>
<listitem><emphasis>
- <property>"effectId"</property>
+ <property>"targetId"</property>
</emphasis> allows to re-define the target of effect. The option is override the value of <emphasis>
<property>"for"</property>
- </emphasis> attribute</listitem>
+ </emphasis> attribute.</listitem>
<listitem><emphasis>
- <property>"effectType"</property>
+ <property>"type"</property>
</emphasis> defines the effect type. The option is override the value of <emphasis>
<property>"type"</property>
- </emphasis> attribute</listitem>
+ </emphasis> attribute.</listitem>
</itemizedlist>
</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/effect.jsf?c=effect"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -162,13 +162,13 @@
Map</property>.</emphasis></para>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>rich-gmap is a predefined style class for the map. It's possible to define some
standard properties for all <property>maps</property> components on a page (padding, border,
etc.) with the definition of the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/gmap.jsf?c=gmap">Here</ulink>
you can see the example of <emphasis role="bold"><property><rich:gmap></property></emphasis> usage
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -154,7 +154,7 @@
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a bar</title>
@@ -374,7 +374,7 @@
well as a style font for an input field of a particular <property>slider</property>.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/inputNumberSlider.jsf..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -141,7 +141,7 @@
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a container</title>
<tgroup cols="2">
@@ -271,7 +271,7 @@
a font-weight for an entry field of the particular <property>spinner</property>.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/inputNumberSpinner.js..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/insert.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/insert.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/insert.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -117,7 +117,7 @@
used by the <ulink url="https://jhighlight.dev.java.net/">JHighlight</ulink> library.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/insert.jsf?c=insert"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:insert></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -173,7 +173,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a group</title>
<tgroup cols="2">
@@ -317,7 +317,7 @@
in the corresponding menuGroup attributes. </para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=me..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:menuGroup></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -178,7 +178,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for an item</title>
<tgroup cols="2">
@@ -353,7 +353,7 @@
corresponding menuItem attributes. </para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=me..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:menuItem></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -84,13 +84,13 @@
</itemizedlist>
</section>
<section>
- <title>Redefinition of Skin Parameters</title>
+ <title>Skin Parameters Redefinition</title>
<table>
- <title>Label skin parameters redefinition</title>
+ <title>Skin parameters redefinition for an item</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for item</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -105,9 +105,9 @@
</section>
<section>
<title>Definition of Custom Style Classes</title>
- <para>
- In the screenshot, there are the classes names that define separator element appearance.
- </para>
+
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
<title>Classes names</title>
<mediaobject>
@@ -127,8 +127,8 @@
</thead>
<tbody>
<row>
- <entry>Rich-menu-item</entry>
- <entry>Defines the class for div element for separator</entry>
+ <entry>rich-menu-separator</entry>
+ <entry>Defines styles for a wrapper <div> element for a separator</entry>
</row>
</tbody>
</tgroup>
@@ -141,7 +141,7 @@
</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=me..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:menuSeparator></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -135,6 +135,8 @@
<section>
<title>Definition of Custom Style Classes</title>
+
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
<figure>
<title>Classes names</title>
@@ -146,10 +148,8 @@
</mediaobject>
</figure>
- <para>On the screenshot, there are classes names defining specified elements.</para>
-
<table>
- <title>Component skin class</title>
+ <title>Classes names that define a component appearance</title>
<tgroup cols="2">
<thead>
@@ -164,19 +164,19 @@
<row>
<entry>rich-message</entry>
- <entry>Defines the class for wrapper element</entry>
+ <entry>Defines styles for a wrapper element</entry>
</row>
<row>
<entry>rich-message-marker</entry>
- <entry>Defines the class for marker element</entry>
+ <entry>Defines styles for a marker</entry>
</row>
<row>
<entry>rich-message-label</entry>
- <entry>Defines the class for label element</entry>
+ <entry>Defines styles for a label</entry>
</row>
</tbody>
@@ -194,7 +194,7 @@
</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/message.jsf?c=message"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:message></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -130,62 +130,50 @@
<section>
<title>Definition of Custom Style Classes</title>
-
+
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
<title>Classes names</title>
-
+
<mediaobject>
<imageobject>
<imagedata fileref="images/messages1.png"/>
</imageobject>
</mediaobject>
</figure>
-
- <para>On the screenshot, there are classes names defining specified elements.</para>
-
+
<table>
- <title>Component skin class</title>
-
+ <title>Classes names that define a component appearance</title>
+
<tgroup cols="2">
<thead>
<row>
<entry>Class name</entry>
-
+
<entry>Description</entry>
</row>
</thead>
-
+
<tbody>
<row>
<entry>rich-messages</entry>
-
- <entry>Defines styles for outer element</entry>
+
+ <entry>Defines styles for a wrapper element</entry>
</row>
-
+
<row>
<entry>rich-messages-marker</entry>
-
- <entry>Defines styles for icon element</entry>
+
+ <entry>Defines styles for a marker</entry>
</row>
-
+
<row>
<entry>rich-messages-label</entry>
-
- <entry>Defines styles for informational label element</entry>
- </row>
-
- <!--row>
- <entry>rich-messages-header</entry>
- <entry>Defines styles for header element</entry>
+ <entry>Defines styles for a label</entry>
</row>
- <row>
- <entry>rich-passed</entry>
-
- <entry>Defines styles for all messages elements (marker, label, header)</entry>
- </row-->
-
</tbody>
</tgroup>
</table>
@@ -203,7 +191,7 @@
</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/messsages.jsf?c=messages"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:messages></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -457,7 +457,7 @@
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<figure>
<title>Modal Panel class names</title>
@@ -507,7 +507,7 @@
</table>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/modalPanel.jsf?c=moda..."
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -31,7 +31,7 @@
<section>
- <title>Creating on a page</title>
+ <title>Creating the Component with a Page Tag</title>
<para>Simple Component definition on a page:</para>
<para>
@@ -45,7 +45,7 @@
</section>
<section>
- <title>Dynamical creation of a component from Java code</title>
+ <title>Creating the Component Dynamically Using Java</title>
<para>
<emphasis role="bold">Example:</emphasis></para>
<programlisting role="JAVA"><![CDATA[package demo;
@@ -65,7 +65,7 @@
</section>
<section>
- <title>Key attributes and ways of usage</title>
+ <title>Details of usage</title>
<para>
The <property><rich:nodeSelectListener></property> is used as nested tag with <property><rich:tree></property>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -159,7 +159,7 @@
</emphasis> attributes on the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/paint2D.jsf?c=paint2d"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -170,7 +170,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters for the panel</title>
<tgroup cols="2">
@@ -256,7 +256,7 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<figure>
<title>Style classes of panel</title>
@@ -332,7 +332,7 @@
</figure>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panel.jsf?c=panel"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -107,7 +107,7 @@
</itemizedlist>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>There is one predefined class for the <property>panelBar</property>, which is
applicable to the whole component, specifying padding, borders, and etc.</para>
<figure>
@@ -211,7 +211,7 @@
a font for particular <property>panelBarItems</property> content.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panelBar.jsf?c=panelBar"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -112,7 +112,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters for the panel content appearance</title>
<tgroup cols="2">
@@ -157,7 +157,7 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<figure>
<title>PanelBarItem style classes</title>
<mediaobject>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -245,7 +245,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panelMenu.jsf?c=panel..."
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:panelMenu></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -252,7 +252,7 @@
</section>
<section>
- <title> Skin parameters redefinition</title>
+ <title> Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for table element of the first level group</title>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -255,7 +255,7 @@
</section>
<section>
- <title> Skin parameters redefinition</title>
+ <title> Skin Parameters Redefinition</title>
<table>
<title>Skin parameters redefinition for a table element item of the first level</title>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -56,7 +56,7 @@
]]></programlisting>
</section>
<section>
- <title>Dynamical creation from Java code</title>
+ <title>Creating the Component Dynamically Using Java</title>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -176,7 +176,7 @@
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters for all table</title>
<tgroup cols="2">
@@ -463,7 +463,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/scrollableDataTable.j...">Here</ulink>
you can see the example of <emphasis role="bold"><property><rich:scrollableDataTable></property>s</emphasis> usage. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -121,7 +121,7 @@
</emphasis>) modifying component property.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/separator.jsf?c=separ..."
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -130,7 +130,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition</title>
+ <title>Skin Parameters Redefinition</title>
<table>
<title>Skin parameters for the whole simpleTogglePanels</title>
<tgroup cols="2">
@@ -216,7 +216,7 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<figure>
<title>Style classes of simpleTogglePanel</title>
<mediaobject>
@@ -296,7 +296,7 @@
</table>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/simpleTogglePanel.jsf..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -100,7 +100,7 @@
</emphasis>) modifying component property.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/spacer.jsf?c=spacer"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionBox.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -254,7 +254,7 @@
</section>
<section>
- <title> Skin parameters redefinition</title>
+ <title> Skin Parameters Redefinition</title>
<table>
<title>General skin parameters redefinition for popup list</title>
@@ -469,7 +469,7 @@
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/suggestionBox.jsf?c=s..."
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -173,7 +173,7 @@
</section>
<section>
- <title>Definition Custom Style Classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>The style peculiarities of a particular <property>Tab</property> variant could be changed with specification of your
own StyleClasses attributes.</para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -168,7 +168,7 @@
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<figure>
@@ -247,7 +247,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/tabPanel.jsf?c=tabPanel"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -144,7 +144,7 @@
facets, thus all look and feel is set only for content.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/togglePanel.jsf?c=tog..."
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -139,7 +139,7 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>On generating, the component substitutes the default class rich-toolbar-exterior into <emphasis>
<property>style class</property>
</emphasis> of a generated component, i.e. to redefine at once all
@@ -151,7 +151,7 @@
</emphasis> that could redefine an appearance of a particular component variants.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolBar.jsf?c=toolBar"
>Here</ulink> you can see the example of <emphasis role="bold"
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -162,7 +162,7 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>On generating, the component substitutes the default class rich-toolbar-interior into
<emphasis
><property>style class</property></emphasis> of a generated component, i.e.
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tooltip.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tooltip.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tooltip.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -237,7 +237,7 @@
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>
<property>Tooltip</property> provides one class "rich-tool-tip" which applies to a wrapper element <emphasis><property>"span"</property></emphasis> or "div"
dependently to <property>tooltip</property> layout. In order to redefine style for all <property>tooltips</property>
@@ -247,7 +247,7 @@
</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolTip.jsf?c=toolTip"
>Here</ulink> you can see the example of <emphasis role="bold"
><property><rich:toolTip></property></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -263,7 +263,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition:</title>
+ <title>Skin Parameters Redefinition:</title>
<para>There is only one skin parameter for the <property>tree</property> since <emphasis
role="bold">
<property><rich:tree></property>
@@ -289,7 +289,7 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>The <property>tree</property> also has only one predefined Style Class responsible for
displaying a wrapper element of the <property>tree</property> - <emphasis role="bold">
<property><rich:tree></property>
@@ -297,7 +297,7 @@
the page.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/tree.jsf?c=tree">Here</ulink>
you can see the example of <emphasis role="bold"><property><rich:tree></property></emphasis> usage
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -180,7 +180,7 @@
</itemizedlist>
</section>
<section>
- <title>Skin parameters redefinition:</title>
+ <title>Skin Parameters Redefinition:</title>
<table>
<title>Default skins for treeNode element</title>
<tgroup cols="2">
@@ -252,7 +252,7 @@
application, change these parameters values.</para>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>The following classes are applied to a node element in three states: default, marked,
mouseovered:</para>
<itemizedlist>
@@ -271,7 +271,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>How to Expand/Collapse Tree Nodes from code see <ulink
url="http://labs.jboss.com/wiki/ExpandCollapsetreeNodesAdaptor">here</ulink>. </para>
</section>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -112,7 +112,7 @@
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/treeNodesAdaptor.jsf?..."
>Here</ulink> you can see the example of <emphasis role="bold"
><rich:treeNodesAdaptor ></emphasis> usage and sources for the given example. </para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -137,13 +137,13 @@
additional elements on it, except the ones provided with <emphasis><property>Virtual Earth map</property>.</emphasis></para>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
<para>rich-virtualEarth map is a predefined style class for the map. It's possible to define some
standard properties for all <property>maps</property> components on a page (padding, border,
etc.) with the definition of the component.</para>
</section>
<section>
- <title>Relevant resources links</title>
+ <title>Relevant Resources Links</title>
<para>
<ulink url="http://msdn2.microsoft.com/en-us/library/bb429619.aspx">Here</ulink> you can found additional
information about Microsoft <property>Virtual Earth map</property>.</para>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="ArchitectureOverview" xreflabel="ArchitecturalOverview">
-<?dbhtml filename="ArchitectureOverview.html"?>
+ <?dbhtml filename="ArchitectureOverview.html"?>
<chapterinfo>
<keywordset>
<keyword>RichFaces</keyword>
- <keyword>CSS</keyword>
+ <keyword>CSS</keyword>
<keyword>skin</keyword>
</keywordset>
</chapterinfo>
-<title>Basic concepts of the RichFaces Framework</title>
+ <title>Basic concepts of the RichFaces Framework</title>
<section id="introToBasics">
- <?dbhtml filename="introToBasics.html"?>
+ <?dbhtml filename="introToBasics.html"?>
<title>Introduction</title>
- <para>The framework is implemented as a component library which adds Ajax capability into existing
- pages, so you don't need to write any JavaScript code or to replace existing
- components with new Ajax widgets. <property>RichFaces</property> enables page-wide Ajax support instead of the
- traditional component-wide support. Hence, you can define the event on the page that
- invokes an Ajax request and the areas of the page that should be synchronized with the JSF
- Component Tree after the Ajax request changes the data on the server according to the
- events fired on the client.</para>
+ <para>The framework is implemented as a component library which adds Ajax capability into
+ existing pages, so you don't need to write any JavaScript code or to replace existing
+ components with new Ajax widgets. <property>RichFaces</property> enables page-wide Ajax
+ support instead of the traditional component-wide support. Hence, you can define the event on
+ the page that invokes an Ajax request and the areas of the page that should be synchronized
+ with the JSF Component Tree after the Ajax request changes the data on the server according to
+ the events fired on the client.</para>
<para>Next Figure shows how it works:</para>
<figure>
<title>Request Processing flow</title>
@@ -31,15 +31,17 @@
<imagedata fileref="images/newpic1.jpg" scalefit="1"/>
</imageobject>
</mediaobject>
- <para><property>RichFaces</property> allows to define (by means of JSF tags) different parts of a JSF page you
- wish to update with an Ajax request and provide a few options to send Ajax requests to
- the server. Also JSF page doesn't change from a "regular" JSF
- page and you don't need to write any JavaScript or XMLHttpRequest objects by hands, everything is done automatically.</para>
+ <para><property>RichFaces</property> allows to define (by means of JSF tags) different parts of
+ a JSF page you wish to update with an Ajax request and provide a few options to send Ajax
+ requests to the server. Also JSF page doesn't change from a
+ "regular" JSF page and you don't need to write any JavaScript or
+ XMLHttpRequest objects by hands, everything is done automatically.</para>
</section>
<section id="RichFacesArchitectureOverview">
- <?dbhtml filename="RichFacesArchitectureOverview.html"?>
+ <?dbhtml filename="RichFacesArchitectureOverview.html"?>
<title>RichFaces Architecture Overview</title>
- <para>Next figure lists several important elements of the <property>RichFaces</property> framework</para>
+ <para>Next figure lists several important elements of the <property>RichFaces</property>
+ framework</para>
<figure>
<title>Core Ajax component structure</title>
</figure>
@@ -50,13 +52,16 @@
</mediaobject>
<formalpara>
<title>Ajax Filter.</title>
- <para>To get all benefits of <property>RichFaces</property>, you should register a Filter in web.xml
- file of your application. The Filter recognizes multiple request types. The sequence diagram on Figure 3
- shows the difference in processing of a "regular" JSF request and an Ajax request.</para>
+ <para>To get all benefits of <property>RichFaces</property>, you should register a Filter in
+ web.xml file of your application. The Filter recognizes multiple request types. Necessary
+ information about Filter configuration can be found in the <link
+ linkend="FilterConfiguration">"Filter configuration"</link> section. The
+ sequence diagram on Figure 3 shows the difference in processing of a
+ "regular" JSF request and an Ajax request.</para>
</formalpara>
- <para>In the first case the whole JSF tree will be encoded,
- in the second one option it depends on the "size" of the Ajax region. As you can see, in the second case the filter parses
- the content of an Ajax response before sending it to the client side.</para>
+ <para>In the first case the whole JSF tree will be encoded, in the second one option it depends
+ on the "size" of the Ajax region. As you can see, in the second case the
+ filter parses the content of an Ajax response before sending it to the client side.</para>
<para>Have a look at the next picture to understand these two ways:</para>
<figure>
<title>Request Processing sequence diagram</title>
@@ -66,14 +71,14 @@
<imagedata fileref="images/newpic3.jpg" scalefit="1"/>
</imageobject>
</mediaobject>
- <para>In both cases, the information about required static or dynamic resources that your application
- requests is registered in the ResourseBuilder class.</para>
- <para>When a request for a resource comes (Figure 4), the RichFaces filter checks the Resource Cache
- for this resource and if it is there, the resource is sent to the client. Otherwise,
- the filter searches for the resource among those that are registered by the
- ResourceBuilder. If the resource is registered, the RichFaces filter will send a request to the
- ResourceBuilder to create (deliver) the resource.</para>
- <para>Next Figure shows the ways of resource request processing.</para>
+ <para>In both cases, the information about required static or dynamic resources that your
+ application requests is registered in the ResourseBuilder class.</para>
+ <para>When a request for a resource comes (Figure 4), the RichFaces filter checks the Resource
+ Cache for this resource and if it is there, the resource is sent to the client. Otherwise, the
+ filter searches for the resource among those that are registered by the ResourceBuilder. If
+ the resource is registered, the RichFaces filter will send a request to the ResourceBuilder to
+ create (deliver) the resource.</para>
+ <para>Next Figure shows the ways of resource request processing.</para>
<figure>
<title>Resource request sequence diagram</title>
</figure>
@@ -84,303 +89,412 @@
</mediaobject>
<formalpara>
<title>AJAX Action Components</title>
- <para>
- There are Ajax Action Components: AjaxCommandButton, AjaxCommandLink, AjaxPoll and AjaxSupport and etc.
- You can use them to send Ajax requests from the client side.
- </para>
+ <para> There are Ajax Action Components: AjaxCommandButton, AjaxCommandLink, AjaxPoll and
+ AjaxSupport and etc. You can use them to send Ajax requests from the client side. </para>
</formalpara>
<formalpara>
<title>AJAX Containers</title>
- <para>
- AjaxContainer is an interface that describes an area on your JSF page that should be decoded
- during an Ajax request. AjaxViewRoot and AjaxRegion are implementations of this interface.
- </para>
+ <para> AjaxContainer is an interface that describes an area on your JSF page that should be
+ decoded during an Ajax request. AjaxViewRoot and AjaxRegion are implementations of this
+ interface. </para>
</formalpara>
<formalpara>
<title>JavaScript Engine</title>
- <para><property>RichFaces</property> JavaScript Engine runs on the client-side. It knows how to update different areas
- on your JSF page based on the information from the Ajax response. Do
- not use this JavaScript code directly, as it is available automatically.
- </para>
+ <para><property>RichFaces</property> JavaScript Engine runs on the client-side. It knows how
+ to update different areas on your JSF page based on the information from the Ajax response.
+ Do not use this JavaScript code directly, as it is available automatically. </para>
</formalpara>
</section>
<section id="LimitationsAndRules">
- <?dbhtml filename="LimitationAndRules.html"?>
+ <?dbhtml filename="LimitationAndRules.html"?>
<title>Limitations and Rules</title>
- <para>In order to create RichFaces applications properly, keep the following points in mind:</para>
+ <para>In order to create RichFaces applications properly, keep the following points in mind:</para>
<itemizedlist>
- <listitem>
- Any Ajax framework should not append or delete, but only replace elements on the page. For successful updates, an element with the same ID as in the response must exist on the page. If you'd like to append any code to a page, put in a placeholder for it (any empty element). For the same reason, it's recommended to place messages in the<emphasis >
- <property>"AjaxOutput"</property>
- </emphasis> component (as no messages is also a message).
- </listitem>
- <listitem>
- Don't use <emphasis role="bold">
- <property><f:verbatim></property>
- </emphasis> for self-rendered containers, since this component is transient and not saved in the tree.
- </listitem>
- <listitem>
- Ajax requests are made by XMLHttpRequest functions in XML format, but this XML bypasses most validations and the corrections that might be made in a browser. Thus, create only a strict standards-compliant code for HTML and XHTML, without skipping any required elements or attributes. Any necessary XML corrections are automatically made by the XML filter on the server, but lot's of unexpected effects can be produced by an incorrect HTML code.
- </listitem>
+ <listitem> Any Ajax framework should not append or delete, but only replace elements on the
+ page. For successful updates, an element with the same ID as in the response must exist on
+ the page. If you'd like to append any code to a page, put in a placeholder for it
+ (any empty element). For the same reason, it's recommended to place messages in the<emphasis>
+ <property>"AjaxOutput"</property>
+ </emphasis> component (as no messages is also a message). </listitem>
+ <listitem> Don't use <emphasis role="bold">
+ <property><f:verbatim></property>
+ </emphasis> for self-rendered containers, since this component is transient and not saved in
+ the tree. </listitem>
+ <listitem> Ajax requests are made by XMLHttpRequest functions in XML format, but this XML
+ bypasses most validations and the corrections that might be made in a browser. Thus, create
+ only a strict standards-compliant code for HTML and XHTML, without skipping any required
+ elements or attributes. Any necessary XML corrections are automatically made by the XML
+ filter on the server, but lot's of unexpected effects can be produced by an
+ incorrect HTML code. </listitem>
</itemizedlist>
</section>
<section id="HowTo...">
- <?dbhtml filename="HowTo.html"?>
+ <?dbhtml filename="HowTo.html"?>
<title>How To...</title>
<section id="SendAnAJAXRequest">
- <?dbhtml filename="SendAnAJAXRequest.html"?>
+ <?dbhtml filename="SendAnAJAXRequest.html"?>
<title>Send an Ajax request</title>
- <para>There are different ways to send Ajax requests from your JSF page. For example you can use
- <emphasis role="bold"><property><a4j:commandButton></property></emphasis>, <emphasis role="bold">
- <property><a4j:commandLink></property>, <emphasis role="bold"><property><a4j:poll></property></emphasis>
+ <para>There are different ways to send Ajax requests from your JSF page. For example you can
+ use <emphasis role="bold">
+ <property><a4j:commandButton></property>
+ </emphasis>, <emphasis role="bold">
+ <property><a4j:commandLink></property>, <emphasis role="bold">
+ <property><a4j:poll></property>
+ </emphasis>
</emphasis> or <emphasis role="bold">
<property><a4j:support></property>
- </emphasis> tags or any other.
- </para>
- <para>All these tags hide the usual JavaScript activities that are required for an XMHttpRequest
- object building and an Ajax request sending. Also, they allow you to decide which components of
- your JSF page are to be re-rendered as a result of the Ajax response (you can list the
- IDs of these components in the "reRender" attribute).
- </para>
+ </emphasis> tags or any other. </para>
+ <para>All these tags hide the usual JavaScript activities that are required for an
+ XMHttpRequest object building and an Ajax request sending. Also, they allow you to decide
+ which components of your JSF page are to be re-rendered as a result of the Ajax response
+ (you can list the IDs of these components in the "reRender" attribute). </para>
<para>
- <emphasis role="bold">
+ <emphasis role="bold">
<property><a4j:commandButton></property>
</emphasis> and <emphasis role="bold">
<property><a4j:commandLink></property>
- </emphasis> tags are used to send an Ajax
- request on "onclick" JavaScript event.
- </para>
+ </emphasis> tags are used to send an Ajax request on "onclick" JavaScript
+ event. </para>
<para>
- <emphasis role="bold">
+ <emphasis role="bold">
<property><a4j:poll></property>
- </emphasis> tag is used to send an Ajax
- request periodically using a timer.
- </para>
+ </emphasis> tag is used to send an Ajax request periodically using a timer. </para>
<para>The <emphasis role="bold">
<property><a4j:support></property>
- </emphasis> tag allows you to add Ajax functionality to standard JSF components
- and send Ajax request onto a chosen JavaScript event: "onkeyup", "onmouseover",
- etc.
- </para>
+ </emphasis> tag allows you to add Ajax functionality to standard JSF components and send
+ Ajax request onto a chosen JavaScript event: "onkeyup",
+ "onmouseover", etc. </para>
<para>Most important attributes of components that provide Ajax request calling features are:</para>
<itemizedlist>
<listitem>
- <emphasis >
- <property>"reRender"</property>
- </emphasis>attribute as it was mentioned <link linkend="SendAnAJAXRequest">before</link> specifies components to be reRendered
- after Ajax response. The attribute can be specified using EL expression and formed dynamicaly on the
- server side (see <ulink url="index.html#FAQ">FAQ chapter</ulink>).
- </listitem>
+ <emphasis>
+ <property>"reRender"</property>
+ </emphasis>attribute as it was mentioned <link linkend="SendAnAJAXRequest">before</link>
+ specifies components to be reRendered after Ajax response. The attribute can be specified
+ using EL expression and formed dynamicaly on the server side (see <ulink
+ url="index.html#FAQ">FAQ chapter</ulink>). </listitem>
<listitem>
- <emphasis >
- <property>"RequestDelay"</property>
- </emphasis> attribute is used for a requests frequency regulation.
- </listitem>
- </itemizedlist>
- <programlisting role="XML"><![CDATA[<h:inputText size="50" value="#{bean.text}">
+ <emphasis>
+ <property>"RequestDelay"</property>
+ </emphasis> attribute is used for a requests frequency regulation. </listitem>
+ </itemizedlist>
+ <programlisting role="XML"><![CDATA[<h:inputText size="50" value="#{bean.text}">
<a4j:support event="onkeyup" RequestDelay="3"/>
</h:inputText>]]></programlisting>
- <para>So every next request from the frequent keyboard events will be delayed
- on 3 ms to reduce the number of requests.
- </para>
- <itemizedlist>
+ <para>So every next request from the frequent keyboard events will be delayed on 3 ms to
+ reduce the number of requests. </para>
+ <itemizedlist>
<listitem>
- <emphasis >
- <property>"EventsQueue"</property>
- </emphasis> is a queue that stores the next request.
- </listitem>
- <listitem>
- <emphasis >
- <property>"LimitToList"</property>
- </emphasis> attribute is used to regulate updatable regions. Setting
- it to true limits the updatable areas only to ones specified in a
- reRender list, in other case all Output Panels of the region are updated.
- </listitem>
- <listitem> <emphasis >
- <property>"ajaxSingle"</property>
- </emphasis> attributes specify regions to be sent with a request,
- if "false" it is a full region, in other case it's is only a control caused
- event.
- </listitem>
-
- <listitem> <emphasis >
+ <emphasis>
+ <property>"EventsQueue"</property>
+ </emphasis> is a queue that stores the next request. </listitem>
+ <listitem>
+ <emphasis>
+ <property>"LimitToList"</property>
+ </emphasis> attribute is used to regulate updatable regions. Setting it to true limits the
+ updatable areas only to ones specified in a reRender list, in other case all Output Panels
+ of the region are updated. </listitem>
+ <listitem>
+ <emphasis>
+ <property>"ajaxSingle"</property>
+ </emphasis> attributes specify regions to be sent with a request, if
+ "false" it is a full region, in other case it's is only a
+ control caused event. </listitem>
+
+ <listitem>
+ <emphasis>
<property>"timeout"</property>
- </emphasis>attribute is used for response waiting time on a particular request. If a response is not received during this time, the request is aborted.
- </listitem>
-
- <listitem> <emphasis >
+ </emphasis>attribute is used for response waiting time on a particular request. If a
+ response is not received during this time, the request is aborted. </listitem>
+
+ <listitem>
+ <emphasis>
<property>"ignoreDupResponses"</property>
- </emphasis> is used to abort unfinished request on new event.
- </listitem>
- </itemizedlist>
+ </emphasis> is used to abort unfinished request on new event. </listitem>
+ </itemizedlist>
</section>
<section id="DecideWhatToSend">
- <?dbhtml filename="DecideWhatToSend.html"?>
+ <?dbhtml filename="DecideWhatToSend.html"?>
<title>Decide What to Send</title>
- <para>You may describe a region on the page you wish to send to the server, in this way you can
- control what part of the JSF View is decoded on the server side when you send an
- Ajax request.
- </para>
- <para>The easiest way to describe an Ajax region on your JSF page is to do nothing,
- because the content between the <emphasis role="bold">
+ <para>You may describe a region on the page you wish to send to the server, in this way you
+ can control what part of the JSF View is decoded on the server side when you send an Ajax
+ request. </para>
+ <para>The easiest way to describe an Ajax region on your JSF page is to do nothing, because
+ the content between the <emphasis role="bold">
<property><f:view></property>
</emphasis> and <emphasis role="bold">
<property></f:view></property>
- </emphasis> tags is considered
- the default Ajax region.
- </para>
- <para>You may define multiple Ajax regions on the JSF page (they can even be nested) by using
- the <emphasis role="bold">
+ </emphasis> tags is considered the default Ajax region. </para>
+ <para>You may define multiple Ajax regions on the JSF page (they can even be nested) by using
+ the <emphasis role="bold">
<property><a4j:region></property>
- </emphasis> tag.
- </para>
- <para>If you wish to render the content of an Ajax response outside of the active region then
- the value of the "renderRegionOnly" attribute should be set to "false" ("false" is default value). Otherwise, your
- Ajax updates are limited to elements of the active region.
- </para>
+ </emphasis> tag. </para>
+ <para>If you wish to render the content of an Ajax response outside of the active region then
+ the value of the "renderRegionOnly" attribute should be set to
+ "false" ("false" is default value). Otherwise, your Ajax
+ updates are limited to elements of the active region. </para>
</section>
<section id="DecideWhatToChange">
- <?dbhtml filename="DecideWhatToChange.html"?>
+ <?dbhtml filename="DecideWhatToChange.html"?>
<title>Decide What to Change</title>
- <para>Using IDs in the "reRender" attribute to define "AJAX zones" for update works fine in
- many cases.
- </para>
- <para>But you can not use this approach if your page contains, e.g. a <emphasis role="bold"><property><f:verbatim></property></emphasis>
- tag and you wish to update its content on an Ajax response.
- </para>
+ <para>Using IDs in the "reRender" attribute to define "AJAX
+ zones" for update works fine in many cases. </para>
+ <para>But you can not use this approach if your page contains, e.g. a <emphasis role="bold">
+ <property><f:verbatim></property>
+ </emphasis> tag and you wish to update its content on an Ajax response. </para>
<para>The problem with the <emphasis role="bold">
<property><f:verbatim/></property>
- </emphasis> tag as described above is related to the
- value of the transientFlag of JSF components. If the value of this flag is true, the
- component must not participate in state saving or restoring of process.
- </para>
- <para>In order to provide a solution to this kind of problems, RichFaces uses the concept of
- an output panel that is defined by the <emphasis role="bold">
+ </emphasis> tag as described above is related to the value of the transientFlag of JSF
+ components. If the value of this flag is true, the component must not participate in state
+ saving or restoring of process. </para>
+ <para>In order to provide a solution to this kind of problems, RichFaces uses the concept of
+ an output panel that is defined by the <emphasis role="bold">
<property><a4j:outputPanel></property>
- </emphasis> tag. If you put a <emphasis role="bold"><property><f:verbatim></property></emphasis>
- tag inside of the output panel, then the content of the <emphasis role="bold">
+ </emphasis> tag. If you put a <emphasis role="bold">
+ <property><f:verbatim></property>
+ </emphasis> tag inside of the output panel, then the content of the <emphasis role="bold">
<property><f:verbatim/></property>
- </emphasis> tag and content of
- other panel's child tags could be updated on Ajax response. There are two ways to
- control this:
- <itemizedlist>
- <listitem>
- By setting the "ajaxRendered" attribute value to "true".
-</listitem>
- <listitem>
- By setting the "reRender" attribute value of an Action Component to the output panel ID.
-</listitem>
- </itemizedlist>
- </para>
+ </emphasis> tag and content of other panel's child tags could be updated on Ajax
+ response. There are two ways to control this: <itemizedlist>
+ <listitem> By setting the "ajaxRendered" attribute value to
+ "true". </listitem>
+ <listitem> By setting the "reRender" attribute value of an Action
+ Component to the output panel ID. </listitem>
+ </itemizedlist>
+ </para>
</section>
</section>
+
+ <section id="FilterConfiguration">
+ <?dbhtml filename="FilterConfiguration.html"?>
+ <title>Filter Configuration</title>
+ <para>RichFaces uses a filter for a correction of code received on an Ajax request. In case of a
+ "regular" JSF request a browser makes correction independently. In case of
+ Ajax request in order to prevent layout destruction it's needed to use a filter,
+ because a received code could differ from a code validated by a browser and a browser doesn't
+ make any corrections.</para>
+
+ <para>An example of how to set a Filter in a web.xml file of your application is placed below.</para>
+
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+
+ <programlisting role="XML"><![CDATA[...
+ <filter>
+ <display-name>RichFaces Filter</display-name>
+ <filter-name>richfaces</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+...
+]]></programlisting>
+
+ <note>
+ <title>Note:</title>Fast Filter is deprecated and available only for backward compatibility
+ with previous RichFaces versions. Fast Filter usage isn't recomended, because there
+ is another way to use its functionality by means of <link linkend="Neko">Neko filter type</link>.</note>
+
+ <para>In RichFaces 3.1 filter configuration becomes more flexible. It's possible to
+ configure different filters for different sets of pages for the same application.</para>
+
+ <para>The possible filter types are:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>TIDY</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>"TIDY" filter type based on the Tidy parser. This filter is recommended for applications with
+ complicated or non-standard markup when all necessary code corrections are made by the filter
+ when a response comes from the server.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para id="Neko">NEKO</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>"NEKO" filter type corresponds to the former "Fast Filter" and it's
+ based on the Neko parser. In case of using this filter code isn't strictly verified.
+ Use this one if you are sure that your application markup is really strict for this filter.
+ Otherwise it could cause lot's of errors and corrupt a layout as a result. This
+ filter considerably accelerates all Ajax requests processing.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>NONE</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>No correction.</para>
+
+ <para>An example of configuration is placed below.</para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+
+ <programlisting role="XML"><![CDATA[...
+ <context-param>
+ <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
+ <param-value>NONE,NEKO,TIDY</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.ajax4jsf.xmlparser.NONE</param-name>
+ <param-value>/pages/performance\.xhtml,/pages/default.*\.xhtml</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.ajax4jsf.xmlparser.NEKO</param-name>
+ <param-value>/pages/repeat\.xhtml</param-value>
+ </context-param>
+
+ <filter>
+ <display-name>RichFaces Filter</display-name>
+ <filter-name>richfaces</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>richfaces</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
+...
+]]></programlisting>
+
+ <para>The example shows that ORDER parameter defines the order in which particular filter types
+ are used for pages code correction. </para>
+ <para> First of all "NONE" type is specified for the filter. Then two different
+ sets of pages are defined for which two filter types (NONE and NEKO) are used correspondingly.
+ If a page relates to the first set that is defined in the following way: </para>
+
+ <programlisting role="XML"><![CDATA[<param-value>/pages/performance\.xhtml,/pages/default.*\.xhtml</param-value>,
+]]></programlisting>
+
+ <para> it's not corrected, because filter type for this page is defined as
+ "NONE". If a page is not from the first set, then "NEKO"
+ type is set.</para>
+ <para>If a page relates to the second set that is defined in the following way:</para>
+
+ <programlisting role="XML"><![CDATA[<param-value>/pages/repeat\.xhtml</param-value>,
+]]></programlisting>
+
+ <para>then "NEKO" filter type is used for correction. If it's not related to the second set,
+ "TIDY" type is set for the filter ("TIDY" filter type is used for code
+ correction). </para>
+
+ </section>
+
+
<section id="RequestErrorsAndSessionExpirationHandling">
- <?dbhtml filename="RequestErrorsAndSessionExpirationHandling.html"?>
- <title>Request Errors and Session Expiration Handling</title>
- <para>RichFaces allows to redefine standard handlers responsible for processing of different exceptional situations. It helps to define own JavaScript, which is executed when these situations occur.</para>
- <section id="RequestErrorsHandling">
- <?dbhtml filename="RequestErrorsHandling.html"?>
- <title>Request Errors Handling</title>
- <para>To execute your own code on the client in case of an error during Ajax request, it's necessary to redefine the standard "A4J.AJAX.onError" method:</para>
- <programlisting role="JAVA"><![CDATA[A4J.AJAX.onError = function(req,status,message) {
+ <?dbhtml filename="RequestErrorsAndSessionExpirationHandling.html"?>
+ <title>Request Errors and Session Expiration Handling</title>
+ <para>RichFaces allows to redefine standard handlers responsible for processing of different
+ exceptional situations. It helps to define own JavaScript, which is executed when these
+ situations occur.</para>
+ <section id="RequestErrorsHandling">
+ <?dbhtml filename="RequestErrorsHandling.html"?>
+ <title>Request Errors Handling</title>
+ <para>To execute your own code on the client in case of an error during Ajax request,
+ it's necessary to redefine the standard "A4J.AJAX.onError"
+ method:</para>
+ <programlisting role="JAVA"><![CDATA[A4J.AJAX.onError = function(req,status,message) {
// Custom Developer Code
};]]></programlisting>
- <para>The function defined this way accepts as parameters:</para>
- <itemizedlist>
- <listitem>req - a params string of a request that calls an error</listitem>
- <listitem>status - the number of an error returned by the server</listitem>
- <listitem>message - a default message for the given error</listitem>
- </itemizedlist>
- <para>Thus, it's possible to create your own handler that is called on timeouts, inner server errors, and etc.</para>
- </section>
- <section id="SessionExpiredHandling">
- <?dbhtml filename="SessionExpiredHandling.html"?>
- <title>Session Expired Handling</title>
- <para>It's possible to redefine also the <emphasis >
- <property>"onExpired"</property>
- </emphasis> framework method that is called on the <emphasis >
- <property>"Session Expiration"</property>
- </emphasis> event.</para>
+ <para>The function defined this way accepts as parameters:</para>
+ <itemizedlist>
+ <listitem>req - a params string of a request that calls an error</listitem>
+ <listitem>status - the number of an error returned by the server</listitem>
+ <listitem>message - a default message for the given error</listitem>
+ </itemizedlist>
+ <para>Thus, it's possible to create your own handler that is called on timeouts,
+ inner server errors, and etc.</para>
+ </section>
+ <section id="SessionExpiredHandling">
+ <?dbhtml filename="SessionExpiredHandling.html"?>
+ <title>Session Expired Handling</title>
+ <para>It's possible to redefine also the <emphasis>
+ <property>"onExpired"</property>
+ </emphasis> framework method that is called on the <emphasis>
+ <property>"Session Expiration"</property>
+ </emphasis> event.</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
- <programlisting role="JAVA"><![CDATA[A4J.AJAX.onExpired = function(loc,expiredMsg){
+ <programlisting role="JAVA"><![CDATA[A4J.AJAX.onExpired = function(loc,expiredMsg){
// Custom Developer Code
};
]]></programlisting>
-<para>Here the function receives in params:</para>
- <itemizedlist>
- <listitem>loc - URL of the current page (on demand can be updated) </listitem>
- <listitem>expiredMsg - a default message on <emphasis >
- <property>"Session Expiration"</property>
- </emphasis>event.</listitem>
- </itemizedlist>
-<!--note>
+ <para>Here the function receives in params:</para>
+ <itemizedlist>
+ <listitem>loc - URL of the current page (on demand can be updated) </listitem>
+ <listitem>expiredMsg - a default message on <emphasis>
+ <property>"Session Expiration"</property>
+ </emphasis>event.</listitem>
+ </itemizedlist>
+ <!--note>
<title>Note:</title>
Until the version 1.0.5 the method can't be redefined on <emphasis >
<property>"Session Expiration"</property>,
</emphasis> a confirmation dialog with a request for view reloading was always called.
</note-->
+ </section>
</section>
-</section>
- <section>
+ <section id="Skinnability">
+ <?dbhtml filename="Skinnability.html"?>
+ <title>Skinnability</title>
- <title>Skinnability</title>
-
<section id="WhySkinnability">
- <?dbhtml filename="WhySkinnability.html"?>
+ <?dbhtml filename="WhySkinnability.html"?>
<title>Why Skinnability</title>
- <para>If you have a look at a CSS file in an enterprise application, for
- example, the one you're working on now, you'll see how often the same
- color is noted in it. Standard CSS has no way to define a particular
- color abstractly for defining as a panel header color, a background
- color of an active pop-up menu item, a separator color, etc. To define
- common interface styles, you have to copy the same values over and over
- again and the more interface elements you have the more copy-and-paste
- activity that needs to be performed.</para>
+ <para>If you have a look at a CSS file in an enterprise application, for example, the one
+ you're working on now, you'll see how often the same color is noted in it.
+ Standard CSS has no way to define a particular color abstractly for defining as a panel
+ header color, a background color of an active pop-up menu item, a separator color, etc. To
+ define common interface styles, you have to copy the same values over and over again and the
+ more interface elements you have the more copy-and-paste activity that needs to be
+ performed.</para>
- <para>Hence, if you want to change the application palette, you have to
- change all interrelating values, otherwise your interface can appear a
- bit clumsy. The chances of such an interface coming about is very high,
- as CSS editing usually becomes the duty of a general developer who
- doesn't necessarily have much knowledge of user interface design.</para>
+ <para>Hence, if you want to change the application palette, you have to change all
+ interrelating values, otherwise your interface can appear a bit clumsy. The chances of such
+ an interface coming about is very high, as CSS editing usually becomes the duty of a general
+ developer who doesn't necessarily have much knowledge of user interface design.</para>
- <para>Moreover, if a customer wishes to have an interface look-and-feel
- that can be adjusted on-the-fly by an end user, your work is multiplied,
- as you have to deal with several CSS files variants, each of which
- contains the same values repeated numerous times.</para>
+ <para>Moreover, if a customer wishes to have an interface look-and-feel that can be adjusted
+ on-the-fly by an end user, your work is multiplied, as you have to deal with several CSS
+ files variants, each of which contains the same values repeated numerous times.</para>
- <para>These problems can be solved with the
- <property>skinnability</property> system built into theRichFaces project
- and realized fully in RichFaces. Every named skin has some
- skin-parameters for the definition of a palette and the other parameters
- of the user interface. By changing just a few parameters, you can alter
- the appearance of dozens of components in an application in a
- synchronized fashion without messing up user interface
- consistency.</para>
+ <para>These problems can be solved with the <property>skinnability</property> system built
+ into theRichFaces project and realized fully in RichFaces. Every named skin has some
+ skin-parameters for the definition of a palette and the other parameters of the user
+ interface. By changing just a few parameters, you can alter the appearance of dozens of
+ components in an application in a synchronized fashion without messing up user interface
+ consistency.</para>
- <para>The <property>skinnability</property> feature can't completely
- replace standard CSS and certainly doesn't eliminate its usage.
- <property>Skinnability</property> is a high-level extension of standard
- CSS, which can be used together with regular CSS declarations. You can
- also refer to skin parameters in CSS via JSF Expression Language. You
- have the complete ability to synchronize the appearance of all the
- elements in your pages.</para>
+ <para>The <property>skinnability</property> feature can't completely replace standard
+ CSS and certainly doesn't eliminate its usage. <property>Skinnability</property> is
+ a high-level extension of standard CSS, which can be used together with regular CSS
+ declarations. You can also refer to skin parameters in CSS via JSF Expression Language. You
+ have the complete ability to synchronize the appearance of all the elements in your
+ pages.</para>
</section>
<section id="UsingSkinnability">
- <?dbhtml filename="UsingSkinnability.html"?>
+ <?dbhtml filename="UsingSkinnability.html"?>
<title>Using Skinnability</title>
- <para>RichFaces <property>skinnability</property> is designed for mixed
- usage with:</para>
+ <para>RichFaces <property>skinnability</property> is designed for mixed usage with:</para>
<itemizedlist>
<listitem>
@@ -396,35 +510,32 @@
</listitem>
</itemizedlist>
- <para>The color scheme of the component can be applied to its elements
- using any of three style classes:</para>
+ <para>The color scheme of the component can be applied to its elements using any of three
+ style classes:</para>
<itemizedlist>
<listitem>
<para>A default style class inserted into the framework</para>
- <para>This contains style parameters linked to some constants from a
- skin. It is defined for every component and specifies a default
- representation level. Thus, an application interface could be
- modified by changing the values of skin parameters.</para>
+ <para>This contains style parameters linked to some constants from a skin. It is defined
+ for every component and specifies a default representation level. Thus, an application
+ interface could be modified by changing the values of skin parameters.</para>
</listitem>
<listitem>
<para>A style class of skin extension</para>
- <para>This class name is defined for every component element and
- inserted into the framework to allow defining a class with the same
- name into its CSS files. Hence, the appearance of all components
- that use this class is extended.</para>
+ <para>This class name is defined for every component element and inserted into the
+ framework to allow defining a class with the same name into its CSS files. Hence, the
+ appearance of all components that use this class is extended.</para>
</listitem>
<listitem>
<para>User style class</para>
- <para>It's possible to use one of the styleClass parameters for
- component elements and define your own class in it. As a result, the
- appearance of one particular component is changed according to a CSS
- style parameter specified in the class.</para>
+ <para>It's possible to use one of the styleClass parameters for component
+ elements and define your own class in it. As a result, the appearance of one particular
+ component is changed according to a CSS style parameter specified in the class.</para>
</listitem>
</itemizedlist>
</section>
@@ -435,127 +546,110 @@
<para>Here is a simple panel component:</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
<programlisting role="XML"><rich:panel>
...
</rich:panel></programlisting>
- <para>The code generates a panel component on a page, which consists of
- two elements: a wrapper <emphasis
- role="bold"><property><div></property></emphasis> element and a
- <emphasis role="bold"><property><div></property></emphasis>
- element for the panel body with the particular style properties. The
- wrapper <emphasis
- role="bold"><property><div></property></emphasis> element looks
- like:</para>
+ <para>The code generates a panel component on a page, which consists of two elements: a
+ wrapper <emphasis role="bold">
+ <property><div></property>
+ </emphasis> element and a <emphasis role="bold">
+ <property><div></property>
+ </emphasis> element for the panel body with the particular style properties. The wrapper
+ <emphasis role="bold">
+ <property><div></property>
+ </emphasis> element looks like:</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
<programlisting role="XML"><div class="dr-pnl rich-panel">
...
</div></programlisting>
- <para>dr-pnl is a CSS class specified in the framework via skin
- parameters:</para>
+ <para>dr-pnl is a CSS class specified in the framework via skin parameters:</para>
<itemizedlist>
<listitem>
<para><property>background-color</property> is defined with
- <property>generalBackgroundColor</property></para>
+ <property>generalBackgroundColor</property></para>
</listitem>
<listitem>
<para><property>border-color</property> is defined with
- <property>panelBorderColor</property></para>
+ <property>panelBorderColor</property></para>
</listitem>
</itemizedlist>
- <para>It's possible to change all colors for all panels on all pages by
- changing these skin parameters.</para>
+ <para>It's possible to change all colors for all panels on all pages by changing
+ these skin parameters.</para>
- <para>However, if a <emphasis
- role="bold"><property><rich-panel></property></emphasis> class is
- specified somewhere on the page, its parameters are also acquired by all
- panels on this page.</para>
+ <para>However, if a <emphasis role="bold">
+ <property><rich-panel></property>
+ </emphasis> class is specified somewhere on the page, its parameters are also acquired by
+ all panels on this page.</para>
- <para>A developer may also change the style properties for a particular
- panel. The following definition:</para>
+ <para>A developer may also change the style properties for a particular panel. The following
+ definition:</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
<programlisting role="XML"><rich:panel styleClass="customClass">
...
</rich:panel></programlisting>
- <para>could add some style properties from customClass to one particular
- panel, as a result we get three styles:</para>
+ <para>could add some style properties from customClass to one particular panel, as a result we
+ get three styles:</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
<programlisting role="XML"><div class="dr_pnl rich-panel customClass">
...
</div></programlisting>
</section>
<section id="SkinParametersTablesInRichFaces">
- <?dbhtml filename="SkinParametersTablesInRichFaces.html"?>
-
+ <?dbhtml filename="SkinParametersTablesInRichFaces.html"?>
+
<title>Skin Parameters Tables in RichFaces</title>
- <para>RichFaces provides eight predefined skin parameters (skins) at the
- simplest level of common customization:</para>
+ <para>RichFaces provides eight predefined skin parameters (skins) at the simplest level of
+ common customization:</para>
<itemizedlist>
- <listitem>
- DEFAULT
- </listitem>
-
- <listitem>
- plain
- </listitem>
-
- <listitem>
- emeraldTown
- </listitem>
+ <listitem> DEFAULT </listitem>
- <listitem>
- blueSky
- </listitem>
+ <listitem> plain </listitem>
- <listitem>
- wine
- </listitem>
+ <listitem> emeraldTown </listitem>
- <listitem>
- japanCherry
- </listitem>
+ <listitem> blueSky </listitem>
- <listitem>
- ruby
- </listitem>
+ <listitem> wine </listitem>
- <listitem>
- classic
- </listitem>
+ <listitem> japanCherry </listitem>
- <listitem>
- deepMarine
- </listitem>
+ <listitem> ruby </listitem>
+
+ <listitem> classic </listitem>
+
+ <listitem> deepMarine </listitem>
</itemizedlist>
- <para>To plug one in, it's necessary to specify a skin name in the
- <emphasis ><property>"org.richfaces.SKIN"</property></emphasis> context-param.</para>
+ <para>To plug one in, it's necessary to specify a skin name in the <emphasis>
+ <property>"org.richfaces.SKIN"</property>
+ </emphasis> context-param.</para>
- <para>Here is an example of a table with values for one of the main
- skins, <property>"blueSky"</property>.</para>
+ <para>Here is an example of a table with values for one of the main skins,
+ <property>"blueSky"</property>.</para>
<table>
<title>Colors</title>
@@ -792,40 +886,39 @@
</tbody>
</tgroup>
</table>
-
- <para>
- Skin "plain" was added from 3.0.2 version.
- It doesn't have any parameters. It's necessary for embedding RichFaces components into existing projecst which have its own styles.
- </para>
-
- <para>To get detailed information on particular parameter possibilities,
- see the <link linkend="RichFacesComponentsLibrary">chapter</link> where each component has skin parameters described
- corresponding to its elements.</para>
+
+ <para> Skin "plain" was added from 3.0.2 version. It doesn't have any parameters. It's
+ necessary for embedding RichFaces components into existing projecst which have its own
+ styles. </para>
+
+ <para>To get detailed information on particular parameter possibilities, see the <link
+ linkend="RichFacesComponentsLibrary">chapter</link> where each component has skin
+ parameters described corresponding to its elements.</para>
</section>
<section id="CreatingAndUsingYourOwnSkinFile">
- <?dbhtml filename="CreatingAndUsingYourOwnSkinFile.html"?>
+ <?dbhtml filename="CreatingAndUsingYourOwnSkinFile.html"?>
<title>Creating and Using Your Own Skin File</title>
- <para>In order to create your own skin whose constants are used by style
- classes at the first level, do the following:</para>
+ <para>In order to create your own skin whose constants are used by style classes at the first
+ level, do the following:</para>
<itemizedlist>
<listitem>
- <para>Create a file whose name follows the format of a skin file and
- place it into the ClassPath for the application. (Any skin file
- follows the naming format, <emphasis
- ><property><name.skin.properties></property></emphasis>.)</para>
+ <para>Create a file whose name follows the format of a skin file and place it into the
+ ClassPath for the application. (Any skin file follows the naming format, <emphasis>
+ <property><name.skin.properties></property>
+ </emphasis>.)</para>
</listitem>
<listitem>
- <para>Add a skin definition context-param element to the
- application's web.xml file:</para>
+ <para>Add a skin definition context-param element to the application's web.xml
+ file:</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
<programlisting role="XML"><context-param>
<param-name>org.richfaces.SKIN</param-name>
<param-value>name</param-value>
@@ -833,84 +926,72 @@
</listitem>
<listitem>
- <para>In the skins file, specify your own values for skin constants
- as described in the table.</para>
+ <para>In the skins file, specify your own values for skin constants as described in the
+ table.</para>
</listitem>
</itemizedlist>
</section>
-<section>
-<title>Built-in skinnability in RichFaces</title>
- <para>RichFaces gives an opportunity to incorporate <property>skinnability</property> into UI
- design. With this framework you can easily use named skin parameters in
- properties files to control the appearance of the skins that are applied
- consistently to a whole set of components. You can look at examples of
- predefined skins at:</para>
- <simplelist>
- <member>
- <ulink url="http://livedemo.exadel.com/richfaces-demo/">http://livedemo.exadel.com/richfaces-demo/</ulink>
- </member>
- </simplelist>
- <para>
- You may simply control the look-and-feel of your application by using the <property>skinnability</property> service
- of the RichFaces framework. With the means of this service you can define the same style for rendering
- standard JSF components and custom JSF components built with the help of RichFaces.
- </para>
- <para>To find out more on <property>skinnability</property> possibilities, follow these
- steps:</para>
- <itemizedlist>
- <listitem>
- Create a custom render kit and register it in the faces-config.xml
- like this:
- <programlisting role="XML"><![CDATA[<render-kit>
+ <section>
+ <title>Built-in skinnability in RichFaces</title>
+ <para>RichFaces gives an opportunity to incorporate <property>skinnability</property> into UI
+ design. With this framework you can easily use named skin parameters in properties files to
+ control the appearance of the skins that are applied consistently to a whole set of
+ components. You can look at examples of predefined skins at:</para>
+ <simplelist>
+ <member>
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/"
+ >http://livedemo.exadel.com/richfaces-demo/</ulink>
+ </member>
+ </simplelist>
+ <para> You may simply control the look-and-feel of your application by using the
+ <property>skinnability</property> service of the RichFaces framework. With the means of
+ this service you can define the same style for rendering standard JSF components and custom
+ JSF components built with the help of RichFaces. </para>
+ <para>To find out more on <property>skinnability</property> possibilities, follow these steps:</para>
+ <itemizedlist>
+ <listitem> Create a custom render kit and register it in the faces-config.xml like this: <programlisting role="XML"><![CDATA[<render-kit>
<render-kit-id>NEW_SKIN</render-kit-id>
<render-kit-class>
org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl
</render-kit-class>
</render-kit>]]></programlisting>
- </listitem>
- <listitem>
- Then you need to create and register custom renderers for the
- component based on the look-and-feel predefined variables:
- <programlisting role="XML"><![CDATA[<renderer>
+ </listitem>
+ <listitem> Then you need to create and register custom renderers for the component based on
+ the look-and-feel predefined variables: <programlisting role="XML"><![CDATA[<renderer>
<component-family>javax.faces.Command</component-family>
<renderer-type>javax.faces.Link</renderer-type>
<renderer-class>
newskin.HtmlCommandLinkRenderer
</renderer-class>
</renderer>]]></programlisting>
- </listitem>
- <listitem>
- Finally, you need to place a properties file with skin parameters
- into the class path root. There are two requirements for the properties
- file:
- <itemizedlist>
- <listitem>
- The file must be named <emphasis role="bold"><property><skinName></property></emphasis>.skin.properties, in this case, it would be called
- <filename>newskin.skin.properties</filename>.
</listitem>
- <listitem>
- The first line in this file should be render.kit=
- <emphasis role="bold"><property><render-kit-id></property>,</emphasis> in this case, it would be called
- render.kit=NEW_SKIN.
+ <listitem> Finally, you need to place a properties file with skin parameters into the class
+ path root. There are two requirements for the properties file: <itemizedlist>
+ <listitem> The file must be named <emphasis role="bold">
+ <property><skinName></property>
+ </emphasis>.skin.properties, in this case, it would be called
+ <filename>newskin.skin.properties</filename>. </listitem>
+ <listitem> The first line in this file should be render.kit= <emphasis role="bold"
+ ><property><render-kit-id></property>,</emphasis> in this case, it
+ would be called render.kit=NEW_SKIN. </listitem>
+ </itemizedlist>
</listitem>
</itemizedlist>
- </listitem>
- </itemizedlist>
- <para>Extra information on custom renderers creation can be found
- at:</para>
- <simplelist>
- <member>
- <ulink url="http://java.sun.com/javaee/javaserverfaces/reference/docs/index.html">http://java.sun.com/javaee/javaserverfaces/reference/docs/index.html</ulink>
- </member>
- </simplelist>
- </section>
+ <para>Extra information on custom renderers creation can be found at:</para>
+ <simplelist>
+ <member>
+ <ulink url="http://java.sun.com/javaee/javaserverfaces/reference/docs/index.html"
+ >http://java.sun.com/javaee/javaserverfaces/reference/docs/index.html</ulink>
+ </member>
+ </simplelist>
+ </section>
</section>
-<!--section id="OtherRelevantResources">
+ <!--section id="OtherRelevantResources">
<title>Other Relevant Resources</title>
<para><ulink url="http://jsf.javabeat.net/articles/2007/06/introduction-to-ajax4jsf/">Introduction to Ajax4Jsf</ulink> by Shunmuga Raja</para>
</section-->
-</chapter>
\ No newline at end of file
+</chapter>
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-10-04 13:34:34 UTC (rev 3256)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-10-04 14:47:33 UTC (rev 3257)
@@ -691,7 +691,7 @@
<para>To avoid exception, don't forget that the component stores beans in
serialized view, but your bean should implement java.io.Serializable.</para>
</section>
- <section id="FilterUsageDamagesAnApplicationLayout">
+ <!--section id="FilterUsageDamagesAnApplicationLayout">
<?dbhtml filename="FilterUsageDamagesAnApplicationLayout.html"?>
<title>Why does filter usage damage an application layout?</title>
<para>RichFaces uses <property>filters</property> for correction of xhtml code
@@ -752,7 +752,7 @@
<property>forceparser parameter</property> default value is false
from this version. </important>
</para>
- </section>
+ </section-->
<section id="AFormIsNotSubmittedOrASetterIsNotCalledAfterAJAXrequest">
<?dbhtml filename="AFormIsNotSubmittedOrASetterIsNotCalledAfterAJAXrequest.html"?>
<title>Why form isn't submitted or setter isn't called after AJAX
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3256 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-10-04 09:34:34 -0400 (Thu, 04 Oct 2007)
New Revision: 3256
Modified:
trunk/docs/userguide/en/src/main/docbook/included/effect.xml
Log:
http://jira.jboss.com/jira/browse/RF-1050 - fixed errors
Modified: trunk/docs/userguide/en/src/main/docbook/included/effect.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2007-10-04 12:54:41 UTC (rev 3255)
+++ trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2007-10-04 13:34:34 UTC (rev 3256)
@@ -103,7 +103,7 @@
<rich:effect name="showDiv" for="contentDiv" type="Appear" />
<!-- attaching to window on load and applying on particular page element -->
-<rich:effect for="window" event="onload" type="Appear" params="id:'contentDiv',duration:0.8,from:0.3,to:1.0" />
+<rich:effect for="window" event="onload" type="Appear" params="targetId:'contentDiv',duration:0.8,from:0.3,to:1.0" />
...
]]></programlisting>
@@ -151,7 +151,7 @@
not, the value is left as is for possible wiring with on the DOM element's id on the client
side. By default, the target of the effect is the same element that effect pointed to.
However, the target element is might be overridden with <emphasis>
- <property>"effectId"</property>
+ <property>"targetId"</property>
</emphasis> option passed with <emphasis>
<property>"params"</property>
</emphasis> attribute of with function paramenter. </para>
@@ -164,15 +164,15 @@
itself, there are two option that might override the <property>rich:effect</property>
attribute. Those are: <itemizedlist>
<listitem><emphasis>
- <property>"effectId"</property>
+ <property>"targetId"</property>
</emphasis> allows to re-define the target of effect. The option is override the value of <emphasis>
<property>"for"</property>
- </emphasis> attribute</listitem>
+ </emphasis> attribute.</listitem>
<listitem><emphasis>
- <property>"effectType"</property>
+ <property>"type"</property>
</emphasis> defines the effect type. The option is override the value of <emphasis>
<property>"type"</property>
- </emphasis> attribute</listitem>
+ </emphasis> attribute.</listitem>
</itemizedlist>
</para>
16 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r3255 - in trunk: cdk/generator/src/main/java/org and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-10-04 08:54:41 -0400 (Thu, 04 Oct 2007)
New Revision: 3255
Added:
trunk/cdk/generator/src/main/java/org/richfaces/
trunk/cdk/generator/src/main/java/org/richfaces/dtd/
trunk/cdk/generator/src/main/java/org/richfaces/dtd/Attribute.java
trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinition.java
trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinitionFactory.java
trunk/cdk/generator/src/main/java/org/richfaces/dtd/Element.java
trunk/cdk/generator/src/main/java/org/richfaces/dtd/Node.java
trunk/cdk/generator/src/main/java/org/richfaces/dtd/wutka/
trunk/cdk/generator/src/main/java/org/richfaces/dtd/wutka/WutkaDefinitionFactory.java
trunk/cdk/generator/src/main/resources/META-INF/schema/html/
trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-lat1.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-special.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-symbol.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd
Modified:
trunk/cdk/generator/pom.xml
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1058
Modified: trunk/cdk/generator/pom.xml
===================================================================
--- trunk/cdk/generator/pom.xml 2007-10-04 11:09:50 UTC (rev 3254)
+++ trunk/cdk/generator/pom.xml 2007-10-04 12:54:41 UTC (rev 3255)
@@ -77,6 +77,11 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.1_3</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>wutka</groupId>
+ <artifactId>dtdparser</artifactId>
+ <version>1.21</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java 2007-10-04 11:09:50 UTC (rev 3254)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -21,10 +21,11 @@
package org.ajax4jsf.templatecompiler.elements.html;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.Collection;
import java.util.Formatter;
+import java.util.List;
+import java.util.TreeSet;
import org.ajax4jsf.templatecompiler.builder.CompilationContext;
import org.ajax4jsf.templatecompiler.builder.CompilationException;
@@ -47,6 +48,8 @@
private static final String PASS_THRU_ATTR = "x:passThruWithExclusions";
+ private static final List<String> DEFAULT_EXCLUSIONS = Arrays.asList("class", "id", "style" );
+
private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH
+ "/HTMLElement.vm";
@@ -56,7 +59,7 @@
private HTMLAttributes htmlAttributes = new HTMLAttributes();
- private ArrayList passThruAttributes = null;
+ private Collection<String> passThruAttributes = null;
private CompilationContext componentBean;
@@ -142,25 +145,18 @@
* @param listPassThruAttributes
*/
private void processingPassThruAtrribute(String listPassThruAttributes) {
- this.passThruAttributes = new ArrayList();
- ArrayList tempPassThruAttributes = HTMLTags.getAttributes(this.htmlTag);
-
+
+ passThruAttributes =
+ new TreeSet<String>(HTMLTags.getAttributes(this.htmlTag));
+
String[] excludeAttributes = listPassThruAttributes.split(",");
- Arrays.sort(excludeAttributes);
-
- for (int i = 0; i < tempPassThruAttributes.size(); i++) {
- String attr = (String) tempPassThruAttributes.get(i);
-
- int iTemp = Arrays.binarySearch(excludeAttributes, attr);
-
- if (iTemp < 0) {
- this.passThruAttributes.add(attr);
- } // if
-
- } // for
-
- Collections.sort(this.passThruAttributes);
+ passThruAttributes.removeAll(DEFAULT_EXCLUSIONS);
+
+ for (String attribute : excludeAttributes) {
+ passThruAttributes.remove(attribute);
+ }
+
}
/**
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java 2007-10-04 11:09:50 UTC (rev 3254)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -21,53 +21,80 @@
package org.ajax4jsf.templatecompiler.elements.html;
-import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+import org.richfaces.dtd.DocumentDefinition;
+import org.richfaces.dtd.DocumentDefinitionFactory;
+import org.richfaces.dtd.Element;
+
+
/**
* @author yukhovich
- *
+ * @author Maksim Kaszynski
*/
public class HTMLTags {
- private static final String TEMPLATES_TEMPLATECOMPILER_TAGS_BIN = "META-INF/templates/templatecompiler/tags.bin";
+ /**
+ *
+ */
+
+ private static final String HTML_SCHEMA = "META-INF/schema/html/xhtml1-transitional.dtd";
+
+ private static final URL HTML_DTD = HTMLTags.class.getClassLoader().getResource(HTML_SCHEMA);
+
+ @SuppressWarnings("unchecked")
+ public static Set<String> getAttributes(String tagName) {
+ Set<String> atrs = Collections.emptySet();
+
+ DocumentDefinition dtd =
+ DocumentDefinitionFactory.instance().getDocumentDefinition(HTML_DTD);
+
+ if (dtd != null) {
+ Element element = dtd.getElement(tagName);
- private static HashMap tags;
-
- private static boolean b = false;
-
- static {
-
- InputStream is = HTMLTags.class.getClassLoader().getResourceAsStream(
- TEMPLATES_TEMPLATECOMPILER_TAGS_BIN);
- try {
- ObjectInputStream in = new ObjectInputStream(is);
-
- tags = (HashMap) in.readObject();
-
- in.close();
-
- b = true;
-
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ if (element != null) {
+ atrs = element.getAttributes().keySet();
+ }
}
+
+ return atrs;
+
}
- public static boolean getS() {
- return b;
- }
-
- public static ArrayList getAttributes(String tagName) {
- if (b) {
- return (ArrayList) tags.get(tagName);
- } else {
- return null;
+ /**
+ * Look for tags.bin, and compare with it
+ * @param args
+ * @throws Exception
+ */
+ public static void main(String [] args) throws Exception{
+ InputStream stream = HTMLTags.class.getClassLoader().getResourceAsStream("META-INF/templates/templatecompiler/tags.bin");
+
+ ObjectInputStream stream2 = new ObjectInputStream(stream);
+
+ @SuppressWarnings("unchecked")
+ Map<String, List<String>> m =
+ (Map<String, List<String>>) stream2.readObject();
+
+ Set<Entry<String,List<String>>> entrySet = m.entrySet();
+ for (Entry<String, List<String>> entry : entrySet) {
+ String element = entry.getKey();
+
+ Set<String> attributes = HTMLTags.getAttributes(element);
+ List<String> attributeList = entry.getValue();
+
+ if (attributeList != null && attributes != null) {
+ attributes.removeAll(attributeList);
+ }
+ System.out.println(element + attributes);
+
}
}
+
}
Added: trunk/cdk/generator/src/main/java/org/richfaces/dtd/Attribute.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/dtd/Attribute.java (rev 0)
+++ trunk/cdk/generator/src/main/java/org/richfaces/dtd/Attribute.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,35 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - 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.dtd;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public class Attribute extends Node{
+
+ public Attribute(String name) {
+ super(name);
+ }
+
+
+}
Added: trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinition.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinition.java (rev 0)
+++ trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinition.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,62 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - 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.dtd;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public class DocumentDefinition {
+ private Map<String, Element> elements = new HashMap<String, Element>();
+
+ private URL url;
+
+ private Element rootElement;
+
+ public DocumentDefinition(URL url, Element rootElement) {
+ super();
+ this.url = url;
+ this.rootElement = rootElement;
+ }
+
+ public void addElement(Element e) {
+ elements.put(e.getName(), e);
+ }
+
+ public Element getElement(String name) {
+ return elements.get(name);
+ }
+
+ public URL getUrl() {
+ return url;
+ }
+
+ public Element getRootElement() {
+ return rootElement;
+ }
+
+
+}
Added: trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinitionFactory.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinitionFactory.java (rev 0)
+++ trunk/cdk/generator/src/main/java/org/richfaces/dtd/DocumentDefinitionFactory.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,42 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - 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.dtd;
+
+import java.net.URL;
+
+import org.richfaces.dtd.wutka.WutkaDefinitionFactory;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public abstract class DocumentDefinitionFactory {
+
+ private static DocumentDefinitionFactory instance =
+ new WutkaDefinitionFactory();
+
+ public static DocumentDefinitionFactory instance() {
+ return instance;
+ }
+
+ public abstract DocumentDefinition getDocumentDefinition(URL resource);
+}
Added: trunk/cdk/generator/src/main/java/org/richfaces/dtd/Element.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/dtd/Element.java (rev 0)
+++ trunk/cdk/generator/src/main/java/org/richfaces/dtd/Element.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,48 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - 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.dtd;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public class Element extends Node{
+
+ private Map<String, Attribute> attributes = new HashMap<String, Attribute>();
+
+ public Element(String name) {
+ super(name);
+ }
+
+ public void addAttribute(Attribute attribute) {
+ attributes.put(attribute.getName(), attribute);
+ }
+
+ public Map<String, Attribute> getAttributes() {
+ return attributes;
+ }
+
+
+}
Added: trunk/cdk/generator/src/main/java/org/richfaces/dtd/Node.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/dtd/Node.java (rev 0)
+++ trunk/cdk/generator/src/main/java/org/richfaces/dtd/Node.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,42 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - 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.dtd;
+
+/**
+ * Reduced DOM
+ * @author Maksim Kaszynski
+ *
+ */
+public class Node {
+
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public Node(String name) {
+ super();
+ this.name = name;
+ }
+
+}
Added: trunk/cdk/generator/src/main/java/org/richfaces/dtd/wutka/WutkaDefinitionFactory.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/dtd/wutka/WutkaDefinitionFactory.java (rev 0)
+++ trunk/cdk/generator/src/main/java/org/richfaces/dtd/wutka/WutkaDefinitionFactory.java 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,115 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - 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.dtd.wutka;
+
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.richfaces.dtd.Attribute;
+import org.richfaces.dtd.DocumentDefinition;
+import org.richfaces.dtd.DocumentDefinitionFactory;
+import org.richfaces.dtd.Element;
+
+import com.wutka.dtd.DTD;
+import com.wutka.dtd.DTDAttribute;
+import com.wutka.dtd.DTDElement;
+import com.wutka.dtd.DTDParser;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public class WutkaDefinitionFactory extends DocumentDefinitionFactory{
+
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ private Map<URL, DocumentDefinition> definitions
+ = new HashMap<URL, DocumentDefinition>();
+
+ @Override
+ public synchronized DocumentDefinition getDocumentDefinition(URL resource) {
+ DocumentDefinition def = null;
+ if (definitions.containsKey(resource)) {
+ def = definitions.get(resource);
+ } else {
+
+ try {
+ def = initDefinition(resource);
+ } catch(Exception e) {
+ log.error("An error has occured", e);
+ }
+
+ if (def != null) {
+ definitions.put(resource, def);
+ }
+ }
+ return def;
+ }
+
+
+ private DocumentDefinition initDefinition(URL resource) throws Exception{
+
+ DTD dtd = new DTDParser(resource).parse();
+
+ Element rootElement = fromWutka(dtd.rootElement);
+
+ DocumentDefinition definition = new DocumentDefinition(resource, rootElement);
+
+ @SuppressWarnings("unchecked")
+ Enumeration<DTDElement> elements = dtd.elements.elements();
+
+ while(elements.hasMoreElements()) {
+ DTDElement element = elements.nextElement();
+
+ definition.addElement(fromWutka(element));
+ }
+
+ return definition;
+ }
+
+ private Attribute fromWutka(DTDAttribute attr) {
+ return new Attribute(attr.name);
+ }
+
+ private Element fromWutka(DTDElement element) {
+
+ if (element == null) {
+ return null;
+ }
+
+ Element e = new Element(element.getName());
+
+ @SuppressWarnings("unchecked")
+ Enumeration<DTDAttribute> attrs =
+ element.attributes.elements();
+
+ while(attrs.hasMoreElements()) {
+ e.addAttribute(fromWutka(attrs.nextElement()));
+ }
+
+ return e;
+ }
+}
Added: trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-lat1.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-lat1.ent (rev 0)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-lat1.ent 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,196 @@
+<!-- Portions (C) International Organization for Standardization 1986
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+ %HTMLlat1;
+-->
+
+<!ENTITY nbsp " "> <!-- no-break space = non-breaking space,
+ U+00A0 ISOnum -->
+<!ENTITY iexcl "¡"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
+<!ENTITY cent "¢"> <!-- cent sign, U+00A2 ISOnum -->
+<!ENTITY pound "£"> <!-- pound sign, U+00A3 ISOnum -->
+<!ENTITY curren "¤"> <!-- currency sign, U+00A4 ISOnum -->
+<!ENTITY yen "¥"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
+<!ENTITY brvbar "¦"> <!-- broken bar = broken vertical bar,
+ U+00A6 ISOnum -->
+<!ENTITY sect "§"> <!-- section sign, U+00A7 ISOnum -->
+<!ENTITY uml "¨"> <!-- diaeresis = spacing diaeresis,
+ U+00A8 ISOdia -->
+<!ENTITY copy "©"> <!-- copyright sign, U+00A9 ISOnum -->
+<!ENTITY ordf "ª"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
+<!ENTITY laquo "«"> <!-- left-pointing double angle quotation mark
+ = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY not "¬"> <!-- not sign = angled dash,
+ U+00AC ISOnum -->
+<!ENTITY shy "­"> <!-- soft hyphen = discretionary hyphen,
+ U+00AD ISOnum -->
+<!ENTITY reg "®"> <!-- registered sign = registered trade mark sign,
+ U+00AE ISOnum -->
+<!ENTITY macr "¯"> <!-- macron = spacing macron = overline
+ = APL overbar, U+00AF ISOdia -->
+<!ENTITY deg "°"> <!-- degree sign, U+00B0 ISOnum -->
+<!ENTITY plusmn "±"> <!-- plus-minus sign = plus-or-minus sign,
+ U+00B1 ISOnum -->
+<!ENTITY sup2 "²"> <!-- superscript two = superscript digit two
+ = squared, U+00B2 ISOnum -->
+<!ENTITY sup3 "³"> <!-- superscript three = superscript digit three
+ = cubed, U+00B3 ISOnum -->
+<!ENTITY acute "´"> <!-- acute accent = spacing acute,
+ U+00B4 ISOdia -->
+<!ENTITY micro "µ"> <!-- micro sign, U+00B5 ISOnum -->
+<!ENTITY para "¶"> <!-- pilcrow sign = paragraph sign,
+ U+00B6 ISOnum -->
+<!ENTITY middot "·"> <!-- middle dot = Georgian comma
+ = Greek middle dot, U+00B7 ISOnum -->
+<!ENTITY cedil "¸"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
+<!ENTITY sup1 "¹"> <!-- superscript one = superscript digit one,
+ U+00B9 ISOnum -->
+<!ENTITY ordm "º"> <!-- masculine ordinal indicator,
+ U+00BA ISOnum -->
+<!ENTITY raquo "»"> <!-- right-pointing double angle quotation mark
+ = right pointing guillemet, U+00BB ISOnum -->
+<!ENTITY frac14 "¼"> <!-- vulgar fraction one quarter
+ = fraction one quarter, U+00BC ISOnum -->
+<!ENTITY frac12 "½"> <!-- vulgar fraction one half
+ = fraction one half, U+00BD ISOnum -->
+<!ENTITY frac34 "¾"> <!-- vulgar fraction three quarters
+ = fraction three quarters, U+00BE ISOnum -->
+<!ENTITY iquest "¿"> <!-- inverted question mark
+ = turned question mark, U+00BF ISOnum -->
+<!ENTITY Agrave "À"> <!-- latin capital letter A with grave
+ = latin capital letter A grave,
+ U+00C0 ISOlat1 -->
+<!ENTITY Aacute "Á"> <!-- latin capital letter A with acute,
+ U+00C1 ISOlat1 -->
+<!ENTITY Acirc "Â"> <!-- latin capital letter A with circumflex,
+ U+00C2 ISOlat1 -->
+<!ENTITY Atilde "Ã"> <!-- latin capital letter A with tilde,
+ U+00C3 ISOlat1 -->
+<!ENTITY Auml "Ä"> <!-- latin capital letter A with diaeresis,
+ U+00C4 ISOlat1 -->
+<!ENTITY Aring "Å"> <!-- latin capital letter A with ring above
+ = latin capital letter A ring,
+ U+00C5 ISOlat1 -->
+<!ENTITY AElig "Æ"> <!-- latin capital letter AE
+ = latin capital ligature AE,
+ U+00C6 ISOlat1 -->
+<!ENTITY Ccedil "Ç"> <!-- latin capital letter C with cedilla,
+ U+00C7 ISOlat1 -->
+<!ENTITY Egrave "È"> <!-- latin capital letter E with grave,
+ U+00C8 ISOlat1 -->
+<!ENTITY Eacute "É"> <!-- latin capital letter E with acute,
+ U+00C9 ISOlat1 -->
+<!ENTITY Ecirc "Ê"> <!-- latin capital letter E with circumflex,
+ U+00CA ISOlat1 -->
+<!ENTITY Euml "Ë"> <!-- latin capital letter E with diaeresis,
+ U+00CB ISOlat1 -->
+<!ENTITY Igrave "Ì"> <!-- latin capital letter I with grave,
+ U+00CC ISOlat1 -->
+<!ENTITY Iacute "Í"> <!-- latin capital letter I with acute,
+ U+00CD ISOlat1 -->
+<!ENTITY Icirc "Î"> <!-- latin capital letter I with circumflex,
+ U+00CE ISOlat1 -->
+<!ENTITY Iuml "Ï"> <!-- latin capital letter I with diaeresis,
+ U+00CF ISOlat1 -->
+<!ENTITY ETH "Ð"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
+<!ENTITY Ntilde "Ñ"> <!-- latin capital letter N with tilde,
+ U+00D1 ISOlat1 -->
+<!ENTITY Ograve "Ò"> <!-- latin capital letter O with grave,
+ U+00D2 ISOlat1 -->
+<!ENTITY Oacute "Ó"> <!-- latin capital letter O with acute,
+ U+00D3 ISOlat1 -->
+<!ENTITY Ocirc "Ô"> <!-- latin capital letter O with circumflex,
+ U+00D4 ISOlat1 -->
+<!ENTITY Otilde "Õ"> <!-- latin capital letter O with tilde,
+ U+00D5 ISOlat1 -->
+<!ENTITY Ouml "Ö"> <!-- latin capital letter O with diaeresis,
+ U+00D6 ISOlat1 -->
+<!ENTITY times "×"> <!-- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY Oslash "Ø"> <!-- latin capital letter O with stroke
+ = latin capital letter O slash,
+ U+00D8 ISOlat1 -->
+<!ENTITY Ugrave "Ù"> <!-- latin capital letter U with grave,
+ U+00D9 ISOlat1 -->
+<!ENTITY Uacute "Ú"> <!-- latin capital letter U with acute,
+ U+00DA ISOlat1 -->
+<!ENTITY Ucirc "Û"> <!-- latin capital letter U with circumflex,
+ U+00DB ISOlat1 -->
+<!ENTITY Uuml "Ü"> <!-- latin capital letter U with diaeresis,
+ U+00DC ISOlat1 -->
+<!ENTITY Yacute "Ý"> <!-- latin capital letter Y with acute,
+ U+00DD ISOlat1 -->
+<!ENTITY THORN "Þ"> <!-- latin capital letter THORN,
+ U+00DE ISOlat1 -->
+<!ENTITY szlig "ß"> <!-- latin small letter sharp s = ess-zed,
+ U+00DF ISOlat1 -->
+<!ENTITY agrave "à"> <!-- latin small letter a with grave
+ = latin small letter a grave,
+ U+00E0 ISOlat1 -->
+<!ENTITY aacute "á"> <!-- latin small letter a with acute,
+ U+00E1 ISOlat1 -->
+<!ENTITY acirc "â"> <!-- latin small letter a with circumflex,
+ U+00E2 ISOlat1 -->
+<!ENTITY atilde "ã"> <!-- latin small letter a with tilde,
+ U+00E3 ISOlat1 -->
+<!ENTITY auml "ä"> <!-- latin small letter a with diaeresis,
+ U+00E4 ISOlat1 -->
+<!ENTITY aring "å"> <!-- latin small letter a with ring above
+ = latin small letter a ring,
+ U+00E5 ISOlat1 -->
+<!ENTITY aelig "æ"> <!-- latin small letter ae
+ = latin small ligature ae, U+00E6 ISOlat1 -->
+<!ENTITY ccedil "ç"> <!-- latin small letter c with cedilla,
+ U+00E7 ISOlat1 -->
+<!ENTITY egrave "è"> <!-- latin small letter e with grave,
+ U+00E8 ISOlat1 -->
+<!ENTITY eacute "é"> <!-- latin small letter e with acute,
+ U+00E9 ISOlat1 -->
+<!ENTITY ecirc "ê"> <!-- latin small letter e with circumflex,
+ U+00EA ISOlat1 -->
+<!ENTITY euml "ë"> <!-- latin small letter e with diaeresis,
+ U+00EB ISOlat1 -->
+<!ENTITY igrave "ì"> <!-- latin small letter i with grave,
+ U+00EC ISOlat1 -->
+<!ENTITY iacute "í"> <!-- latin small letter i with acute,
+ U+00ED ISOlat1 -->
+<!ENTITY icirc "î"> <!-- latin small letter i with circumflex,
+ U+00EE ISOlat1 -->
+<!ENTITY iuml "ï"> <!-- latin small letter i with diaeresis,
+ U+00EF ISOlat1 -->
+<!ENTITY eth "ð"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
+<!ENTITY ntilde "ñ"> <!-- latin small letter n with tilde,
+ U+00F1 ISOlat1 -->
+<!ENTITY ograve "ò"> <!-- latin small letter o with grave,
+ U+00F2 ISOlat1 -->
+<!ENTITY oacute "ó"> <!-- latin small letter o with acute,
+ U+00F3 ISOlat1 -->
+<!ENTITY ocirc "ô"> <!-- latin small letter o with circumflex,
+ U+00F4 ISOlat1 -->
+<!ENTITY otilde "õ"> <!-- latin small letter o with tilde,
+ U+00F5 ISOlat1 -->
+<!ENTITY ouml "ö"> <!-- latin small letter o with diaeresis,
+ U+00F6 ISOlat1 -->
+<!ENTITY divide "÷"> <!-- division sign, U+00F7 ISOnum -->
+<!ENTITY oslash "ø"> <!-- latin small letter o with stroke,
+ = latin small letter o slash,
+ U+00F8 ISOlat1 -->
+<!ENTITY ugrave "ù"> <!-- latin small letter u with grave,
+ U+00F9 ISOlat1 -->
+<!ENTITY uacute "ú"> <!-- latin small letter u with acute,
+ U+00FA ISOlat1 -->
+<!ENTITY ucirc "û"> <!-- latin small letter u with circumflex,
+ U+00FB ISOlat1 -->
+<!ENTITY uuml "ü"> <!-- latin small letter u with diaeresis,
+ U+00FC ISOlat1 -->
+<!ENTITY yacute "ý"> <!-- latin small letter y with acute,
+ U+00FD ISOlat1 -->
+<!ENTITY thorn "þ"> <!-- latin small letter thorn with,
+ U+00FE ISOlat1 -->
+<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis,
+ U+00FF ISOlat1 -->
Added: trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-special.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-special.ent (rev 0)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-special.ent 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,79 @@
+<!-- Special characters for HTML -->
+
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
+ %HTMLspecial;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+ New names (i.e., not in ISO 8879 list) do not clash with any
+ existing ISO 8879 entity names. ISO 10646 character numbers
+ are given for each character, in hex. values are decimal
+ conversions of the ISO 10646 values and refer to the document
+ character set. Names are Unicode names.
+-->
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot """> <!-- quotation mark = APL quote,
+ U+0022 ISOnum -->
+<!ENTITY amp "&#38;"> <!-- ampersand, U+0026 ISOnum -->
+<!ENTITY lt "&#60;"> <!-- less-than sign, U+003C ISOnum -->
+<!ENTITY gt ">"> <!-- greater-than sign, U+003E ISOnum -->
+<!ENTITY apos "'"> <!-- apostrophe mark, U+0027 ISOnum -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig "Œ"> <!-- latin capital ligature OE,
+ U+0152 ISOlat2 -->
+<!ENTITY oelig "œ"> <!-- latin small ligature oe, U+0153 ISOlat2 -->
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron "Š"> <!-- latin capital letter S with caron,
+ U+0160 ISOlat2 -->
+<!ENTITY scaron "š"> <!-- latin small letter s with caron,
+ U+0161 ISOlat2 -->
+<!ENTITY Yuml "Ÿ"> <!-- latin capital letter Y with diaeresis,
+ U+0178 ISOlat2 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ "ˆ"> <!-- modifier letter circumflex accent,
+ U+02C6 ISOpub -->
+<!ENTITY tilde "˜"> <!-- small tilde, U+02DC ISOdia -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp " "> <!-- en space, U+2002 ISOpub -->
+<!ENTITY emsp " "> <!-- em space, U+2003 ISOpub -->
+<!ENTITY thinsp " "> <!-- thin space, U+2009 ISOpub -->
+<!ENTITY zwnj "‌"> <!-- zero width non-joiner,
+ U+200C NEW RFC 2070 -->
+<!ENTITY zwj "‍"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
+<!ENTITY lrm "‎"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
+<!ENTITY rlm "‏"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
+<!ENTITY ndash "–"> <!-- en dash, U+2013 ISOpub -->
+<!ENTITY mdash "—"> <!-- em dash, U+2014 ISOpub -->
+<!ENTITY lsquo "‘"> <!-- left single quotation mark,
+ U+2018 ISOnum -->
+<!ENTITY rsquo "’"> <!-- right single quotation mark,
+ U+2019 ISOnum -->
+<!ENTITY sbquo "‚"> <!-- single low-9 quotation mark, U+201A NEW -->
+<!ENTITY ldquo "“"> <!-- left double quotation mark,
+ U+201C ISOnum -->
+<!ENTITY rdquo "”"> <!-- right double quotation mark,
+ U+201D ISOnum -->
+<!ENTITY bdquo "„"> <!-- double low-9 quotation mark, U+201E NEW -->
+<!ENTITY dagger "†"> <!-- dagger, U+2020 ISOpub -->
+<!ENTITY Dagger "‡"> <!-- double dagger, U+2021 ISOpub -->
+<!ENTITY permil "‰"> <!-- per mille sign, U+2030 ISOtech -->
+<!ENTITY lsaquo "‹"> <!-- single left-pointing angle quotation mark,
+ U+2039 ISO proposed -->
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo "›"> <!-- single right-pointing angle quotation mark,
+ U+203A ISO proposed -->
+<!-- rsaquo is proposed but not yet ISO standardized -->
+<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
Added: trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-symbol.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-symbol.ent (rev 0)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml-symbol.ent 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,242 @@
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
+
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
+ %HTMLsymbol;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+ New names (i.e., not in ISO 8879 list) do not clash with any
+ existing ISO 8879 entity names. ISO 10646 character numbers
+ are given for each character, in hex. values are decimal
+ conversions of the ISO 10646 values and refer to the document
+ character set. Names are Unicode names.
+-->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof "ƒ"> <!-- latin small f with hook = function
+ = florin, U+0192 ISOtech -->
+
+<!-- Greek -->
+<!ENTITY Alpha "Α"> <!-- greek capital letter alpha, U+0391 -->
+<!ENTITY Beta "Β"> <!-- greek capital letter beta, U+0392 -->
+<!ENTITY Gamma "Γ"> <!-- greek capital letter gamma,
+ U+0393 ISOgrk3 -->
+<!ENTITY Delta "Δ"> <!-- greek capital letter delta,
+ U+0394 ISOgrk3 -->
+<!ENTITY Epsilon "Ε"> <!-- greek capital letter epsilon, U+0395 -->
+<!ENTITY Zeta "Ζ"> <!-- greek capital letter zeta, U+0396 -->
+<!ENTITY Eta "Η"> <!-- greek capital letter eta, U+0397 -->
+<!ENTITY Theta "Θ"> <!-- greek capital letter theta,
+ U+0398 ISOgrk3 -->
+<!ENTITY Iota "Ι"> <!-- greek capital letter iota, U+0399 -->
+<!ENTITY Kappa "Κ"> <!-- greek capital letter kappa, U+039A -->
+<!ENTITY Lambda "Λ"> <!-- greek capital letter lambda,
+ U+039B ISOgrk3 -->
+<!ENTITY Mu "Μ"> <!-- greek capital letter mu, U+039C -->
+<!ENTITY Nu "Ν"> <!-- greek capital letter nu, U+039D -->
+<!ENTITY Xi "Ξ"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
+<!ENTITY Omicron "Ο"> <!-- greek capital letter omicron, U+039F -->
+<!ENTITY Pi "Π"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
+<!ENTITY Rho "Ρ"> <!-- greek capital letter rho, U+03A1 -->
+<!-- there is no Sigmaf, and no U+03A2 character either -->
+<!ENTITY Sigma "Σ"> <!-- greek capital letter sigma,
+ U+03A3 ISOgrk3 -->
+<!ENTITY Tau "Τ"> <!-- greek capital letter tau, U+03A4 -->
+<!ENTITY Upsilon "Υ"> <!-- greek capital letter upsilon,
+ U+03A5 ISOgrk3 -->
+<!ENTITY Phi "Φ"> <!-- greek capital letter phi,
+ U+03A6 ISOgrk3 -->
+<!ENTITY Chi "Χ"> <!-- greek capital letter chi, U+03A7 -->
+<!ENTITY Psi "Ψ"> <!-- greek capital letter psi,
+ U+03A8 ISOgrk3 -->
+<!ENTITY Omega "Ω"> <!-- greek capital letter omega,
+ U+03A9 ISOgrk3 -->
+
+<!ENTITY alpha "α"> <!-- greek small letter alpha,
+ U+03B1 ISOgrk3 -->
+<!ENTITY beta "β"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
+<!ENTITY gamma "γ"> <!-- greek small letter gamma,
+ U+03B3 ISOgrk3 -->
+<!ENTITY delta "δ"> <!-- greek small letter delta,
+ U+03B4 ISOgrk3 -->
+<!ENTITY epsilon "ε"> <!-- greek small letter epsilon,
+ U+03B5 ISOgrk3 -->
+<!ENTITY zeta "ζ"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
+<!ENTITY eta "η"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
+<!ENTITY theta "θ"> <!-- greek small letter theta,
+ U+03B8 ISOgrk3 -->
+<!ENTITY iota "ι"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
+<!ENTITY kappa "κ"> <!-- greek small letter kappa,
+ U+03BA ISOgrk3 -->
+<!ENTITY lambda "λ"> <!-- greek small letter lambda,
+ U+03BB ISOgrk3 -->
+<!ENTITY mu "μ"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
+<!ENTITY nu "ν"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
+<!ENTITY xi "ξ"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
+<!ENTITY omicron "ο"> <!-- greek small letter omicron, U+03BF NEW -->
+<!ENTITY pi "π"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
+<!ENTITY rho "ρ"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
+<!ENTITY sigmaf "ς"> <!-- greek small letter final sigma,
+ U+03C2 ISOgrk3 -->
+<!ENTITY sigma "σ"> <!-- greek small letter sigma,
+ U+03C3 ISOgrk3 -->
+<!ENTITY tau "τ"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
+<!ENTITY upsilon "υ"> <!-- greek small letter upsilon,
+ U+03C5 ISOgrk3 -->
+<!ENTITY phi "φ"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
+<!ENTITY chi "χ"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
+<!ENTITY psi "ψ"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
+<!ENTITY omega "ω"> <!-- greek small letter omega,
+ U+03C9 ISOgrk3 -->
+<!ENTITY thetasym "ϑ"> <!-- greek small letter theta symbol,
+ U+03D1 NEW -->
+<!ENTITY upsih "ϒ"> <!-- greek upsilon with hook symbol,
+ U+03D2 NEW -->
+<!ENTITY piv "ϖ"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
+
+<!-- General Punctuation -->
+<!ENTITY bull "•"> <!-- bullet = black small circle,
+ U+2022 ISOpub -->
+<!-- bullet is NOT the same as bullet operator, U+2219 -->
+<!ENTITY hellip "…"> <!-- horizontal ellipsis = three dot leader,
+ U+2026 ISOpub -->
+<!ENTITY prime "′"> <!-- prime = minutes = feet, U+2032 ISOtech -->
+<!ENTITY Prime "″"> <!-- double prime = seconds = inches,
+ U+2033 ISOtech -->
+<!ENTITY oline "‾"> <!-- overline = spacing overscore,
+ U+203E NEW -->
+<!ENTITY frasl "⁄"> <!-- fraction slash, U+2044 NEW -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp "℘"> <!-- script capital P = power set
+ = Weierstrass p, U+2118 ISOamso -->
+<!ENTITY image "ℑ"> <!-- blackletter capital I = imaginary part,
+ U+2111 ISOamso -->
+<!ENTITY real "ℜ"> <!-- blackletter capital R = real part symbol,
+ U+211C ISOamso -->
+<!ENTITY trade "™"> <!-- trade mark sign, U+2122 ISOnum -->
+<!ENTITY alefsym "ℵ"> <!-- alef symbol = first transfinite cardinal,
+ U+2135 NEW -->
+<!-- alef symbol is NOT the same as hebrew letter alef,
+ U+05D0 although the same glyph could be used to depict both characters -->
+
+<!-- Arrows -->
+<!ENTITY larr "←"> <!-- leftwards arrow, U+2190 ISOnum -->
+<!ENTITY uarr "↑"> <!-- upwards arrow, U+2191 ISOnum-->
+<!ENTITY rarr "→"> <!-- rightwards arrow, U+2192 ISOnum -->
+<!ENTITY darr "↓"> <!-- downwards arrow, U+2193 ISOnum -->
+<!ENTITY harr "↔"> <!-- left right arrow, U+2194 ISOamsa -->
+<!ENTITY crarr "↵"> <!-- downwards arrow with corner leftwards
+ = carriage return, U+21B5 NEW -->
+<!ENTITY lArr "⇐"> <!-- leftwards double arrow, U+21D0 ISOtech -->
+<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
+ but also does not have any other character for that function. So ? lArr can
+ be used for 'is implied by' as ISOtech suggests -->
+<!ENTITY uArr "⇑"> <!-- upwards double arrow, U+21D1 ISOamsa -->
+<!ENTITY rArr "⇒"> <!-- rightwards double arrow,
+ U+21D2 ISOtech -->
+<!-- Unicode does not say this is the 'implies' character but does not have
+ another character with this function so ?
+ rArr can be used for 'implies' as ISOtech suggests -->
+<!ENTITY dArr "⇓"> <!-- downwards double arrow, U+21D3 ISOamsa -->
+<!ENTITY hArr "⇔"> <!-- left right double arrow,
+ U+21D4 ISOamsa -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall "∀"> <!-- for all, U+2200 ISOtech -->
+<!ENTITY part "∂"> <!-- partial differential, U+2202 ISOtech -->
+<!ENTITY exist "∃"> <!-- there exists, U+2203 ISOtech -->
+<!ENTITY empty "∅"> <!-- empty set = null set = diameter,
+ U+2205 ISOamso -->
+<!ENTITY nabla "∇"> <!-- nabla = backward difference,
+ U+2207 ISOtech -->
+<!ENTITY isin "∈"> <!-- element of, U+2208 ISOtech -->
+<!ENTITY notin "∉"> <!-- not an element of, U+2209 ISOtech -->
+<!ENTITY ni "∋"> <!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
+<!ENTITY prod "∏"> <!-- n-ary product = product sign,
+ U+220F ISOamsb -->
+<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
+ the same glyph might be used for both -->
+<!ENTITY sum "∑"> <!-- n-ary sumation, U+2211 ISOamsb -->
+<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+ though the same glyph might be used for both -->
+<!ENTITY minus "−"> <!-- minus sign, U+2212 ISOtech -->
+<!ENTITY lowast "∗"> <!-- asterisk operator, U+2217 ISOtech -->
+<!ENTITY radic "√"> <!-- square root = radical sign,
+ U+221A ISOtech -->
+<!ENTITY prop "∝"> <!-- proportional to, U+221D ISOtech -->
+<!ENTITY infin "∞"> <!-- infinity, U+221E ISOtech -->
+<!ENTITY ang "∠"> <!-- angle, U+2220 ISOamso -->
+<!ENTITY and "∧"> <!-- logical and = wedge, U+2227 ISOtech -->
+<!ENTITY or "∨"> <!-- logical or = vee, U+2228 ISOtech -->
+<!ENTITY cap "∩"> <!-- intersection = cap, U+2229 ISOtech -->
+<!ENTITY cup "∪"> <!-- union = cup, U+222A ISOtech -->
+<!ENTITY int "∫"> <!-- integral, U+222B ISOtech -->
+<!ENTITY there4 "∴"> <!-- therefore, U+2234 ISOtech -->
+<!ENTITY sim "∼"> <!-- tilde operator = varies with = similar to,
+ U+223C ISOtech -->
+<!-- tilde operator is NOT the same character as the tilde, U+007E,
+ although the same glyph might be used to represent both -->
+<!ENTITY cong "≅"> <!-- approximately equal to, U+2245 ISOtech -->
+<!ENTITY asymp "≈"> <!-- almost equal to = asymptotic to,
+ U+2248 ISOamsr -->
+<!ENTITY ne "≠"> <!-- not equal to, U+2260 ISOtech -->
+<!ENTITY equiv "≡"> <!-- identical to, U+2261 ISOtech -->
+<!ENTITY le "≤"> <!-- less-than or equal to, U+2264 ISOtech -->
+<!ENTITY ge "≥"> <!-- greater-than or equal to,
+ U+2265 ISOtech -->
+<!ENTITY sub "⊂"> <!-- subset of, U+2282 ISOtech -->
+<!ENTITY sup "⊃"> <!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
+ font encoding and is not included. Should it be, for symmetry?
+ It is in ISOamsn -->
+<!ENTITY nsub "⊄"> <!-- not a subset of, U+2284 ISOamsn -->
+<!ENTITY sube "⊆"> <!-- subset of or equal to, U+2286 ISOtech -->
+<!ENTITY supe "⊇"> <!-- superset of or equal to,
+ U+2287 ISOtech -->
+<!ENTITY oplus "⊕"> <!-- circled plus = direct sum,
+ U+2295 ISOamsb -->
+<!ENTITY otimes "⊗"> <!-- circled times = vector product,
+ U+2297 ISOamsb -->
+<!ENTITY perp "⊥"> <!-- up tack = orthogonal to = perpendicular,
+ U+22A5 ISOtech -->
+<!ENTITY sdot "⋅"> <!-- dot operator, U+22C5 ISOamsb -->
+<!-- dot operator is NOT the same character as U+00B7 middle dot -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil "⌈"> <!-- left ceiling = apl upstile,
+ U+2308 ISOamsc -->
+<!ENTITY rceil "⌉"> <!-- right ceiling, U+2309 ISOamsc -->
+<!ENTITY lfloor "⌊"> <!-- left floor = apl downstile,
+ U+230A ISOamsc -->
+<!ENTITY rfloor "⌋"> <!-- right floor, U+230B ISOamsc -->
+<!ENTITY lang "〈"> <!-- left-pointing angle bracket = bra,
+ U+2329 ISOtech -->
+<!-- lang is NOT the same character as U+003C 'less than'
+ or U+2039 'single left-pointing angle quotation mark' -->
+<!ENTITY rang "〉"> <!-- right-pointing angle bracket = ket,
+ U+232A ISOtech -->
+<!-- rang is NOT the same character as U+003E 'greater than'
+ or U+203A 'single right-pointing angle quotation mark' -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz "◊"> <!-- lozenge, U+25CA ISOpub -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades "♠"> <!-- black spade suit, U+2660 ISOpub -->
+<!-- black here seems to mean filled as opposed to hollow -->
+<!ENTITY clubs "♣"> <!-- black club suit = shamrock,
+ U+2663 ISOpub -->
+<!ENTITY hearts "♥"> <!-- black heart suit = valentine,
+ U+2665 ISOpub -->
+<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
Added: trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd (rev 0)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/html/xhtml1-transitional.dtd 2007-10-04 12:54:41 UTC (rev 3255)
@@ -0,0 +1,1196 @@
+<!--
+ Extensible HTML version 1.0 Transitional DTD
+
+ This is the same as HTML 4.0 Transitional except for
+ changes due to the differences between XML and SGML.
+
+ Namespace = http://www.w3.org/1999/xhtml
+
+ For further information, see: http://www.w3.org/TR/xhtml1
+
+ Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
+ All Rights Reserved.
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+
+ $Revision: 1.1 $
+ $Date: 2007/05/15 02:42:22 $
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+ <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+ <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+ <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+ <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+ <!-- a language code, as per [RFC1766] -->
+
+<!ENTITY % Character "CDATA">
+ <!-- a single character from [ISO10646] -->
+
+<!ENTITY % Number "CDATA">
+ <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+ <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+ <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+ <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+ <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+ <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+ <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+ <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+ <!-- used for titles etc. -->
+
+<!ENTITY % FrameTarget "NMTOKEN">
+ <!-- render in this frame -->
+
+<!ENTITY % Length "CDATA">
+ <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+ <!-- pixel, percentage, or relative -->
+
+<!ENTITY % MultiLengths "CDATA">
+ <!-- comma-separated list of MultiLength -->
+
+<!ENTITY % Pixels "CDATA">
+ <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+ <!-- comma separated list of lengths -->
+
+<!-- used for object, applet, img, input and iframe -->
+<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
+
+<!-- a color using sRGB: #RRGGBB as Hex values -->
+<!ENTITY % Color "CDATA">
+
+<!-- There are also 16 widely known color names with their sRGB values:
+
+ Black = #000000 Green = #008000
+ Silver = #C0C0C0 Lime = #00FF00
+ Gray = #808080 Olive = #808000
+ White = #FFFFFF Yellow = #FFFF00
+ Maroon = #800000 Navy = #000080
+ Red = #FF0000 Blue = #0000FF
+ Purple = #800080 Teal = #008080
+ Fuchsia= #FF00FF Aqua = #00FFFF
+-->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+ id document-wide unique id
+ class space separated list of classes
+ style associated style info
+ title advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id ID #IMPLIED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED"
+ >
+
+<!-- internationalization attributes
+ lang language code (backwards compatible)
+ xml:lang language code (as per XML 1.0 spec)
+ dir direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #IMPLIED"
+ >
+
+<!-- attributes for common UI events
+ onclick a pointer button was clicked
+ ondblclick a pointer button was double clicked
+ onmousedown a pointer button was pressed down
+ onmouseup a pointer button was released
+ onmousemove a pointer was moved onto the element
+ onmouseout a pointer was moved away from the element
+ onkeypress a key was pressed and released
+ onkeydown a key was pressed down
+ onkeyup a key was released
+-->
+<!ENTITY % events
+ "onclick %Script; #IMPLIED
+ ondblclick %Script; #IMPLIED
+ onmousedown %Script; #IMPLIED
+ onmouseup %Script; #IMPLIED
+ onmouseover %Script; #IMPLIED
+ onmousemove %Script; #IMPLIED
+ onmouseout %Script; #IMPLIED
+ onkeypress %Script; #IMPLIED
+ onkeydown %Script; #IMPLIED
+ onkeyup %Script; #IMPLIED"
+ >
+
+<!-- attributes for elements that can get the focus
+ accesskey accessibility key character
+ tabindex position in tabbing order
+ onfocus the element got the focus
+ onblur the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey %Character; #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED"
+ >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!-- text alignment for p, div, h1-h6. The default is
+ align="left" for ltr headings, "right" for rtl -->
+
+<!ENTITY % TextAlign "align (left|center|right) #IMPLIED">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special
+ "br | span | bdo | object | applet | img | map | iframe">
+
+<!ENTITY % fontstyle "tt | i | b | big | small | u
+ | s | strike |font | basefont">
+
+<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
+ samp | kbd | var | cite | abbr | acronym">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc "ins | del | script | noscript">
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl | menu | dir">
+<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
+
+<!ENTITY % block
+ "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
+
+<!ENTITY % Block "(%block; | form | %misc;)*">
+
+<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+ "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
+
+<!-- pre uses %Inline excluding img, object, applet, big, small,
+ sub, sup, font, or basefont -->
+
+<!ENTITY % pre.content
+ "(#PCDATA | a | br | span | bdo | map | tt | i | b | u | s |
+ %phrase; | %inline.forms;)*">
+
+<!-- form uses %Flow; excluding form -->
+
+<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
+
+<!ENTITY % button.content
+ "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+ table | br | span | bdo | object | applet | img | map |
+ %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html
+ %i18n;
+ xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml'
+ >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
+
+<!-- content model is %head.misc; combined with a single
+ title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+ ((title, %head.misc;, (base, %head.misc;)?) |
+ (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+ %i18n;
+ profile %URI; #IMPLIED
+ >
+
+<!-- The title element is not considered part of the flow of text.
+ It should be displayed, for example as the page header or
+ window title. Exactly one title is required per document.
+ -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title %i18n;>
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+ href %URI; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+ %i18n;
+ http-equiv CDATA #IMPLIED
+ name CDATA #IMPLIED
+ content CDATA #REQUIRED
+ scheme CDATA #IMPLIED
+ >
+
+<!--
+ Relationship values can be used in principle:
+
+ a) for document specific toolbars/menus when used
+ with the link element in document head e.g.
+ start, contents, previous, next, index, end, help
+ b) to link to a separate style sheet (rel="stylesheet")
+ c) to make a link to a script (rel="script")
+ d) by stylesheets to control how collections of
+ html nodes are rendered into printed documents
+ e) to make a link to a printable version of this document
+ e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+ %attrs;
+ charset %Charset; #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ type %ContentType; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ media %MediaDesc; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+ %i18n;
+ type %ContentType; #REQUIRED
+ media %MediaDesc; #IMPLIED
+ title %Text; #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+ charset %Charset; #IMPLIED
+ type %ContentType; #REQUIRED
+ language CDATA #IMPLIED
+ src %URI; #IMPLIED
+ defer (defer) #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Flow;>
+<!ATTLIST noscript
+ %attrs;
+ >
+
+<!--======================= Frames =======================================-->
+
+<!-- inline subwindow -->
+
+<!ELEMENT iframe %Flow;>
+<!ATTLIST iframe
+ %coreattrs;
+ longdesc %URI; #IMPLIED
+ name NMTOKEN #IMPLIED
+ src %URI; #IMPLIED
+ frameborder (1|0) "1"
+ marginwidth %Pixels; #IMPLIED
+ marginheight %Pixels; #IMPLIED
+ scrolling (yes|no|auto) "auto"
+ align %ImgAlign; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ >
+
+<!-- alternate content container for non frame-based rendering -->
+
+<!ELEMENT noframes %Flow;>
+<!ATTLIST noframes
+ %attrs;
+ >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Flow;>
+<!ATTLIST body
+ %attrs;
+ onload %Script; #IMPLIED
+ onunload %Script; #IMPLIED
+ background %URI; #IMPLIED
+ bgcolor %Color; #IMPLIED
+ text %Color; #IMPLIED
+ link %Color; #IMPLIED
+ vlink %Color; #IMPLIED
+ alink %Color; #IMPLIED
+ >
+
+<!ELEMENT div %Flow;> <!-- generic language/style container -->
+<!ATTLIST div
+ %attrs;
+ %TextAlign;
+ >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+ %attrs;
+ %TextAlign;
+ >
+
+<!--=================== Headings =========================================-->
+
+<!--
+ There are six levels of headings from h1 (the most important)
+ to h6 (the least important).
+-->
+
+<!ELEMENT h1 %Inline;>
+<!ATTLIST h1
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+ %attrs;
+ %TextAlign;
+ >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list bullet styles -->
+
+<!ENTITY % ULStyle "(disc|square|circle)">
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+ %attrs;
+ type %ULStyle; #IMPLIED
+ compact (compact) #IMPLIED
+ >
+
+<!-- Ordered list numbering style
+
+ 1 arabic numbers 1, 2, 3, ...
+ a lower alpha a, b, c, ...
+ A upper alpha A, B, C, ...
+ i lower roman i, ii, iii, ...
+ I upper roman I, II, III, ...
+
+ The style is applied to the sequence number which by default
+ is reset to 1 for the first list item in an ordered list.
+-->
+<!ENTITY % OLStyle "CDATA">
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+ %attrs;
+ type %OLStyle; #IMPLIED
+ compact (compact) #IMPLIED
+ start %Number; #IMPLIED
+ >
+
+<!-- single column list (DEPRECATED) -->
+<!ELEMENT menu (li)+>
+<!ATTLIST menu
+ %attrs;
+ compact (compact) #IMPLIED
+ >
+
+<!-- multiple column list (DEPRECATED) -->
+<!ELEMENT dir (li)+>
+<!ATTLIST dir
+ %attrs;
+ compact (compact) #IMPLIED
+ >
+
+<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
+<!ENTITY % LIStyle "CDATA">
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+ %attrs;
+ type %LIStyle; #IMPLIED
+ value %Number; #IMPLIED
+ >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+ %attrs;
+ compact (compact) #IMPLIED
+ >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+ %attrs;
+ >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+ %attrs;
+ >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address %Inline;>
+<!ATTLIST address
+ %attrs;
+ >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+ %attrs;
+ align (left|center|right) #IMPLIED
+ noshade (noshade) #IMPLIED
+ size %Pixels; #IMPLIED
+ width %Length; #IMPLIED
+ >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding
+ "img|object|applet|big|small|sub|sup|font|basefont" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+ %attrs;
+ width %Number; #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Flow;>
+<!ATTLIST blockquote
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!--=================== Text alignment ===================================-->
+
+<!-- center content -->
+<!ELEMENT center %Flow;>
+<!ATTLIST center
+ %attrs;
+ >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+<!--
+ ins/del are allowed in block and inline content, but its
+ inappropriate to include block content within an ins element
+ occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+ %attrs;
+ charset %Charset; #IMPLIED
+ type %ContentType; #IMPLIED
+ name NMTOKEN #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ accesskey %Character; #IMPLIED
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+ %attrs;
+ >
+
+<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+ %coreattrs;
+ %events;
+ lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #REQUIRED
+ >
+
+<!ELEMENT br EMPTY> <!-- forced line break -->
+<!ATTLIST br
+ %coreattrs;
+ clear (left|all|right|none) "none"
+ >
+
+<!ELEMENT em %Inline;> <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;> <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;> <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;> <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;> <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;> <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;> <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;> <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;> <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;> <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;> <!-- inlined quote -->
+<!ATTLIST q
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;> <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;> <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;> <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;> <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;> <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!ELEMENT u %Inline;> <!-- underline -->
+<!ATTLIST u %attrs;>
+
+<!ELEMENT s %Inline;> <!-- strike-through -->
+<!ATTLIST s %attrs;>
+
+<!ELEMENT strike %Inline;> <!-- strike-through -->
+<!ATTLIST strike %attrs;>
+
+<!ELEMENT basefont EMPTY> <!-- base font size -->
+<!ATTLIST basefont
+ id ID #IMPLIED
+ size CDATA #REQUIRED
+ color %Color; #IMPLIED
+ face CDATA #IMPLIED
+ >
+
+<!ELEMENT font %Inline;> <!-- local change to font -->
+<!ATTLIST font
+ %coreattrs;
+ %i18n;
+ size CDATA #IMPLIED
+ color %Color; #IMPLIED
+ face CDATA #IMPLIED
+ >
+
+<!--==================== Object ======================================-->
+<!--
+ object is used to embed objects as part of HTML pages.
+ param elements should precede other content. Parameters
+ can also be expressed as attribute/value pairs on the
+ object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST object
+ %attrs;
+ declare (declare) #IMPLIED
+ classid %URI; #IMPLIED
+ codebase %URI; #IMPLIED
+ data %URI; #IMPLIED
+ type %ContentType; #IMPLIED
+ codetype %ContentType; #IMPLIED
+ archive %UriList; #IMPLIED
+ standby %Text; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ name NMTOKEN #IMPLIED
+ tabindex %Number; #IMPLIED
+ align %ImgAlign; #IMPLIED
+ border %Pixels; #IMPLIED
+ hspace %Pixels; #IMPLIED
+ vspace %Pixels; #IMPLIED
+ >
+
+<!--
+ param is used to supply a named property value.
+ In XML it would seem natural to follow RDF and support an
+ abbreviated syntax where the param elements are replaced
+ by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ id ID #IMPLIED
+ name CDATA #REQUIRED
+ value CDATA #IMPLIED
+ valuetype (data|ref|object) "data"
+ type %ContentType; #IMPLIED
+ >
+
+<!--=================== Java applet ==================================-->
+<!--
+ One of code or object attributes must be present.
+ Place param elements before other content.
+-->
+<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST applet
+ %coreattrs;
+ codebase %URI; #IMPLIED
+ archive CDATA #IMPLIED
+ code CDATA #IMPLIED
+ object CDATA #IMPLIED
+ alt %Text; #IMPLIED
+ name NMTOKEN #IMPLIED
+ width %Length; #REQUIRED
+ height %Length; #REQUIRED
+ align %ImgAlign; #IMPLIED
+ hspace %Pixels; #IMPLIED
+ vspace %Pixels; #IMPLIED
+ >
+
+<!--=================== Images ===========================================-->
+
+<!--
+ To avoid accessibility problems for people who aren't
+ able to see the image, you should provide a text
+ description using the alt and longdesc attributes.
+ In addition, avoid the use of server-side image maps.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+ %attrs;
+ src %URI; #REQUIRED
+ alt %Text; #REQUIRED
+ name NMTOKEN #IMPLIED
+ longdesc %URI; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ ismap (ismap) #IMPLIED
+ align %ImgAlign; #IMPLIED
+ border %Length; #IMPLIED
+ hspace %Pixels; #IMPLIED
+ vspace %Pixels; #IMPLIED
+ >
+
+<!-- usemap points to a map element which may be in this document
+ or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+ separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+ %i18n;
+ %events;
+ id ID #REQUIRED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED
+ name CDATA #IMPLIED
+ >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+ %attrs;
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ href %URI; #IMPLIED
+ nohref (nohref) #IMPLIED
+ alt %Text; #REQUIRED
+ tabindex %Number; #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!--================ Forms ===============================================-->
+
+<!ELEMENT form %form.content;> <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+ %attrs;
+ action %URI; #REQUIRED
+ method (get|post) "get"
+ name NMTOKEN #IMPLIED
+ enctype %ContentType; "application/x-www-form-urlencoded"
+ onsubmit %Script; #IMPLIED
+ onreset %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ accept-charset %Charsets; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!--
+ Each label must not contain more than ONE field
+ Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+ %attrs;
+ for IDREF #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ >
+
+<!ENTITY % InputType
+ "(text | password | checkbox |
+ radio | submit | reset |
+ file | hidden | image | button)"
+ >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY> <!-- form control -->
+<!ATTLIST input
+ %attrs;
+ type %InputType; "text"
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ checked (checked) #IMPLIED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ size CDATA #IMPLIED
+ maxlength %Number; #IMPLIED
+ src %URI; #IMPLIED
+ alt CDATA #IMPLIED
+ usemap %URI; #IMPLIED
+ tabindex %Number; #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ align %ImgAlign; #IMPLIED
+ >
+
+<!ELEMENT select (optgroup|option)+> <!-- option selector -->
+<!ATTLIST select
+ %attrs;
+ name CDATA #IMPLIED
+ size %Number; #IMPLIED
+ multiple (multiple) #IMPLIED
+ disabled (disabled) #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!ELEMENT optgroup (option)+> <!-- option group -->
+<!ATTLIST optgroup
+ %attrs;
+ disabled (disabled) #IMPLIED
+ label %Text; #REQUIRED
+ >
+
+<!ELEMENT option (#PCDATA)> <!-- selectable choice -->
+<!ATTLIST option
+ %attrs;
+ selected (selected) #IMPLIED
+ disabled (disabled) #IMPLIED
+ label %Text; #IMPLIED
+ value CDATA #IMPLIED
+ >
+
+<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field -->
+<!ATTLIST textarea
+ %attrs;
+ name CDATA #IMPLIED
+ rows %Number; #REQUIRED
+ cols %Number; #REQUIRED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ tabindex %Number; #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!--
+ The fieldset element is used to group form fields.
+ Only one legend element should occur in the content
+ and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+ %attrs;
+ >
+
+<!ENTITY % LAlign "(top|bottom|left|right)">
+
+<!ELEMENT legend %Inline;> <!-- fieldset label -->
+<!ATTLIST legend
+ %attrs;
+ accesskey %Character; #IMPLIED
+ align %LAlign; #IMPLIED
+ >
+
+<!--
+ Content is %Flow; excluding a, form, form controls, iframe
+-->
+<!ELEMENT button %button.content;> <!-- push button -->
+<!ATTLIST button
+ %attrs;
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ type (button|submit|reset) "submit"
+ disabled (disabled) #IMPLIED
+ tabindex %Number; #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ >
+
+<!-- single-line text input control (DEPRECATED) -->
+<!ELEMENT isindex EMPTY>
+<!ATTLIST isindex
+ %coreattrs;
+ %i18n;
+ prompt %Text; #IMPLIED
+ >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+ "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+
+<!-- horizontal placement of table relative to document -->
+<!ENTITY % TAlign "(left|center|right)">
+
+<!-- horizontal alignment attributes for cell contents
+
+ char alignment char, e.g. char=':'
+ charoff offset for alignment char
+-->
+<!ENTITY % cellhalign
+ "align (left|center|right|justify|char) #IMPLIED
+ char %Character; #IMPLIED
+ charoff %Length; #IMPLIED"
+ >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+ "valign (top|middle|bottom|baseline) #IMPLIED"
+ >
+
+<!ELEMENT table
+ (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption %Inline;>
+<!ELEMENT thead (tr)+>
+<!ELEMENT tfoot (tr)+>
+<!ELEMENT tbody (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col EMPTY>
+<!ELEMENT tr (th|td)+>
+<!ELEMENT th %Flow;>
+<!ELEMENT td %Flow;>
+
+<!ATTLIST table
+ %attrs;
+ summary %Text; #IMPLIED
+ width %Length; #IMPLIED
+ border %Pixels; #IMPLIED
+ frame %TFrame; #IMPLIED
+ rules %TRules; #IMPLIED
+ cellspacing %Length; #IMPLIED
+ cellpadding %Length; #IMPLIED
+ align %TAlign; #IMPLIED
+ bgcolor %Color; #IMPLIED
+ >
+
+<!ENTITY % CAlign "(top|bottom|left|right)">
+
+<!ATTLIST caption
+ %attrs;
+ align %CAlign; #IMPLIED
+ >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+ width=64 width in screen pixels
+ width=0.5* relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ Use thead to duplicate headers when breaking table
+ across page boundaries, or for static headers when
+ tbody sections are rendered in scrolling panel.
+
+ Use tfoot to duplicate footers when breaking table
+ across page boundaries, or for static footers when
+ tbody sections are rendered in scrolling panel.
+
+ Use multiple tbody sections when rules are needed
+ between groups of table rows.
+-->
+<!ATTLIST thead
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tfoot
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tbody
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tr
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ bgcolor %Color; #IMPLIED
+ >
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ nowrap (nowrap) #IMPLIED
+ bgcolor %Color; #IMPLIED
+ width %Pixels; #IMPLIED
+ height %Pixels; #IMPLIED
+ >
+
+<!ATTLIST td
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ nowrap (nowrap) #IMPLIED
+ bgcolor %Color; #IMPLIED
+ width %Pixels; #IMPLIED
+ height %Pixels; #IMPLIED
+ >
+
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2007-10-04 11:09:50 UTC (rev 3254)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2007-10-04 12:54:41 UTC (rev 3255)
@@ -15,10 +15,8 @@
<f:clientid var="clientId"/>
<table id="#{clientId}"
class="dr-table rich-table #{component.attributes['styleClass']}"
+ x:passThruWithExclusions="value,name,type"
>
- <f:call name="utils.encodePassThruWithExclusions">
- <f:parameter value="value,name,type,id,class" />
- </f:call>
<f:call name="encodeCaption" />
<colgroup span="#{component.attributes['columns']}">
</colgroup>
16 years, 8 months
- 1
- 0