richfaces-svn-commits
June 2007
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 459 discussions
JBoss Rich Faces SVN: r1218 - trunk/richfaces/inputnumber-slider/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-06-19 09:28:46 -0400 (Tue, 19 Jun 2007)
New Revision: 1218
Modified:
trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
Log:
http://jira.jboss.com/jira/browse/RF-248 fixed
Modified: trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
--- trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-06-19 11:16:22 UTC (rev 1217)
+++ trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-06-19 13:28:46 UTC (rev 1218)
@@ -65,7 +65,7 @@
value="#{this:getInputValue(context,component)}"
type="text"
class="dr-insldr-field rich-inslider-field #{component.attributes['inputClass']}"
- style="#{component.attributes['inputStyle']} #{color}"
+ style="#{component.attributes['inputStyle']}; #{color}"
readonly="#{inputReadOnly}"
disabled="#{disabled}"
onselect="#{component.attributes['onselect']}"
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1217 - trunk/sandbox/scrollable-grid/design/funcspec.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-06-19 07:16:22 -0400 (Tue, 19 Jun 2007)
New Revision: 1217
Modified:
trunk/sandbox/scrollable-grid/design/funcspec/FuncSpec - Invision Scrollable Grid Component.doc
Log:
Modified: trunk/sandbox/scrollable-grid/design/funcspec/FuncSpec - Invision Scrollable Grid Component.doc
===================================================================
(Binary files differ)
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1216 - trunk/sandbox/scrollable-grid/design/funcspec.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-06-19 07:13:21 -0400 (Tue, 19 Jun 2007)
New Revision: 1216
Modified:
trunk/sandbox/scrollable-grid/design/funcspec/FuncSpec - Invision Scrollable Grid Component.doc
Log:
Modified: trunk/sandbox/scrollable-grid/design/funcspec/FuncSpec - Invision Scrollable Grid Component.doc
===================================================================
(Binary files differ)
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1215 - trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2007-06-19 02:52:38 -0400 (Tue, 19 Jun 2007)
New Revision: 1215
Modified:
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js
Log:
Fix bug with different header height for frozen and normal pats
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-06-18 22:58:52 UTC (rev 1214)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-06-19 06:52:38 UTC (rev 1215)
@@ -287,11 +287,13 @@
var frozenContentWidth = this.grid.getColumnsFrozenWidth();
this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
- this.contentBox.setHeight(height);
+ this.contentBox.setHeight(height);
this.contentBox.moveTo(frozenContentWidth - this.grid.getScrollOffset(), 0);
+ this.headerRow.setHeight(height);
this.frozenContentBox.setWidth(frozenContentWidth);
this.frozenContentBox.setHeight(height);
this.frozenContentBox.moveTo(0, 0);
+ this.headerFrozenRow.setHeight(height);
if(ClientUILib.isIE)
this.frozenSubstrate.setWidth(frozenContentWidth);
},
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1214 - in trunk: richfaces/common/src/main/java/org/richfaces/renderkit and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-06-18 18:58:52 -0400 (Mon, 18 Jun 2007)
New Revision: 1214
Added:
trunk/richfaces/common/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/json/JSContentHandler.java
trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateUtil.java
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
trunk/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp
trunk/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
- TemplateUtil updated for new macrodefs grammar
- DragIndicatorRendererBase updated for new TemplateUtil API compliance
- Fixed some issues in JSContentHandler & json-dom.js - still plenty of work
- CalendarRendererBase updated for new TemplateUtil API compliance
Modified: trunk/richfaces/common/src/main/java/org/richfaces/json/JSContentHandler.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/json/JSContentHandler.java 2007-06-18 18:11:04 UTC (rev 1213)
+++ trunk/richfaces/common/src/main/java/org/richfaces/json/JSContentHandler.java 2007-06-18 22:58:52 UTC (rev 1214)
@@ -1,6 +1,28 @@
+/**
+ * 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.json;
import java.io.IOException;
+import java.io.StringWriter;
import java.io.Writer;
import java.util.Arrays;
@@ -47,9 +69,9 @@
private static final char S_ELEMENT_END[] = "])".toCharArray();
- private static final char S_TEXT_START[] = "new T('".toCharArray();
+ private static final char S_TEXT_START[] = "new T(".toCharArray();
- private static final char S_TEXT_END[] = "')".toCharArray();
+ private static final char S_TEXT_END[] = ")".toCharArray();
private static final char S_CDATA_START[] = "new D('".toCharArray();
@@ -124,7 +146,7 @@
if (this.beforeDocumentStart || level < 0)
return;
try {
- if (!this.closeElement(false) && this.processing_cdata == false) {
+ if (level != 0 && !this.closeElement(false) && this.processing_cdata == false) {
this.outputWriter.write(C_COMMA);
}
if (DEBUG) {
@@ -135,7 +157,7 @@
if (this.processing_cdata == false) {
this.outputWriter.write(S_TEXT_START);
}
- this.encode(ch, start, length);
+ this.encodeText(ch, start, length);
if (this.processing_cdata == false) {
this.outputWriter.write(S_TEXT_END);
}
@@ -196,9 +218,6 @@
* further <code></element></code> is required.
*/
protected boolean closeElement(boolean end_element) throws SAXException {
- if (!end_element && level == 0)
- return true;
-
if (!hanging_element)
return (false);
try {
@@ -380,6 +399,7 @@
this.outputWriter.write(attrName);
this.outputWriter.write(C_QUOTE); // [']
this.outputWriter.write(C_NSSEP); // [:]
+ //TODO by nick - fix namespace handling - they shouldn't be encoded
this.encodeAttributeValue(attributes, x);
}
@@ -394,12 +414,15 @@
}
protected void encodeAttributeValue(Attributes attributes, int idx) throws SAXException, IOException {
- //TODO by nick - fix namespace handling
this.outputWriter.write(C_QUOTE); // [']
this.encode(attributes.getValue(idx));
this.outputWriter.write(C_QUOTE); // [']
}
+ protected void encodeText(char[] chars, int start, int length) throws SAXException, IOException {
+ this.encode(chars, start, length);
+ }
+
/* (non-Javadoc)
* @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
*/
@@ -415,7 +438,7 @@
if (this.beforeDocumentStart || level < 0)
return;
try {
- if (!this.closeElement(false)) {
+ if (!this.closeElement(false) && level != 0) {
this.outputWriter.write(C_COMMA);
}
if (DEBUG) {
@@ -476,7 +499,7 @@
if (this.beforeDocumentStart || level < 0)
return;
try {
- if (!this.closeElement(false)) {
+ if (!this.closeElement(false) && level != 0) {
this.outputWriter.write(C_COMMA);
}
if (DEBUG) {
@@ -580,4 +603,7 @@
}
}
+ protected boolean isProcessingCdata() {
+ return processing_cdata;
+ }
}
Modified: trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateUtil.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateUtil.java 2007-06-18 18:11:04 UTC (rev 1213)
+++ trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateUtil.java 2007-06-18 22:58:52 UTC (rev 1214)
@@ -21,8 +21,7 @@
package org.richfaces.renderkit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.io.IOException;
import org.richfaces.org.apache.commons.lang.StringEscapeUtils;
@@ -36,36 +35,133 @@
public static interface MacroTemplateHandler {
public String handle(String body);
};
+
+ private StringBuffer definitionBuffer = new StringBuffer();
+ private StringBuffer result = new StringBuffer();
+
+ private int macroDefDepth = 0;
+ private boolean escapeCharOccured = false;
+ private MacroTemplateHandler templateHandler;
+ private boolean macroDefined = false;
- private final static Pattern PARAMETER_REPLACER_PATTERN = Pattern.compile("(\\\\)?\\{([^\\}]+)\\}");
-
- public static String replaceParams(String string, MacroTemplateHandler handler) {
- Matcher m = PARAMETER_REPLACER_PATTERN.matcher(string);
- StringBuffer sb = new StringBuffer("\"");
-
- int lastPosition = 0;
-
- while (m.find()) {
- String firstGroup = m.group(1);
- if (firstGroup == null || firstGroup.length() == 0) {
- sb.append(StringEscapeUtils.escapeJavaScript(string.substring(lastPosition, m.start(2) - 1)));
- sb.append("\" + " + handler.handle(m.group(2)) + " + \"");
+ public TemplateUtil(MacroTemplateHandler templateHandler) {
+ super();
+ this.templateHandler = templateHandler;
+ }
+
+ private Boolean literalMode = null;
+
+ private void doWriteChar(char c) throws IOException {
+ if (macroDefDepth == 0) {
+ if (literalMode == null) {
+ result.append('\'');
+ literalMode = Boolean.TRUE;
+ } else if (Boolean.FALSE.equals(literalMode)) {
+ result.append(" + \'");
+ literalMode = Boolean.TRUE;
+ }
+
+ if (escapeCharOccured) {
+ result.append("\\\\");
+ }
+
+ result.append(StringEscapeUtils.escapeJavaScript(String.valueOf(c)));
+ } else {
+ if (escapeCharOccured) {
+ definitionBuffer.append('\\');
+ }
+
+ definitionBuffer.append(c);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see java.io.Writer#write(char[], int, int)
+ */
+ public TemplateUtil append(String string) throws IOException {
+ char[] cbuf = string.toCharArray();
+ for (int i = 0; i < cbuf.length; i++) {
+ char c = cbuf[i];
+
+ if (c == '{') {
+ if (escapeCharOccured) {
+ escapeCharOccured = false;
+ doWriteChar(c);
+ } else {
+ if (macroDefDepth++ != 0) {
+ doWriteChar(c);
+ }
+ }
+ } else if (c == '}') {
+ if (escapeCharOccured) {
+ if (macroDefDepth == 0) {
+ doWriteChar(c);
+ escapeCharOccured = false;
+ } else {
+ escapeCharOccured = false;
+ doWriteChar(c);
+ }
+ } else {
+ if (macroDefDepth > 0 && --macroDefDepth == 0) {
+ if (Boolean.TRUE.equals(literalMode)) {
+ result.append('\'');
+ }
+
+ if (literalMode != null) {
+ result.append(" + ");
+ }
+
+ literalMode = Boolean.FALSE;
+
+ macroDefined = true;
+ result.append(templateHandler.handle(definitionBuffer.toString()));
+ definitionBuffer = new StringBuffer();
+ } else {
+ doWriteChar(c);
+ }
+ }
} else {
- StringBuffer sbUnEsc = new StringBuffer();
- sbUnEsc.append(string.substring(lastPosition, m.end(1) - 1));
- sbUnEsc.append("{");
- sbUnEsc.append(m.group(2));
- sbUnEsc.append("}");
+ if (c == '\\') {
+ if (escapeCharOccured) {
+ escapeCharOccured = false;
+ doWriteChar(c);
+ }
- sb.append(StringEscapeUtils.escapeJavaScript(sbUnEsc.toString()));
+ escapeCharOccured = true;
+ } else {
+ doWriteChar(c);
+ escapeCharOccured = false;
+ }
}
+ }
+
+ return this;
+ }
- lastPosition = m.end(2) + 1;
+ public String getResult() throws IOException {
+ boolean tmpEscapeCharOccured = escapeCharOccured;
+ escapeCharOccured = false;
+
+ if (macroDefDepth > 0) {
+ macroDefDepth = 0;
+ doWriteChar('{');
+ result.append(StringEscapeUtils.escapeJavaScript(definitionBuffer.toString()));
}
- if (lastPosition < string.length()) {
- sb.append(StringEscapeUtils.escapeJavaScript(string.substring(lastPosition)));
+
+ if (tmpEscapeCharOccured) {
+ doWriteChar('\\');
}
- sb.append("\"");
- return sb.toString();
+
+ if (Boolean.TRUE.equals(literalMode)) {
+ result.append('\'');
+ }
+
+ literalMode = null;
+
+ return result.toString();
}
+
+ public boolean isMacroDefined() {
+ return macroDefined;
+ }
}
Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
===================================================================
--- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-06-18 18:11:04 UTC (rev 1213)
+++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-06-18 22:58:52 UTC (rev 1214)
@@ -170,7 +170,16 @@
T.prototype = new JSNode();
T.prototype.getOuterHTML = function(context){
- return this.xmlescape(this.value);
+ var value = this.value;
+ if (typeof value == "function") {
+ value = value(context);
+ }
+
+ if (value) {
+ return this.xmlescape(value);
+ }
+
+ return "";
}
// Comment node
Added: trunk/richfaces/common/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java
===================================================================
--- trunk/richfaces/common/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java (rev 0)
+++ trunk/richfaces/common/src/test/java/org/richfaces/renderkit/TemplateUtilTest.java 2007-06-18 22:58:52 UTC (rev 1214)
@@ -0,0 +1,82 @@
+/**
+ * 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.renderkit;
+
+import java.io.IOException;
+
+import org.richfaces.renderkit.TemplateUtil.MacroTemplateHandler;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Nick Belaevski - mailto:nbelaevski@exadel.com
+ * created 17.06.2007
+ *
+ */
+public class TemplateUtilTest extends TestCase {
+
+ private static class MacroTemplateHandlerImpl implements MacroTemplateHandler {
+ private boolean handled = false;
+
+ public String handle(String body) {
+ handled = true;
+ return "#" + body + "#";
+ }
+
+ public boolean isHandled() {
+ return handled;
+ }
+ };
+
+ private String doWrite(String in) throws IOException {
+ MacroTemplateHandlerImpl templateHandlerImpl = new MacroTemplateHandlerImpl();
+ TemplateUtil testWriter = new TemplateUtil(templateHandlerImpl);
+ testWriter.append(in);
+ String result = testWriter.getResult();
+ return result;
+ }
+
+ public void testWriting() throws Exception {
+ String[][] testStrings = new String[][] {
+ {"\"a\" + #bcd# + \"e\"", "a{bcd}e"},
+ {"\"a{bcd}e\"", "a\\{bcd}e"},
+ {"\"a\\\\{bcd}e\"", "a\\\\{bcd}e"},
+ {"\"a{bc}d\"", "a{bc\\}d"},
+ {"\"a\" + #bc\\d# + \"e\"", "a{bc\\d}e"},
+ {"\"a\" + #bc\\\\d# + \"e\"", "a{bc\\\\d}e"},
+ {"\"a{bc\\\\}d\"", "a{bc\\\\}d"},
+ {"#ab}# + \"c\"", "{ab\\}}c"},
+ {"\"a\" + #{bc#", "a{\\{bc}"},
+ {"#{aa}#", "{{aa}}"},
+ {"\"aa\\\\}\"", "aa\\}"},
+ {"\"{aa\\\\\"", "{aa\\"}
+ };
+
+ for (int i = 0; i < testStrings.length; i++) {
+ String[] strings = testStrings[i];
+
+ String written = doWrite(strings[1]);
+ System.out.println(strings[0] + " : " + strings[1] + " : " + written);
+ assertEquals(strings[0], written);
+ }
+ }
+}
Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
===================================================================
--- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-06-18 18:11:04 UTC (rev 1213)
+++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-06-18 22:58:52 UTC (rev 1214)
@@ -187,7 +187,9 @@
responseWriter.write("elt.indicatorTemplates['" + facetName + "'] = function(element, jsParams) {\n");
responseWriter.write("var content = ");
- String result = TemplateUtil.replaceParams(dumpWriter.getBuffer().toString(), macroTemplateHandler);
+ TemplateUtil templateUtil = new TemplateUtil(macroTemplateHandler);
+ templateUtil.append(dumpWriter.getBuffer().toString());
+ String result = templateUtil.getResult();
responseWriter.write(result + ";\n new Insertion.Top(element, content);\n");
responseWriter.write("};");
}
Modified: trunk/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-06-18 18:11:04 UTC (rev 1213)
+++ trunk/sandbox/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-06-18 22:58:52 UTC (rev 1214)
@@ -37,7 +37,6 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.stream.StreamSource;
import org.ajax4jsf.framework.ajax.xmlfilter.tidy.TidyParser;
import org.ajax4jsf.framework.ajax.xmlfilter.tidy.TidyXMLFilter;
@@ -128,7 +127,12 @@
writer.write("var evaluator = new Object(); evaluator.parts = [ ");
try {
- Transformer transformer = transformerFactory.newTransformer();
+ Transformer transformer;
+
+ synchronized (transformerFactory) {
+ transformer = transformerFactory.newTransformer();
+ }
+
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
transformer.setOutputProperty(OutputKeys.METHOD, "xml");
@@ -137,8 +141,36 @@
int idx) throws SAXException, IOException {
String value = attributes.getValue(idx);
- outputWriter.write("function (context) { return " + TemplateUtil.replaceParams(value, macroTemplateHandler) + ";}");
+ TemplateUtil templateUtil = new TemplateUtil(macroTemplateHandler);
+ templateUtil.append(value);
+ if (templateUtil.isMacroDefined()) {
+ outputWriter.write("function (context) { return " + templateUtil.getResult() + ";}");
+ } else {
+ outputWriter.write(templateUtil.getResult());
+ }
}
+
+ protected void encodeText(char[] chars, int start, int length)
+ throws SAXException, IOException {
+ if (!isProcessingCdata()) {
+ String str = new String(chars, start, length);
+ TemplateUtil templateUtil = new TemplateUtil(macroTemplateHandler);
+ try {
+ templateUtil.append(str);
+ if (templateUtil.isMacroDefined()) {
+ str = "function (context) { return " + templateUtil.getResult() + ";}";
+ } else {
+ str = templateUtil.getResult();
+ }
+
+ outputWriter.write(str);
+ } catch (IOException e) {
+ throw new SAXException(e.getMessage(), e);
+ }
+ } else {
+ super.encodeText(chars, start, length);
+ }
+ }
};
Result result = new SAXResult(contentHandler);
Modified: trunk/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp 2007-06-18 18:11:04 UTC (rev 1213)
+++ trunk/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp 2007-06-18 22:58:52 UTC (rev 1214)
@@ -21,7 +21,7 @@
<f:verbatim><h3>Templating test</h3></f:verbatim>
<calendar:calendar>
- <f:verbatim><input type="text" value="$ {test} $" /></f:verbatim>
+ <f:verbatim><input type="text" value="$ {test} $" /><![CDATA[a<b]]>{test}</f:verbatim>
<f:verbatim><input type="radio" checked="{test}" /><input type="radio" checked="{test1}" /></f:verbatim>
</calendar:calendar>
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1213 - in trunk/richfaces: datascroller/src/main/config/component and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-06-18 14:11:04 -0400 (Mon, 18 Jun 2007)
New Revision: 1213
Modified:
trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
trunk/richfaces/datascroller/src/main/config/component/datascroller.xml
trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml
trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml
trunk/richfaces/gmap/src/main/config/component/gmap.xml
trunk/richfaces/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml
trunk/richfaces/modal-panel/src/main/config/component/modalPanel.xml
trunk/richfaces/separator/src/main/config/component/separator.xml
Log:
fixed spelling errors
Modified: trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
===================================================================
--- trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -154,7 +154,7 @@
<name>sliderListener</name>
<classname>javax.faces.el.MethodBinding</classname>
<description>
- MethodBinding representing an action listener method that will be notified afrer changing of slider control position
+ MethodBinding representing an action listener method that will be notified after changing of slider control position
</description>
</property>
<property>
Modified: trunk/richfaces/datascroller/src/main/config/component/datascroller.xml
===================================================================
--- trunk/richfaces/datascroller/src/main/config/component/datascroller.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/datascroller/src/main/config/component/datascroller.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -80,7 +80,7 @@
<property>
<name>scrollerListener</name>
<classname>javax.faces.el.MethodBinding</classname>
- <description>MethodBinding representing an action listener method that will be notified afrer scrolling
+ <description>MethodBinding representing an action listener method that will be notified after scrolling
</description>
</property>
@@ -207,11 +207,11 @@
</description>
<defaultvalue>true</defaultvalue>
</property>
- <property>
- <name>align</name>
- <classname>java.lang.String</classname>
+ <property>
+ <name>align</name>
+ <classname>java.lang.String</classname>
<description>
- left|center|right [CI] Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: * left: The table is to the left of the document. * center: The table is to the center of the document. * right: The table is to the right of the document
+ left|center|right [CI] Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: * left: The table is to the left of the document. * center: The table is to the center of the document. * right: The table is to the right of the document
</description>
<defaultvalue>"center"</defaultvalue>
</property>
Modified: trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml
===================================================================
--- trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -44,8 +44,8 @@
<name>dragListener</name>
<classname>javax.faces.el.MethodBinding</classname>
<description>
- MethodBinding representing an action listener method that will be notified afrer drag operation
- </description>
+ MethodBinding representing an action listener method that will be notified after drag operation
+ </description>
<methodargs>org.ajax4jsf.dnd.event.DragEvent.class</methodargs>
</property>
<property>
Modified: trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml
===================================================================
--- trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -36,10 +36,10 @@
<name>dropListener</name>
<classname>javax.faces.el.MethodBinding</classname>
<description><![CDATA[
- MethodBinding representing an action listener method that will be notified afrer drop operation.
+ MethodBinding representing an action listener method that will be notified after drop operation.
]]>
</description>
- <methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs>
+ <methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs>
</property>
<property>
<name>disableDefault</name>
Modified: trunk/richfaces/gmap/src/main/config/component/gmap.xml
===================================================================
--- trunk/richfaces/gmap/src/main/config/component/gmap.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/gmap/src/main/config/component/gmap.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -39,7 +39,7 @@
<name>oninit</name>
<classname>java.lang.String</classname>
<description>
- Javascript code invoked just after the Google Map object is initiated.
+ JavaScript code invoked just after the Google Map object is initiated.
</description>
<defaultvalue>""</defaultvalue>
</property>
Modified: trunk/richfaces/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml
===================================================================
--- trunk/richfaces/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -122,7 +122,7 @@
<property>
<name>inputSize</name>
<classname>int</classname>
- <description>Attribute specifies the intial length of input in characters. Default value is 10</description>
+ <description>Attribute specifies the initial length of input in characters. Default value is 10</description>
<defaultvalue>10</defaultvalue>
</property>
<property>
Modified: trunk/richfaces/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/richfaces/modal-panel/src/main/config/component/modalPanel.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/modal-panel/src/main/config/component/modalPanel.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -111,7 +111,7 @@
<name>resizeable</name>
<classname>boolean</classname>
<description>
- if "true" there is possibily to change component size
+ if "true" there is possibility to change component size
</description>
<defaultvalue>true</defaultvalue>
</property>
@@ -119,7 +119,7 @@
<name>moveable</name>
<classname>boolean</classname>
<description>
- if "true" there is possibily to move component
+ if "true" there is possibility to move component
</description>
<defaultvalue>true</defaultvalue>
</property>
@@ -132,23 +132,23 @@
</description>
<defaultvalue>100</defaultvalue>
</property>
-
- <property>
- <name>shadowOpacity</name>
- <classname>java.lang.String</classname>
- <description>
- HTML CSS class attribute of element for pop-up
- suggestion content
- </description>
- </property>
-
- <property>
- <name>shadowDepth</name>
- <classname>java.lang.String</classname>
- <description>
- Pop-up shadow depth for suggestion content
- </description>
- </property>
+
+ <property>
+ <name>shadowOpacity</name>
+ <classname>java.lang.String</classname>
+ <description>
+ HTML CSS class attribute of element for pop-up
+ suggestion content
+ </description>
+ </property>
+
+ <property>
+ <name>shadowDepth</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Pop-up shadow depth for suggestion content
+ </description>
+ </property>
<property>
<name>onshow</name>
Modified: trunk/richfaces/separator/src/main/config/component/separator.xml
===================================================================
--- trunk/richfaces/separator/src/main/config/component/separator.xml 2007-06-18 16:32:29 UTC (rev 1212)
+++ trunk/richfaces/separator/src/main/config/component/separator.xml 2007-06-18 18:11:04 UTC (rev 1213)
@@ -50,7 +50,7 @@
<name>lineType</name>
<classname>java.lang.String</classname>
<description>A line type. The possible values are
- bevieled (default), dotted, dashed, double and solid
+ beveled (default), dotted, dashed, double and solid
</description>
<defaultvalue>"beveled"</defaultvalue>
</property>
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1212 - in trunk/sandbox/scrollable-grid/src/main: javascript/ClientUI/controls/grid and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-06-18 12:32:29 -0400 (Mon, 18 Jun 2007)
New Revision: 1212
Modified:
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js
trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
Log:
RF-289
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-18 15:56:29 UTC (rev 1211)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-18 16:32:29 UTC (rev 1212)
@@ -213,6 +213,11 @@
}
ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state);
+ if(!state.isFrozenPart()){
+ writer.startElement("td", grid);
+ getUtils().writeAttribute(writer, "class","ClientUI_Grid_BR");
+ writer.endElement("td");
+ }
writer.endElement(HTML.TR_ELEMENT);
state.nextRow();
state.setCellIndex(0);
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-06-18 15:56:29 UTC (rev 1211)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-06-18 16:32:29 UTC (rev 1212)
@@ -66,21 +66,21 @@
var grid = this;
var layout = new ClientUI.layouts.GridLayoutManager(null, this.getElement());
this.layout = layout;
-
- this.templates.each(function(item) {
+ var header, body, footer;
+ this.templates.unbreakableEach(function(item) {
switch(item.pane) {
case GridLayout_Enum.HEADER: {
- var header = new ClientUI.controls.grid.GridHeader($(item.ref), grid);
+ header = new ClientUI.controls.grid.GridHeader($(item.ref), grid);
layout.addPane(GridLayout_Enum.HEADER, header);
break;
}
case GridLayout_Enum.BODY: {
- var body = new ClientUI.controls.grid.GridBody($(item.ref), grid);
+ body = new ClientUI.controls.grid.GridBody($(item.ref), grid);
layout.addPane(GridLayout_Enum.BODY, body);
break;
}
case GridLayout_Enum.FOOTER: {
- var footer = new ClientUI.controls.grid.GridFooter($(item.ref), grid);
+ footer = new ClientUI.controls.grid.GridFooter($(item.ref), grid);
layout.addPane(GridLayout_Enum.FOOTER, footer);
break;
}
@@ -90,6 +90,9 @@
this.currentScrollPos = 0;
this.controlCreated = true;
this.updateLayout();
+ header.setFakeColumnWidth();
+ body.setFakeColumnWidth();
+ footer.setFakeColumnWidth();
},
updateLayout: function() {
if(!this.controlCreated || this.getHeight()==0) {
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-06-18 15:56:29 UTC (rev 1211)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-06-18 16:32:29 UTC (rev 1212)
@@ -166,7 +166,9 @@
for(var i=0; i<count; i++) {
cash.setRow(i, {f: frows[i].innerHTML, n: nrows[i].innerHTML});
}*/
-
+ var gridId = this.grid.getElement().id;
+ this.fTable = $(gridId + ":f")
+ this.nTable = $(gridId + ":n")
this.controlCreated = true;
},
parseTemplate: function(templFrozen, templNormal) {
@@ -351,7 +353,19 @@
adjustColumnWidth: function(column, width) {
var columns = this.grid.getHeader().getColumns();
columns[column].bodyCol.width = width;
+ this.setFakeColumnWidth();
},
+
+ setFakeColumnWidth: function() {
+ var columns = this.grid.getHeader().getColumns();
+ columns.last().bodyCol.width = 1;
+ var width = this.grid.getElement().offsetWidth - this.fTable.offsetWidth - this.nTable.offsetWidth;
+ if (width < 1) {
+ width = 1;
+ }
+ columns.last().bodyCol.width = width;
+ },
+
startLoadData: function() {
if(this.updateStarted) {
this._setPendingTask(this._getPendingTask());
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2007-06-18 15:56:29 UTC (rev 1211)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2007-06-18 16:32:29 UTC (rev 1212)
@@ -167,5 +167,16 @@
adjustColumnWidth: function(column, width) {
var columns = this.grid.getHeader().getColumns();
columns[column].footerCol.width = width;
+ this.setFakeColumnWidth();
+ },
+
+ setFakeColumnWidth: function() {
+ var columns = this.grid.getHeader().getColumns();
+ columns.last().footerCol.width = 1;
+ var width = this.grid.getElement().offsetWidth - this.headerRow.getElement().offsetWidth;
+ if (width < 1) {
+ width = 1;
+ }
+ columns.last().footerCol.width = width;
}
});
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-06-18 15:56:29 UTC (rev 1211)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-06-18 16:32:29 UTC (rev 1212)
@@ -196,7 +196,6 @@
i++;j++;
});
- columns.pop(); // remove last fake column
this._columns = columns;
this.defaultHeight = defaultHeight;
this.defaultWidth = defaultWidth;
@@ -234,7 +233,8 @@
agjustSeparators: function() {
var offset = 0;
var fcnt = this.headerFrozenRow.getElement().rows[0].cells.length;
- for(var i=0; i<this._columns.length; i++) {
+ var length = this._columns.length - 1;
+ for(var i=0; i<length; i++) {
if(i == fcnt) offset = 0;
offset += this._columns[i].width;
this._columns[i].sep.moveToX(offset - 4);
@@ -414,5 +414,15 @@
this._columns[column].col.width = width;
this._columns[column].width = width;
this.agjustSeparators();
+ this.setFakeColumnWidth();
+ },
+
+ setFakeColumnWidth: function() {
+ this._columns.last().col.width = 1;
+ var width = this.grid.getElement().offsetWidth - this.headerRow.getElement().offsetWidth;
+ if (width < 1) {
+ width = 1;
+ }
+ this._columns.last().col.width = width;
}
});
Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-06-18 15:56:29 UTC (rev 1211)
+++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-06-18 16:32:29 UTC (rev 1212)
@@ -60,7 +60,7 @@
renderCols(context, component, false);
]]>
</jsp:scriptlet>
- <col width="100px" />
+ <col width="1"/>
<tbody>
<tr class="ClientUI_Grid_HR">
<jsp:scriptlet>
@@ -68,7 +68,7 @@
renderHeaders(context, component, false);
]]>
</jsp:scriptlet>
- <td style="width: 100px"></td>
+ <td></td>
</tr>
</tbody>
</table>
@@ -86,7 +86,6 @@
renderCols(context, component, true);
]]>
</jsp:scriptlet>
-
<tbody>
<jsp:scriptlet>
<![CDATA[
@@ -104,7 +103,7 @@
renderCols(context, component, false);
]]>
</jsp:scriptlet>
-
+ <col width="1"/>
<tbody>
<jsp:scriptlet>
<![CDATA[
@@ -127,7 +126,6 @@
renderCols(context, component, true);
]]>
</jsp:scriptlet>
-
<tbody>
<tr class="ClientUI_Grid_FR">
<jsp:scriptlet>
@@ -148,7 +146,7 @@
renderCols(context, component, false);
]]>
</jsp:scriptlet>
-
+ <col width="1"/>
<tbody>
<tr class="ClientUI_Grid_FR">
<jsp:scriptlet>
@@ -156,6 +154,7 @@
renderFooters(context, component,false);
]]>
</jsp:scriptlet>
+ <td></td>
</tr>
</tbody>
</table>
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1211 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-06-18 11:56:29 -0400 (Mon, 18 Jun 2007)
New Revision: 1211
Modified:
trunk/docs/userguide/en/src/main/docbook/included/column.xml
trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
trunk/docs/userguide/en/src/main/docbook/included/dataList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml
trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
trunk/docs/userguide/en/src/main/docbook/included/panel.xml
trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml
trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml
trunk/docs/userguide/en/src/main/docbook/included/separator.xml
trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
trunk/docs/userguide/en/src/main/docbook/included/tab.xml
trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml
trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/tree.xml
trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml
Log:
fixed spelling errors
Modified: trunk/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/column.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/column.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -164,7 +164,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -172,7 +172,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the column to your page stylesheets</listitem>
+ role="italic"><property>style classes</property></emphasis> used by the column to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -149,7 +149,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -157,7 +157,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the columnGroup to your page stylesheets</listitem>
+ role="italic"><property>style classes</property></emphasis> used by the columnGroup to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -88,7 +88,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -96,7 +96,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the dataDefinitionList to your page stylesheets</listitem>
+ role="italic"><property>style classes</property></emphasis> used by the dataDefinitionList to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -20,7 +20,7 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Filter any UIData based component in dependency on its childs values</listitem>
+ <listitem>Filter any UIData based component in dependency on its child's values</listitem>
<listitem>Fully skinnable control and input elements</listitem>
<listitem>Optional value text field with an attribute-managed position</listitem>
<listitem>Optional disablement of the component on the page</listitem>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -92,7 +92,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -100,7 +100,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the dataGrid to your page stylesheets</listitem>
+ role="italic"><property>style classes</property></emphasis> used by the dataGrid to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -71,7 +71,7 @@
element</listitem>
<listitem>Binding to scrolling components of list pages</listitem>
</itemizedlist>
- <para>The componet has the <emphasis role="italic"><property>"type"</property></emphasis> attribute corresponding to the ul HTML element.</para>
+ <para>The component has the <emphasis role="italic"><property>"type"</property></emphasis> attribute corresponding to the "ul" HTML element.</para>
<para>The component is created basing on the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component and as a result the component could
be partially updated with AJAX.</para>
<programlisting role="XML"><![CDATA[...
@@ -88,7 +88,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -96,7 +96,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the dataList to your page stylesheets</listitem>
+ role="italic"><property>style classes</property></emphasis> used by the dataList to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -65,12 +65,12 @@
<para>The component takes a list from a model and outputs it as an ordered list. The component also has
similar to ordinary UIData components output ways:</para>
<itemizedlist>
-<listitem>A heeader and footer output</listitem>
+<listitem>Header and footer output</listitem>
<listitem>Limitation of the output elements (the <emphasis role="italic"><property>"elements"</property></emphasis> attribute) and definition of the first
element</listitem>
<listitem>Binding to scrolling components of list pages</listitem>
</itemizedlist>
- <para>The componet has the <emphasis role="italic"><property>"type"</property></emphasis> attribute corresponding to the ul HTML element.</para>
+ <para>The component has the <emphasis role="italic"><property>"type"</property></emphasis> attribute corresponding to the "ul" HTML element.</para>
<para>The component is created basing on the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component and as a result the component could
be partially updated with AJAX.</para>
<programlisting role="XML"><![CDATA[...
@@ -87,7 +87,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -95,7 +95,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the dataOrderedList to your page stylesheets</listitem>
+ role="italic"><property>style classes</property></emphasis> used by the dataOrderedList to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -66,7 +66,7 @@
<para>The <property>table</property> component is very similar to the custom JSF dataTable one, except for the common
peculiarities of any rich component:</para>
<itemizedlist>
- <listitem>Skin support. The <property>table</property> completely meets a three-class principle of Rich Faces skinability</listitem>
+ <listitem>Skin support. The <property>table</property> completely meets a three-class principle of Rich Faces skinnability</listitem>
<listitem>Support of AJAX updates for a limited set of strings</listitem>
</itemizedlist>
<para>Skins support is described in the <link linkend="ArchitectureOverview">corresponding section</link>.
@@ -93,7 +93,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -101,7 +101,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the dataTable to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the dataTable to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
@@ -140,7 +140,7 @@
</row>
<row>
<entry>rich-table-headercell</entry>
- <entry>Applied to a partiular cell of a header "header"</entry>
+ <entry>Applied to a particular cell of a header "header"</entry>
</row>
<row>
<entry>rich-table-subheader</entry>
@@ -148,11 +148,11 @@
</row>
<row>
<entry>rich-table-subheadercell</entry>
- <entry>Applied to a partiular cell of subheader "header"</entry>
+ <entry>Applied to a particular cell of subheader "header"</entry>
</row>
<row>
<entry>rich-table-cell</entry>
- <entry> Applied to a partiular table cell</entry>
+ <entry> Applied to a particular table cell</entry>
</row>
<row>
<entry>rich-table-row</entry>
@@ -164,7 +164,7 @@
</row>
<row>
<entry>rich-table-subfootercell</entry>
- <entry>Applied to a partiular subheader "footer"</entry>
+ <entry>Applied to a particular subheader "footer"</entry>
</row>
<row>
<entry>rich-table-footer</entry>
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -112,7 +112,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property>.</emphasis></para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -120,13 +120,13 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the dataScroller to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the dataScroller to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
<title>Skin parameters redefinition</title>
<table>
- <title>Skin Params for the wrapper element</title>
+ <title>Skin Parameters for the rapper element</title>
<tgroup cols="2">
<thead>
<row>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -105,7 +105,7 @@
<para>Here <property>dndParam</property> defines an icon that is used by
an indicator when a drag is on the place of a default icon (e.g. a
- minimized image of a dragable element)</para>
+ minimized image of a draggable element)</para>
<itemizedlist>
<listitem>Parameters passing for an indicator informational part during
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -246,7 +246,7 @@
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation, the components use a style class
+ <para>For skinnability implementation, the components use a style class
redefinition method. Default style classes are mapped on skin
parameters.</para>
@@ -259,7 +259,7 @@
</listitem>
<listitem>
- <para>Add to a user's stylesheets style classes used by a
+ <para>Add to a user's style sheets style classes used by a
dropDownMenu</para>
</listitem>
</itemizedlist>
Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -7,7 +7,7 @@
</sectioninfo>
<section>
<title>Description</title>
- <para>Component that presents the google <property>map</property> in the JSF applications.</para>
+ <para>Component that presents the Google <property>map</property> in the JSF applications.</para>
<figure>
<title>Gmap component</title>
<mediaobject>
@@ -20,7 +20,7 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Presents all the google <property>map</property> functional</listitem>
+ <listitem>Presents all the Google <property>map</property> functional</listitem>
<listitem>Highly customizable via attributes</listitem>
<listitem>No developers JavaScript writing needed to use on the pages</listitem>
</itemizedlist>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -131,7 +131,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -139,7 +139,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the inputNumberSlider to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the inputNumberSlider to your page style sheets</listitem>
</itemizedlist>
<table>
<title>Skin parameters redefinition:</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -12,7 +12,7 @@
keyboard input in a field is possible if it isn't locked by the
<emphasis role="italic"><property>"manualInput"</property></emphasis>
attribute. When arrow
- controls are pressed, the cursor can be moved in any way without loosing a dragged state.</para>
+ controls are pressed, the cursor can be moved in any way without losing a dragged state.</para>
<figure>
<title>InputNumberSpinner component</title>
<mediaobject>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -122,7 +122,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -130,7 +130,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the inputNumberSpinner to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the inputNumberSpinner to your page style sheets</listitem>
</itemizedlist>
<table>
<title>Skin parameters redefinition:</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -120,14 +120,14 @@
<section>
<title>Look-and-Feel Customization</title>
<para>
- For skinability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
+ For skinnability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
</para>
<para>
There are two ways to redefine the appearance of all menuGroups at once:
</para>
<itemizedlist>
<listitem><para>Redefine corresponding skin parameters</para></listitem>
- <listitem><para>Add to user's stylesheet style classes used by a menuGroup</para></listitem>
+ <listitem><para>Add to user's styles heet style classes used by a menuGroup</para></listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -141,14 +141,14 @@
<section>
<title> Look-and-Feel Customization</title>
<para>
- For skinability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
+ For skinnability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
</para>
<para>
There are two ways to redefine the appearance of all menuItems at once:
</para>
<itemizedlist>
<listitem><para>Redefine the corresponding skin parameters</para></listitem>
- <listitem><para>Add to user's stylesheets style classes used by a menuItem</para></listitem>
+ <listitem><para>Add to user's style sheets style classes used by a menuItem</para></listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -63,14 +63,14 @@
<section>
<title>Look-and-Feel Customization</title>
<para>
- For skinability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
+ For skinnability implementation, the components use a style class redefinition method. Default style classes are mapped on skin parameters.
</para>
<para>
There are two ways to redefine the appearance of all menuSeparators at once:
</para>
<itemizedlist>
<listitem><para>Redefine the corresponding skin parameters</para></listitem>
- <listitem><para>Add to user's stylesheets style classes used by a menuSeparator</para></listitem>
+ <listitem><para>Add to user's style sheets style classes used by a menuSeparator</para></listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -225,7 +225,7 @@
<section>
<title>Look-and-Feel Customization</title>
- <para>For implementing skinability the components use a <emphasis role="italic">
+ <para>For implementing skinnability the components use a <emphasis role="italic">
<property>style class redefinition method</property>
</emphasis>. Default style classes are mapped on <emphasis role="italic"><property>skin
parameters</property>.</emphasis></para>
@@ -237,7 +237,7 @@
<listitem>Add <emphasis role="italic">
<property>style classes</property>
- </emphasis> used by modalPanel to your page stylesheets</listitem>
+ </emphasis> used by modalPanel to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -146,7 +146,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property>.</emphasis></para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -154,7 +154,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the panel to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the panel to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -83,7 +83,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property>.</emphasis></para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -91,14 +91,14 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the panelBar to your page stylesheets (<property>PanelBar</property>
+role="italic"><property>style classes</property></emphasis> used by the panelBar to your page style sheets (<property>PanelBar</property>
itself has no properties mapped on a skin, it's described for its children).</listitem>
</itemizedlist>
</section>
<section>
<title>Definition custom style classes:</title>
<para>There is one predefined class for the <property>panelBar</property>, which is applicable
- to the whole component, specifying paddings, borders, and etc.</para>
+ to the whole component, specifying padding, borders, and etc.</para>
<figure>
<title>Custom style class of panelBar</title>
@@ -186,7 +186,7 @@
</rich:panelBar>
...
]]></programlisting>
-<para>Hence, paddings for all <property>panelBars</property> are changed on a page as well as a
+<para>Hence, padding for all <property>panelBars</property> is changed on a page as well as a
font for particular <property>panelBarItems</property> content.</para>
</section>
</section>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelBarItem.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -78,7 +78,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -86,7 +86,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the panelBarItem to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the panelBarItem to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -67,7 +67,7 @@
role="italic"><property>"style"</property></emphasis> and <emphasis
- role="italic"><property>"styleClass".</property></emphasis> In addition there are <emphasis role="italic"><property>width</property></emphasis> and <emphasis role="italic"><property>height</property></emphasis> attributes that should be specified in px.</para>
+ role="italic"><property>"styleClass".</property></emphasis> In addition there are <emphasis role="italic"><property>width</property></emphasis> and <emphasis role="italic"><property>height</property></emphasis> attributes that should be specified in pixels.</para>
<para>The line type can be customized with the <emphasis role="italic"><property>"lineType"</property></emphasis> parameter.
For example, different line types are shown after rendering with the following initial settings <emphasis role="italic"><property>lineType="double"</property></emphasis>and <emphasis role="italic"><property>"lineType="solid".</property></emphasis>
</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -116,7 +116,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -124,7 +124,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the simpleTogglePanel to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the simpleTogglePanel to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -69,7 +69,7 @@
Hence, it's possible to add a subtable structure different from the main one to organize tables
of the master - details type. The component is also has common peculiarities of any rich component:</para>
<itemizedlist>
- <listitem>Skin support. The table completely meets a three-class principle of Rich Faces skinability</listitem>
+ <listitem>Skin support. The table completely meets a three-class principle of Rich Faces skinnability</listitem>
<listitem>Support of AJAX updates for a limited set of rows</listitem>
</itemizedlist>
<para>Skins support is described in the <link linkend="ArchitectureOverview">corresponding section</link>. AJAX support is
@@ -95,7 +95,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -103,7 +103,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the subTable to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the subTable to your page style sheets</listitem>
</itemizedlist>
<para>To redefine a style of a particular page, use component class attributes which list is the same as the <property>subTable</property> one and is known to you.</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tab.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -78,7 +78,7 @@
...
</rich:tab>
</rich:tabPanel>
-]]></programlisting>
+...]]></programlisting>
<para>With this example it's possible to generate the <property>tab panel</property>
with the second disabled and two active <property>tabs</property> (see the picture).</para>
<figure>
@@ -106,11 +106,26 @@
<listitem>
etc.
</listitem>
- </itemizedlist>
+</itemizedlist>
+ <para>
+ Some event could be performed on the tab which has been entered/left using "ontabenter"/"ontableave" attributes. See the example below.
+ </para>
+ <programlisting role="XML"><![CDATA[...
+ <rich:tabPanel>
+ <rich:tab label="Tab1" ontabenter=”alert()”>
+ …
+ </rich:tab>
+ …
+ </rich:tabPanel>
+...]]></programlisting>
+ <para>
+ The following example shows how on the client side to get the names of entered/left tabs.
+ </para>
+ <programlisting role="JAVA"><![CDATA[ontabenter="alert(leftTabName)"]]></programlisting>
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use <emphasis
+ <para>For skinnability implementation the components use <emphasis
role="italic"><property>style class redefinition method</property>.</emphasis>
Default style classes are mapped on <emphasis
@@ -123,7 +138,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the tab to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the tab to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -143,7 +143,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -151,7 +151,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the tabPanel to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the tabPanel to your page style sheets</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -85,7 +85,7 @@
disc
</listitem>
</itemizedlist>
- <para>For example, when settting a separator of a disc type, the following result is produced:</para>
+ <para>For example, when setting a separator of a disc type, the following result is produced:</para>
<figure>
<title>Toolbar with a "disc" separator</title>
@@ -104,7 +104,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -112,7 +112,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the toolBar to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the toolBar to your page style sheets</listitem>
</itemizedlist>
<table>
<title>Skin parameters redefinition</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -117,7 +117,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -125,7 +125,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the toolBarGroup to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the toolBarGroup to your page style sheets</listitem>
</itemizedlist>
<table>
<title>Skin parameters redefinition</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -65,7 +65,7 @@
<para>As it has been mentioned above the tree component allows to render any tree-like structure
of data.</para>
<para>A bean property is passed into a tree <property>value</property> attribute. The property keeps the
- structure of a org.richfaces.component.TreeNode type. (You may look at this interface description in APIdoc) The default classes for lists building of a TreeNodeImpl type (it
+ structure of a org.richfaces.component.TreeNode type. (You may look at this interface description in the API document) The default classes for lists building of a TreeNodeImpl type (it
implements a TreeNode interface) for an XML structure XmlNodeData and XmlTreeDataBuilder are
implemented in the tree component. Hence, in order to provide your own class for TreeNode, it's
necessary only to implement this interface, i.e. the <emphasis role="italic"><property>"var"</property></emphasis> attribute contains
@@ -219,7 +219,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -227,7 +227,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the tree to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the tree to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml 2007-06-18 15:54:22 UTC (rev 1210)
+++ trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml 2007-06-18 15:56:29 UTC (rev 1211)
@@ -144,7 +144,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinability implementation the components use a <emphasis
+ <para>For skinnability implementation the components use a <emphasis
role="italic"><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
role="italic"><property>skin parameters</property>.</emphasis></para>
@@ -152,7 +152,7 @@
<itemizedlist>
<listitem>to redefine corresponding skin parameters</listitem>
<listitem>to add <emphasis
-role="italic"><property>style classes</property></emphasis> used by the treeNode to your page stylesheets</listitem>
+role="italic"><property>style classes</property></emphasis> used by the treeNode to your page style sheets</listitem>
</itemizedlist>
</section>
<section>
@@ -224,7 +224,7 @@
</tbody>
</tgroup>
</table>
- <para>Hence, to change look and fell of all <property>treeNodes</property> components on an application, change these
+ <para>Hence, to change look and feel of all <property>treeNodes</property> components on an application, change these
parameters values.</para>
</section>
<section>
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1210 - trunk/richfaces/dataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-06-18 11:54:22 -0400 (Mon, 18 Jun 2007)
New Revision: 1210
Modified:
trunk/richfaces/dataTable/src/main/config/component/colgroup.xml
Log:
fixed spelling errors
Modified: trunk/richfaces/dataTable/src/main/config/component/colgroup.xml
===================================================================
--- trunk/richfaces/dataTable/src/main/config/component/colgroup.xml 2007-06-18 15:08:07 UTC (rev 1209)
+++ trunk/richfaces/dataTable/src/main/config/component/colgroup.xml 2007-06-18 15:54:22 UTC (rev 1210)
@@ -40,14 +40,14 @@
<description>
Comma-delimited list of CSS style classes that are be applied to the columns of this table.
A space separated list of classes may also be specified for any individual column.
- If the number of elements in this list is less than the number of columns specified in the "columns" attribute, no "class" attribute is output for each column greater than the number of elements in the list. If the number of elements in the list is greater than the number of columns specified in the "columns" attribute, the elements at the posisiton in the list after the value of the "columns" attribute are ignored
+ If the number of elements in this list is less than the number of columns specified in the "columns" attribute, no "class" attribute is output for each column greater than the number of elements in the list. If the number of elements in the list is greater than the number of columns specified in the "columns" attribute, the elements at the position in the list after the value of the "columns" attribute are ignored
</description>
</property>
<property>
<name>rowClasses</name>
<classname>java.lang.String</classname>
<description>
- A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. Thes styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again
+ A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. The styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again
</description>
</property>
<!--
17 years, 6 months
- 1
- 0
JBoss Rich Faces SVN: r1209 - trunk/sandbox/calendar/design/calendar-js.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-06-18 11:08:07 -0400 (Mon, 18 Jun 2007)
New Revision: 1209
Modified:
trunk/sandbox/calendar/design/calendar-js/calendar-prototype.js
trunk/sandbox/calendar/design/calendar-js/calendar-xhtml.html
Log:
Today button added. OnDate selection added. Some style classes added(draft).
Modified: trunk/sandbox/calendar/design/calendar-js/calendar-prototype.js
===================================================================
--- trunk/sandbox/calendar/design/calendar-js/calendar-prototype.js 2007-06-18 12:45:26 UTC (rev 1208)
+++ trunk/sandbox/calendar/design/calendar-js/calendar-prototype.js 2007-06-18 15:08:07 UTC (rev 1209)
@@ -11,6 +11,27 @@
return value;
}
+Object.extend(Event, {
+ findElementByAttr : function(event, tagName, attribute, value, flag) {
+ var element = Event.findElement(event, tagName);
+ while (!element[attribute] || (flag ? element[attribute].slice(0, value.length)!=value : element[attribute]!=value) )
+ {
+ element = element.parentNode;
+ }
+ return element;
+ }
+});
+
+Object.extend(Element, {
+ replaceClassName : function (element, whichClassName, toClassName) {
+ if (!(element = $(element))) return;
+ var e = Element.classNames(element);
+ e.remove(whichClassName);
+ e.add(toClassName);
+ return element;
+ }
+});
+
function isLeapYear(year) {
return new Date(year, 1, 29).getDate()==29;
}
@@ -23,8 +44,6 @@
return 32 - new Date(date.getYear(), date.getMonth(), 32).getDate();
}
-function y2k(number) { return (number < 1000) ? number + 1900 : number; }
-
function getDay(date, firstWeekDay ) {
var value = date.getDay() - firstWeekDay;
if (value < 0) value = 7 + value;
@@ -32,11 +51,10 @@
}
function weekNumber(year, month, mdifw, fdow) {
- year = y2k(year);
var tfdow = fdow;
var firstDay = new Date(year,0,1);
var fDay = firstDay.getDay();
- var daynum = ((Date.UTC(y2k(year),month,1,0,0,0) - Date.UTC(y2k(year),0,1,0,0,0)) /86400000)+1 ;
+ var daynum = ((Date.UTC(year,month,1,0,0,0) - Date.UTC(year,0,1,0,0,0)) /86400000)+1 ;
var weeknum = Math.round((daynum+7)/7);
if(fDay == 0) fDay = 7;
if(tfdow == 0) tfdow = 7;
@@ -77,20 +95,23 @@
this.firstWeekDay = parameters.firstWeekDay;
this.minDaysInFirstWeek = parameters.minDaysInFirstWeek;
+ this.firstWeekendDayNumber = 6-this.firstWeekDay;
+ this.secondWeekendDayNumber = (this.firstWeekDay>0 ? 7-this.firstWeekDay : 0);
+
this.daysData = {startDate:null, days:[]};
- var htmlTextHeader = '<div id="div_'+parameters.dayListTableId+'"></div><table border="1" id="'+parameters.dayListTableId+'">\n';
- var htmlTextFooter = '</table>\n';
+ var htmlTextHeader = '<div id="div_'+parameters.dayListTableId+'"></div><table cellspacing="0" border="1" frame="void" rules="all" id="'+parameters.dayListTableId+'">\n';
+ var htmlTextFooter = '</table><div id="div_'+parameters.dayListTableId+'_selected_date"></div>\n';
// days bar creation
- var htmlTextWeekDayBar = '<tr id="'+parameters.weekDayBarId+'"><td></td>';
+ var htmlTextWeekDayBar = '<tr id="'+parameters.weekDayBarId+'"><td style="border-top:0px"></td>';
var weekDayCounter = this.firstWeekDay;
for (var i=0;i<7;i++)
{
var weekDayHtml = this.weekDayMarkup( {weekDay: this.weekDayLabels[weekDayCounter]} );
if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
- htmlTextWeekDayBar+='<td id="'+parameters.weekDayBarId+i+'">'+weekDayHtml+'</td>';
+ htmlTextWeekDayBar+='<td id="'+parameters.weekDayBarId+i+'" class="'+(i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ? "Weekendclass" : "Dayclass")+'">'+weekDayHtml+'</td>';
}
htmlTextWeekDayBar+='</tr>\n';
@@ -106,16 +127,59 @@
htmlTextWeek+='<tr><td id="'+parameters.weekNumberBarId+k+'">'+weekNumberHtml+'</td>';
for (var i=0;i<7;i++)
{
- htmlTextWeek+='<td style="vertical-align:top"></td>';
+ htmlTextWeek+='<td id="'+this.dayListTableId+'_cell'+(p++)+'" style="vertical-align:top" class="'+(i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ? "Weekenddayclass" : "Commondayclass")+'"></td>';
}
htmlTextWeek+='</tr>';
}
// set content
- var obj=document.getElementById(id);
+ var obj=$(id);
obj.innerHTML = htmlTextHeader+htmlTextWeekDayBar+htmlTextWeek+htmlTextFooter;
+
+ this.prepareEvents();
+ obj.innerHTML
},
+
+ prepareEvents: function() {
+ this.eventCellOnClick = this.eventCellOnClick.bindAsEventListener(this);
+ this.eventCellOnMouseOver = this.eventCellOnMouseOver.bindAsEventListener(this);
+ this.eventCellOnMouseOut = this.eventCellOnMouseOut.bindAsEventListener(this);
+ },
+
+ setCellEvents: function(obj) {
+ Event.observe(obj, "click", this.eventCellOnClick, false);
+ Event.observe(obj, "mouseover", this.eventCellOnMouseOver, false);
+ Event.observe(obj, "mouseout", this.eventCellOnMouseOut, false);
+ },
+ stopCellEvents: function(obj) {
+ Event.observe(obj, "click", this.eventCellOnClick, false);
+ Event.observe(obj, "mouseover", this.eventCellOnMouseOver, false);
+ Event.observe(obj, "mouseout", this.eventCellOnMouseOut, false);
+ },
+
+ eventCellOnClick: function (e) {
+ var obj = Event.findElementByAttr(e, "TD", "id", this.dayListTableId+'_cell',true);
+ $('div_'+this.dayListTableId+'_selected_date').innerHTML=obj.data+"/"+(this.currentDate.getMonth()+1)+"/"+this.currentDate.getFullYear();
+ },
+ eventCellOnMouseOver: function (e) {
+ var obj = Event.findElementByAttr(e, "TD", "id", this.dayListTableId+'_cell',true);
+ if (obj)
+ {
+ if (Element.hasClassName(obj,"Commondayclass")) Element.replaceClassName(obj,"Commondayclass", "Hovereddayclass");
+ else if (Element.hasClassName(obj,"Weekenddayclass")) Element.replaceClassName(obj,"Weekenddayclass", "Hoveredweekclass");
+ }
+ },
+
+ eventCellOnMouseOut: function (e) {
+ var obj = Event.findElementByAttr(e, "TD", "id", this.dayListTableId+'_cell',true);
+ if (obj)
+ {
+ if (Element.hasClassName(obj,"Hovereddayclass")) Element.replaceClassName(obj, "Hovereddayclass", "Commondayclass");
+ else if (Element.hasClassName(obj,"Hoveredweekclass")) Element.replaceClassName(obj, "Hoveredweekclass", "Weekenddayclass");
+ }
+ },
+
load:function(daysData) {
// startDate,
// days:array[]
@@ -135,7 +199,7 @@
},
indexData:function(daysData) {
- var dateYear = y2k(daysData.startDate.getYear());
+ var dateYear = daysData.startDate.getFullYear();
var dateMonth = daysData.startDate.getMonth();
daysData.index = [];
@@ -154,10 +218,10 @@
update:function() {
//this.currentDate = daysData.startDate;
- var currentYear = y2k(this.currentDate.getYear());
+ var currentYear = this.currentDate.getFullYear();
var currentMonth = this.currentDate.getMonth();
- var dateDiv = document.getElementById("div_"+this.dayListTableId);
+ var dateDiv = $("div_"+this.dayListTableId);
dateDiv.innerHTML = currentYear + "/" + (currentMonth+1);
@@ -197,24 +261,40 @@
for (var k=1;k<7;k++)
{
//
- var obj = document.getElementById(this.weekNumberBarId+k).parentNode;
+ var obj = $(this.weekNumberBarId+k).parentNode;
obj.childNodes[0].innerHTML = (days[p]) ? this.weekNumberMarkup( {weekNumber: wn++} ) : "";
for (var i=1;i<obj.childNodes.length;i++)
{
- obj.childNodes[i].innerHTML = (days[p]) ? this.dayListMarkupArray[p]( days[p++] ) : "";
+ this.stopCellEvents(obj.childNodes[i]);
+
+ if (days[p]) {
+ this.setCellEvents(obj.childNodes[i]);
+ obj.childNodes[i].data=days[p].day;
+ obj.childNodes[i].innerHTML = this.dayListMarkupArray[p]( days[p++] );
+ } else {
+ obj.childNodes[i].innerHTML = "";
+ }
}
}
},
+
nextMonth: function() {
- this.currentDate = new Date(y2k(this.currentDate.getYear()), this.currentDate.getMonth()+1,1);
+ this.currentDate = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+1,1);
this.update();
},
prevMonth: function() {
- this.currentDate = new Date(y2k(this.currentDate.getYear()), this.currentDate.getMonth()-1,1);
+ this.currentDate = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()-1,1);
this.update();
+ },
+
+ today: function() {
+ var now = new Date();
+ if (now.getDate()!=this.todayDate.getDate()) this.todayDate = now;
+ this.currentDate = new Date(now.getFullYear(), now.getMonth(),1);
+ this.update();
}
});
\ No newline at end of file
Modified: trunk/sandbox/calendar/design/calendar-js/calendar-xhtml.html
===================================================================
--- trunk/sandbox/calendar/design/calendar-js/calendar-xhtml.html 2007-06-18 12:45:26 UTC (rev 1208)
+++ trunk/sandbox/calendar/design/calendar-js/calendar-xhtml.html 2007-06-18 15:08:07 UTC (rev 1209)
@@ -5,8 +5,34 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/xhtml" />
+<meta http-equiv="Content-Type" content="text/xhtml" />
+<style type="text/css">
+.Dayclass {
+ color: #000000;
+ font-weight:bold;
+}
+.Weekendclass {
+ color:#800000;
+ font-weight:bold;
+}
+.Commondayclass {
+ color: #000080;
+}
+.Hovereddayclass {
+ color:red;
+}
+.Weekenddayclass {
+ color:#800000;
+}
+.Hoveredweekclass {
+ color:red;
+}
+.Disableddayclass {
+ color:gray;
+}
+</style>
+
<script src="prototype-1.5.1.js" type="text/javascript"></script>
<script src="calendar-prototype.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -20,7 +46,7 @@
m1 = Richfaces.evalMacro('day',obj);
m2 = Richfaces.evalMacro('text1',obj);
m3 = Richfaces.evalMacro('text2',obj);
- return '<table><tr><td> </td><td>'+m1+'</td></tr><tr><td> </td><td> </td></tr><tr><td colspan="2">'+m2+'</td></tr><tr><td colspan="2">'+m3+'</td></tr></table>';
+ return '<table><tr><td></td><td>'+m1+'</td></tr><tr><td></td><td></td></tr><tr><td colspan="2">'+m2+'</td></tr><tr><td colspan="2">'+m3+'</td></tr></table>';
};
var m = new Array();
@@ -61,14 +87,14 @@
for (var i=10; i<=daysInMonth(2007,5); i++)
{
data_obj.days.push({day: i,
- text1: "data set 1 for day "+i,
+ text1: "<small><small>data set 1 for day "+i+"</small></small>",
text2: "<span style='color: green; font-size: 10px;'>just text</span>"
});
}
for (var i=1; i<=daysInMonth(2007,6); i++)
{
data_obj.days.push({day: i,
- text1: "data set 1 for day "+i,
+ text1: "<small><small>data set 1 for day "+i+"</small></small>",
text2: "<span style='color: green; font-size: 10px;'>just text</span>"
});
}
@@ -76,7 +102,7 @@
for (var i=1; i<=7; i++)
{
data_obj.days.push({day: i,
- text1: "data set 1 for day "+i,
+ text1: "<small><small>data set 1 for day "+i+"</small></small>",
text2: "<span style='color: green; font-size: 10px;'>just text</span>"
});
}
@@ -118,6 +144,9 @@
function changeMonth(v) {
if (v) window.testCalendar.nextMonth(); else window.testCalendar.prevMonth();
}
+function today() {
+ window.testCalendar.today();
+}
//]]>
</script>
@@ -128,7 +157,7 @@
<input type="radio" name="dataSet" value="1" id="set1" onchange="selectDataSet(event)" onclick="selectDataSet(event)" checked="checked" /><label for="set1">Set 1</label><br />
<input type="radio" name="dataSet" value="2" id="set2" onchange="selectDataSet(event)" onclick="selectDataSet(event)" /><label for="set2">Set 2</label><br />
<input type="radio" name="dataSet" value="3" id="set3" onchange="selectDataSet(event)" onclick="selectDataSet(event)" /><label for="set3">Set 3</label><br />
-<button onclick="changeMonth(false)">prev month</button><button onclick="changeMonth(true)">next month</button><br />
+<button onclick="changeMonth(false)">prev month</button><button onclick="changeMonth(true)">next month</button><button onclick="today()">Today</button><br />
<div id="calendar">Hello</div>
</body>
</html>
17 years, 6 months
- 1
- 0