JBoss Rich Faces SVN: r7318 - trunk/ui/fileUpload/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-27 13:30:03 -0400 (Thu, 27 Mar 2008)
New Revision: 7318
Modified:
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
Log:
RF-2310
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-03-27 17:19:25 UTC (rev 7317)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-03-27 17:30:03 UTC (rev 7318)
@@ -337,6 +337,18 @@
<name>maxLength</name>
<classname>java.lang.Object</classname>
</property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>value</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>maxlength</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>valid</name>
+ <classname>java.lang.Object</classname>
+ </property>
</component>
&listeners;
</components>
16 years, 9 months
JBoss Rich Faces SVN: r7317 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: dataTable and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-27 13:19:25 -0400 (Thu, 27 Mar 2008)
New Revision: 7317
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml
Log:
Demo site: table/column/group, dataList demos layout correction
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml 2008-03-27 17:18:00 UTC (rev 7316)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists/usage.xhtml 2008-03-27 17:19:25 UTC (rev 7317)
@@ -16,15 +16,15 @@
The following example shows the dataList component in use. Two another components could be used in the same way.
</p>
-
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Example</legend>
<div class="sample-container" >
-
<ui:include src="/richfaces/dataLists/examples/lists.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/dataLists/examples/lists.xhtml"/>
- </ui:include>
-
- </div>
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2008-03-27 17:18:00 UTC (rev 7316)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2008-03-27 17:19:25 UTC (rev 7317)
@@ -16,16 +16,16 @@
of a master table and detail sub-tables.<br />
The following example shows the dataTable component in use:
</p>
-
- <div class="sample-container" >
-
- <ui:include src="/richfaces/dataTable/examples/report.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/dataTable/examples/report.xhtml"/>
- </ui:include>
-
- </div>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">DataTable Column/ColumnGroup example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/dataTable/examples/report.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/dataTable/examples/report.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
16 years, 9 months
JBoss Rich Faces SVN: r7316 - trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-03-27 13:18:00 -0400 (Thu, 27 Mar 2008)
New Revision: 7316
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
Log:
http://jira.jboss.com/jira/browse/RF-2795
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-03-27 16:59:45 UTC (rev 7315)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-03-27 17:18:00 UTC (rev 7316)
@@ -125,6 +125,7 @@
Event.stop(event);
break;
case Event.KEY_ESC :
+ this.comboList.resetSelection();
this.comboList.hideWithDelay();
break;
}
@@ -171,14 +172,11 @@
cancel : function($super, e) {
var item = this.getLabelItem(this.valueKeeper.value);
if (item) {
- if (this.comboList.selectedItem) {
- this.comboList.doNormalItem(this.comboList.selectedItem);
- }
+ this.comboList.resetSelection();
this.comboList.doSelectItem(item);
$super(e, item.innerHTML);
this.comboList.hide();
}
- return false;
}
});
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2008-03-27 16:59:45 UTC (rev 7315)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2008-03-27 17:18:00 UTC (rev 7316)
@@ -76,5 +76,14 @@
this.doSelectItem(it);
}
}
+ },
+
+ resetSelection: function() {
+ if (this.activeItem) {
+ this.doNormalItem(this.activeItem);
+ }
+ if (this.selectedItem) {
+ this.doNormalItem(this.selectedItem);
+ }
}
});
16 years, 9 months
JBoss Rich Faces SVN: r7315 - in trunk/ui/scrollableDataTable/src/main: java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-27 12:59:45 -0400 (Thu, 27 Mar 2008)
New Revision: 7315
Added:
trunk/ui/scrollableDataTable/src/main/config/converter/row-key.xml
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
Log:
http://jira.jboss.com/jira/browse/RF-2669
Added: trunk/ui/scrollableDataTable/src/main/config/converter/row-key.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/converter/row-key.xml (rev 0)
+++ trunk/ui/scrollableDataTable/src/main/config/converter/row-key.xml 2008-03-27 16:59:45 UTC (rev 7315)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd">
+
+<components>
+ <converter generate="false">
+ <id>org.richfaces.convert.rowkey.ScrollableDataTableRowKeyConverter</id>
+ <classname>org.richfaces.convert.rowkey.ScrollableDataTableRowKeyConverter</classname>
+ </converter>
+</components>
\ No newline at end of file
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2008-03-27 16:38:57 UTC (rev 7314)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2008-03-27 16:59:45 UTC (rev 7315)
@@ -12,6 +12,7 @@
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
@@ -433,7 +434,4 @@
}
-
-
-
}
Added: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java (rev 0)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java 2008-03-27 16:59:45 UTC (rev 7315)
@@ -0,0 +1,45 @@
+/**
+ *
+ */
+package org.richfaces.convert.rowkey;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+
+import org.richfaces.model.ScrollableTableDataModel.SimpleRowKey;
+
+/**
+ * Converter for {@link SimpleRowKey}
+ * @author Maksim Kaszynski
+ *
+ */
+public class ScrollableDataTableRowKeyConverter implements Converter {
+
+ /* (non-Javadoc)
+ * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
+ */
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) {
+ try {
+ int i = Integer.parseInt(value);
+ return new SimpleRowKey(i);
+ } catch(Exception e) {
+ throw new ConverterException("Unable to convert value " + value + "to " + SimpleRowKey.class, e);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object)
+ */
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) {
+ if (value instanceof SimpleRowKey) {
+ SimpleRowKey key = (SimpleRowKey) value;
+ return key.toString();
+ }
+ throw new ConverterException("Value " + value + " is not supported by this converter");
+ }
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r7314 - in trunk/framework/impl/src/main: javascript/ajaxjsf and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-27 12:38:57 -0400 (Thu, 27 Mar 2008)
New Revision: 7314
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java
trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/ParsingContext.java
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-1487
http://jira.jboss.com/jira/browse/RF-2737
http://jira.jboss.com/jira/browse/RF-2736
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java 2008-03-27 16:33:48 UTC (rev 7313)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/FastHtmlParser.java 2008-03-27 16:38:57 UTC (rev 7314)
@@ -99,6 +99,11 @@
} else if (state == stateManager.ENDELEMENT) {
if (context.getLastMatched() == stateManager.HTML) {
haveHtml = true;
+ //if xmlns is not set on HTML element, append xmlns attribute
+ if (!context.contains("xmlns=")) {
+ context.insert(" xmlns=\"http://www.w3.org/1999/xhtml\"");
+ }
+
context.send();
if (log.isDebugEnabled()) {
log.debug("Found <html> element");
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/ParsingContext.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/ParsingContext.java 2008-03-27 16:33:48 UTC (rev 7313)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/io/parser/ParsingContext.java 2008-03-27 16:38:57 UTC (rev 7314)
@@ -149,7 +149,15 @@
this._lastMatched = state;
}
-
+
+ public boolean contains(String s) {
+ return buff.indexOf(s) >= 0;
+ }
+
+ public void insert(String s) {
+ buff.insert(buff.length() - 1, s);
+ }
+
/**
* @return Returns the _lastMatched.
*/
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-03-27 16:33:48 UTC (rev 7313)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-03-27 16:38:57 UTC (rev 7314)
@@ -255,18 +255,21 @@
// first attempt - .getElementById.
var oDoc = this._request.responseXML;
if(oDoc){
- if(typeof(oDoc.evaluate) != 'undefined') {
- // Xpath is prefer to use, so it work in the Firefox without XHTML xml namespace in the result.
- LOG.debug("call XMLDocument.evaluate for id= "+id);
- return oDoc.evaluate("//*[@id='"+id+"']",oDoc,null,9,null).singleNodeValue;// 9 - XPathResult.FIRST_ORDERED_NODE_TYPE
- } else if(typeof(oDoc.getElementById) != 'undefined') {
+ if(typeof(oDoc.getElementById) != 'undefined') {
LOG.debug("call getElementById for id= "+id);
- var element = oDoc.getElementById(id);
- } else if(typeof(oDoc.selectSingleNode) != "undefined") {
+ return oDoc.getElementById(id);
+ }
+ else if(typeof(oDoc.selectSingleNode) != "undefined") {
LOG.debug("call selectSingleNode for id= "+id);
return oDoc.selectSingleNode("//*[@id='"+id+"']"); /* XPATH istead of ID */
- }
- LOG.error("No functions for getElementById found ");
+ }
+ // nodeFromID not worked since XML validation disabled by
+ // default for MS
+ else if(typeof(oDoc.nodeFromID) != "undefined") {
+ LOG.debug("call nodeFromID for id= "+id);
+ return oDoc.nodeFromID(id);
+ }
+ LOG.error("No functions for getElementById found ");
} else {
LOG.debug("No parsed XML document in response");
}
16 years, 9 months
JBoss Rich Faces SVN: r7313 - trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-03-27 12:33:48 -0400 (Thu, 27 Mar 2008)
New Revision: 7313
Modified:
trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
Log:
http://jira.jboss.com/jira/browse/RF-2543
Modified: trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
===================================================================
--- trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2008-03-27 16:32:18 UTC (rev 7312)
+++ trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2008-03-27 16:33:48 UTC (rev 7313)
@@ -939,10 +939,27 @@
Element.setStyle(this.target, Object.extend({"left": pos[0] + "px", "top": pos[1] + "px"}, targetStyle));
}
*/
+
var offsets = this.calcOffsets(this.source);
- Element.setStyle(this.target, Object.extend({"left": offsets["x"]
- + "px", "top": offsets["y"] + "px"}, targetStyle));
+ var offsetTop = 0;
+ var offsetLeft = 0;
+ if (RichFaces.navigatorType() != RichFaces.MSIE)
+ {
+ var els = this.target.style;
+ var originalVisibility = els.visibility;
+ var originalDisplay = els.display;
+ els.visibility = 'hidden';
+ els.display = '';
+ var offsetTop = this.target.offsetParent.scrollTop;
+ var offsetLeft = this.target.offsetParent.scrollLeft;
+ els.display = originalDisplay;
+ els.visibility = originalVisibility;
+ }
+
+ Element.setStyle(this.target, Object.extend({"left": (offsets["x"]+offsetLeft)
+ + "px", "top": (offsets["y"]+offsetTop) + "px"}, targetStyle));
+
if (options.iframeId) {
var iframe = $(options.iframeId);
Position.clone(this.target, iframe);
@@ -958,21 +975,8 @@
},
calcOffsets : function(element) {
- var ret = new Object(), height = 0;
- var left = element.offsetLeft;
- var top = element.offsetTop;
- var parent = element.offsetParent;
- while (parent)
- {
- left += parent.offsetLeft;
- top += parent.offsetTop;
- parent = parent.offsetParent;
- }
-
- ret["x"] = left;
- ret["y"] = top + element.offsetHeight;
-
- return ret;
+ var offsetBase = element.cumulativeOffset();
+ return {x: offsetBase[0], y: element.offsetHeight + offsetBase[1]};
},
_removePx : function(str) {
16 years, 9 months
JBoss Rich Faces SVN: r7312 - in trunk/framework/impl: src/main/javascript/prototype and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-03-27 12:32:18 -0400 (Thu, 27 Mar 2008)
New Revision: 7312
Modified:
trunk/framework/impl/generatescript.xml
trunk/framework/impl/src/main/javascript/prototype/patches.js
Log:
Prototype.js reverted to 1.6.0
Modified: trunk/framework/impl/generatescript.xml
===================================================================
--- trunk/framework/impl/generatescript.xml 2008-03-27 16:11:58 UTC (rev 7311)
+++ trunk/framework/impl/generatescript.xml 2008-03-27 16:32:18 UTC (rev 7312)
@@ -61,7 +61,7 @@
<filelist id="prototype"
dir="${basedir}/src/main/javascript/prototype"
- files="prototype-1.6.0.2.js,../memory.js,patches.js">
+ files="prototype1.6.0.js,../memory.js,patches.js">
</filelist>
Modified: trunk/framework/impl/src/main/javascript/prototype/patches.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/patches.js 2008-03-27 16:11:58 UTC (rev 7311)
+++ trunk/framework/impl/src/main/javascript/prototype/patches.js 2008-03-27 16:32:18 UTC (rev 7312)
@@ -64,7 +64,7 @@
if (window.RichFaces && window.RichFaces.Memory) {
window.RichFaces.Memory.addCleaner("prototype", function(node) {
- var eventID = node._prototypeEventID;
+ var eventID = node._eventID;
if (eventID) {
var cache = Event.cache[eventID];
16 years, 9 months
JBoss Rich Faces SVN: r7311 - in trunk/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/js and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-27 12:11:58 -0400 (Thu, 27 Mar 2008)
New Revision: 7311
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
RF-2742
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-03-27 15:55:50 UTC (rev 7310)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-03-27 16:11:58 UTC (rev 7311)
@@ -7,27 +7,27 @@
<f:verbatim><![CDATA[
-.rich_file_upload_list_overflow{overflow: auto; overflow-y: auto; overflow-x: hidden;}
-.rich_file_upload_name{ width : 100%; height : 58px; padding : 2px 10px 2px 10px;}
-.rich_file_upload_del{ width : 90px; text-align : center; padding-top : 3; padding-bottom : 3;}
-.rich_file_upload_scroll{ width : 10px; text-align : center;}
+.rich-fileupload-list-overflow{overflow: auto; overflow-y: auto; overflow-x: hidden;}
+.rich-fileupload-name{ width : 100%; height : 58px; padding : 2px 10px 2px 10px;}
+.rich-fileupload-del{ width : 90px; text-align : center; padding-top : 3; padding-bottom : 3;}
+.rich-fileupload-scroll{ width : 10px; text-align : center;}
-input[type="file"][class~="rich_file_hidden"]::-webkit-file-upload-button {
+input[type="file"][class~="rich-fileupload-hidden"]::-webkit-rich-fileupload-button {
font-size: 10em;
-webkit-appearance: button;
}
-.rich_file_upload_button_content{
+.rich-fileupload-button-content{
padding : 2px 6px 2px 3px;
text-align : left;
white-space : nowrap;
}
-.rich_file_upload_name_padding{padding : 2px 0px 2px 0px;}
+.rich-fileupload-name-padding{padding : 2px 0px 2px 0px;}
-.rich_file_upload_ico{background-position : 0px 50%; background-repeat : no-repeat; padding-left : 19px;vertical-align: middle;}
+.rich-fileupload-ico{background-position : 0px 50%; background-repeat : no-repeat; padding-left : 19px;vertical-align: middle;}
-input.rich_file_hidden {
+input.rich-fileupload-hidden {
FILTER: alpha(opacity: 0);
POSITION: relative;
TEXT-ALIGN: left;
@@ -37,28 +37,28 @@
]]>
</f:verbatim>
-<u:selector name=".rich_file_upload_font">
+<u:selector name=".rich-fileupload-font">
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
-<u:selector name=".rich_file_upload_table_td">
+<u:selector name=".rich-fileupload-table-td">
<u:style name="border-bottom-color" skin="tableBorderColor" />
<u:style name="border-bottom" value="1px solid" />
<u:style name="white-space" value="nowrap" />
</u:selector>
-<u:selector name=".rich_file_upload_list_decor">
+<u:selector name=".rich-fileupload-list-decor">
<u:style name="border" value="1px solid;" />
<u:style name="border-color" skin="tableBorderColor" />
<u:style name="background-color" skin="tableBackgroundColor" />
</u:selector>
-<u:selector name=".rich_file_upload_anc">
+<u:selector name=".rich-fileupload-anc">
<u:style name="color" skin="generalLinkColor" />
</u:selector>
-<u:selector name=".rich_file_upload_toolbar_decor">
+<u:selector name=".rich-fileupload-toolbar-decor">
<u:style name="border-bottom" value="1px solid" />
<u:style name="border-top" value="1px solid" />
<u:style name="border-left" value="1px solid" />
@@ -70,20 +70,20 @@
<u:style name="width" value="100%" />
</u:selector>
-<u:selector name=".rich_file_upload_button_border">
+<u:selector name=".rich-fileupload-button-border">
<u:style name="border" value="1px solid" />
<u:style name="margin" value="2px" />
<u:style name="border-color" skin="tableBorderColor" />
</u:selector>
-<u:selector name=".rich_file_upload_button_dis">
+<u:selector name=".rich-fileupload-button-dis">
<u:style name="background-repeat" value="repeat-x" />
<u:style name="cursor" value="pointer" />
<u:style name="padding" value="2px" />
</u:selector>
-<u:selector name=".rich_file_upload_enrty_dis">
+<u:selector name=".rich-fileupload-enrty-dis">
<u:style name="background-repeat" value="repeat-x" />
<u:style name="background-color" skin="trimColor" />
<u:style name="text-color" value="red" />
@@ -93,14 +93,14 @@
-<u:selector name="a.rich_file_upload_button_selection">
+<u:selector name="a.rich-fileupload-button-selection">
<u:style name="color" skin="generalTextColor" />
<u:style name="text-decoration" value="none" />
<u:style name="display" value="block" />
</u:selector>
-<u:selector name=".rich_file_upload_button">
+<u:selector name=".rich-fileupload-button">
<u:style name="background-repeat" value="repeat-x" />
<u:style name="background-position" value="top left" />
<u:style name="background-color" skin="trimColor" />
@@ -112,7 +112,7 @@
</u:selector>
-<u:selector name=".rich_file_upload_button_light">
+<u:selector name=".rich-fileupload-button-light">
<u:style name="background-repeat" value="repeat-x" />
<u:style name="background-position" value="top left" />
<u:style name="background-color" skin="trimColor" />
@@ -126,7 +126,7 @@
</u:selector>
-<u:selector name=".rich_file_upload_button_press">
+<u:selector name=".rich-fileupload-button-press">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.UploadButtonPressedBgGradient" />
</u:style>
@@ -138,45 +138,45 @@
<u:style name="background-color" skin="additionalBackgroundColor" />
</u:selector>
-<u:selector name=".rich_file_upload_ico_add">
+<u:selector name=".rich-fileupload-ico-add">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_add.gif" />
</u:style>
</u:selector>
-<u:selector name=".rich_file_upload_ico_add_dis">
+<u:selector name=".rich-fileupload-ico-add-dis">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_add_dis.gif" />
</u:style>
<u:style name="color" skin="tableBorderColor" />
</u:selector>
-<u:selector name=".rich_file_upload_ico_start">
+<u:selector name=".rich-fileupload-ico-start">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_start.gif" />
</u:style>
</u:selector>
-<u:selector name=".rich_file_upload_ico_start_dis">
+<u:selector name=".rich-fileupload-ico-start-dis">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_start_dis.gif" />
</u:style>
<u:style name="color" skin="tableBorderColor" />
</u:selector>
-<u:selector name=".rich_file_upload_ico_stop">
+<u:selector name=".rich-fileupload-ico-stop">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_stop.gif" />
</u:style>
</u:selector>
-<u:selector name=".rich_file_upload_ico_clear">
+<u:selector name=".rich-fileupload-ico-clear">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_clear.gif" />
</u:style>
</u:selector>
-<u:selector name=".rich_file_upload_ico_clear_dis">
+<u:selector name=".rich-fileupload-ico-clear-dis">
<u:style name="background-image">
<f:resource f:key="/org/richfaces/renderkit/html/images/ico_clear_dis.gif" />
</u:style>
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-27 15:55:50 UTC (rev 7310)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-27 16:11:58 UTC (rev 7311)
@@ -26,7 +26,7 @@
{
'style':'',
'onclick': function (context) { return 'var entry = FileUploadEntry.getComponent(this); entry.uploadObject.clear(entry); return false;';},
- 'className':function (context) { return 'rich_file_upload_anc ' + Richfaces.evalMacro("className", context); },
+ 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("className", context); },
'href':'#'
},
[
@@ -40,7 +40,7 @@
{
'style':'',
'onclick': function (context) { return 'FileUploadEntry.getComponent(this).uploadObject.stop(); return false;';},
- 'className':function (context) { return 'rich_file_upload_anc ' + Richfaces.evalMacro("className", context); },
+ 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("className", context); },
'href':'#'
},
[
@@ -54,7 +54,7 @@
{
'style':'',
'onclick': function (context) { return 'var entry = FileUploadEntry.getComponent(this); entry.uploadObject.clear(entry); return false;';},
- 'className':function (context) { return 'rich_file_upload_anc ' + Richfaces.evalMacro("className", context); },
+ 'className':function (context) { return 'rich-fileupload-anc ' + Richfaces.evalMacro("className", context); },
'href':'#'
},
[
@@ -71,28 +71,28 @@
[
new E('tr',{},
[
- new E('td',{'className':function (context) { return 'rich_file_upload_font rich_file_upload_name rich_file_upload_table_td ' + Richfaces.evalMacro("className", context);}},
+ new E('td',{'className':function (context) { return 'rich-fileupload-font rich-fileupload-name rich-fileupload-table-td ' + Richfaces.evalMacro("className", context);}},
[
- new E('div',{'className':'rich_file_upload_name_padding','style':function (context) {return 'overflow : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}},
+ new E('div',{'className':'rich-fileupload-name-padding','style':function (context) {return 'overflow : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}},
[
new ET(function (context) { return Richfaces.evalMacro("fileName", context)})
]),
new E('div',{ }),
- new E('div',{'className':'rich_file_upload_name_padding','style':function (context) {return 'overflow : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}},
+ new E('div',{'className':'rich-fileupload-name-padding','style':function (context) {return 'overflow : hidden; width:' + Richfaces.evalMacro("fileEntryWidth", context);}},
[
new ET(function (context) { return Richfaces.evalMacro("label", context)})
])
]),
- new E('td',{'style':'vertical-align: center;', 'className':'rich_file_upload_table_td'},
+ new E('td',{'style':'vertical-align: center;', 'className':'rich-fileupload-table-td'},
[
- new E('div',{'className':'rich_file_upload_font rich_file_upload_del'},
+ new E('div',{'className':'rich-fileupload-font rich-fileupload-del'},
[
//FileUploadEntry.clearControlTemplate
])
]),
- new E('td',{'className':'rich_file_upload_table_td'},
+ new E('td',{'className':'rich-fileupload-table-td'},
[
- new E('div',{'className':'rich_file_upload_font rich_file_upload_scroll'},[ new T ('\u00A0') ])
+ new E('div',{'className':'rich-fileupload-font rich-fileupload-scroll'},[ new T ('\u00A0') ])
])
])
])
@@ -751,31 +751,31 @@
}else {
d1.className = buttonClass.ENABLED;
d2.className = buttonContentClass.ENABLED;
- d1.onmouseover = function () {this.className='rich_file_upload_button_light rich_file_upload_font';};
- d1.onmouseout = function () {this.className='rich_file_upload_button rich_file_upload_font';};
- d1.onmousedown = function () {this.className='rich_file_upload_button_press rich_file_upload_font';};
- d1.onmouseup = function () {this.className='rich_file_upload_button rich_file_upload_font';};
+ d1.onmouseover = function () {this.className='rich-fileupload-button-light rich-fileupload-font';};
+ d1.onmouseout = function () {this.className='rich-fileupload-button rich-fileupload-font';};
+ d1.onmousedown = function () {this.className='rich-fileupload-button-press rich-fileupload-font';};
+ d1.onmouseup = function () {this.className='rich-fileupload-button rich-fileupload-font';};
}
},
disable: function () {
this.disabled = true;
- this.items.className = "rich_file_upload_list_overflow " + this.classes.UPLOAD_LIST.DISABLED;
+ this.items.className = "rich-fileupload-list-overflow " + this.classes.UPLOAD_LIST.DISABLED;
for (var i = 0; i < this.entries.length; i++) {
var entry = this.entries[i];
- entry.entryElement.rows[0].cells[0].className = "rich_file_upload_font rich_file_upload_name rich_file_upload_table_td " + this.classes.FILE_ENTRY.DISABLED;
- entry.controlArea.firstChild.className = "rich_file_upload_anc " + this.classes.FILE_ENTRY_CONTROL.DISABLED;
+ entry.entryElement.rows[0].cells[0].className = "rich-fileupload-font rich-fileupload-name rich-fileupload-table-td " + this.classes.FILE_ENTRY.DISABLED;
+ entry.controlArea.firstChild.className = "rich-fileupload-anc " + this.classes.FILE_ENTRY_CONTROL.DISABLED;
}
this.processButtons();
},
enable: function () {
this.disabled = false;
- this.items.className = "rich_file_upload_list_overflow " + this.classes.UPLOAD_LIST.ENABLED;
+ this.items.className = "rich-fileupload-list-overflow " + this.classes.UPLOAD_LIST.ENABLED;
for (var i = 0; i < this.entries.length; i++) {
var entry = this.entries[i];
- entry.entryElement.rows[0].cells[0].className = "rich_file_upload_font rich_file_upload_name rich_file_upload_table_td " + this.classes.FILE_ENTRY.ENABLED;
- entry.controlArea.firstChild.className = "rich_file_upload_anc " + this.classes.FILE_ENTRY_CONTROL.ENABLED;
+ entry.entryElement.rows[0].cells[0].className = "rich-fileupload-font rich-fileupload-name rich-fileupload-table-td " + this.classes.FILE_ENTRY.ENABLED;
+ entry.controlArea.firstChild.className = "rich-fileupload-anc " + this.classes.FILE_ENTRY_CONTROL.ENABLED;
}
this.processButtons();
},
Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-03-27 15:55:50 UTC (rev 7310)
+++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-03-27 16:11:58 UTC (rev 7311)
@@ -29,10 +29,10 @@
variables.setVariable("maxCount", max);
boolean disabled = (Boolean)component.getAttributes().get("disabled");
- String addButtonClass = (disabled) ? "rich_file_upload_button_dis rich_file_upload_font " + (String)component.getAttributes().get("addButtonClassDisabled")
- : "rich_file_upload_button rich_file_upload_font " + (String)component.getAttributes().get("addButtonClass");
- String addButtonClassContent = (disabled) ? "rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_add_dis " + (String)component.getAttributes().get("addButtonClassDisabled")
- : "rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_add " + (String)component.getAttributes().get("addButtonClass");
+ String addButtonClass = (disabled) ? "rich-fileupload-button-dis rich-fileupload-font " + (String)component.getAttributes().get("addButtonClassDisabled")
+ : "rich-fileupload-button rich-fileupload-font " + (String)component.getAttributes().get("addButtonClass");
+ String addButtonClassContent = (disabled) ? "rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add-dis " + (String)component.getAttributes().get("addButtonClassDisabled")
+ : "rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add " + (String)component.getAttributes().get("addButtonClass");
String uploadListClass = (disabled) ? (String)component.getAttributes().get("uploadListClassDisabled") : (String)component.getAttributes().get("uploadListClass");
variables.setVariable("addButtonClass",addButtonClass);
@@ -55,7 +55,7 @@
</jsp:scriptlet>
-<div class="rich_file_upload_list_decor" style="width: #{listWidth}" id="#{clientId}">
+<div class="rich-fileupload-list-decor" style="width: #{listWidth}" id="#{clientId}">
<f:call name="utils.encodeBeginFormIfNessesary" />
<!-- iframe name="ddd" id="#{clientId}_iframe" style="display: none;"/ -->
@@ -67,11 +67,11 @@
]]>
</jsp:scriptlet>
</span>
- <table class="rich_file_upload_toolbar_decor">
+ <table class="rich-fileupload-toolbar-decor">
<tr>
<td>
- <div class="rich_file_upload_button_border" style=" float:left;">
- <div class="#{addButtonClass}" onmouseover="this.className='rich_file_upload_button_light rich_file_upload_font'" onmousedown="this.className='rich_file_upload_button_press rich_file_upload_font'" onmouseup="this.className='rich_file_upload_button rich_file_upload_font'" onmouseout="this.className='rich_file_upload_button rich_file_upload_font'"
+ <div class="rich-fileupload-button-border" style=" float:left;">
+ <div class="#{addButtonClass}" onmouseover="this.className='rich-fileupload-button-light rich-fileupload-font'" onmousedown="this.className='rich-fileupload-button-press rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button rich-fileupload-font'" onmouseout="this.className='rich-fileupload-button rich-fileupload-font'"
style="position: relative;"
id="#{clientId}:add1">
<div class="#{addButtonClassContent}"
@@ -79,20 +79,20 @@
style="position: relative;">#{addLabel}</div>
<div style="overflow : hidden; position : absolute; top : 0px; left : 0px; padding: 0px;">
<input type="file" style="cursor: pointer; right: 0px; top: 0px; font-size: 10em; position: absolute; padding: 0px"
- class="rich_file_hidden"
+ class="rich-fileupload-hidden"
id="#{clientId}:file"
name="#{clientId}:file"
onchange="return $('#{clientId}').component.add(this);"/>
</div>
</div>
</div>
- <div class="rich_file_upload_button_border" style=" float:left; display: none;">
- <div class="rich_file_upload_button rich_file_upload_font #{component.attributes['uploadButtonClass']}" onmouseover="this.className='rich_file_upload_button_light rich_file_upload_font'" onmousedown="this.className='rich_file_upload_button_press rich_file_upload_font'" onmouseup="this.className='rich_file_upload_button rich_file_upload_font'"
- onmouseout="this.className='rich_file_upload_button rich_file_upload_font'"
+ <div class="rich-fileupload-button-border" style=" float:left; display: none;">
+ <div class="rich-file-upload-button rich-fileupload-font #{component.attributes['uploadButtonClass']}" onmouseover="this.className='rich-fileupload-button-light rich-fileupload-font'" onmousedown="this.className='rich-fileupload-button-press rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button rich-fileupload-font'"
+ onmouseout="this.className='rich-fileupload-button rich-fileupload-font'"
id="#{clientId}:upload1"
onclick="return $('#{clientId}').component.upload();">
- <a href="#" class="rich_file_upload_button_selection">
- <div class="rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_start #{component.attributes['uploadButtonClass']}"
+ <a href="#" class="rich-fileupload-button-selection">
+ <div class="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start #{component.attributes['uploadButtonClass']}"
id="#{clientId}:upload2">
#{uploadLabel}
</div>
@@ -104,13 +104,13 @@
<!-- -->
- <div class="rich_file_upload_button_border" style=" float:right; display: none;">
- <div class="rich_file_upload_button rich_file_upload_font #{component.attributes['cleanButtonClass']}" onmouseover="this.className='rich_file_upload_button_light rich_file_upload_font'" onmousedown="this.className='rich_file_upload_button_press rich_file_upload_font'" onmouseup="this.className='rich_file_upload_button rich_file_upload_font'"
- onmouseout="this.className='rich_file_upload_button rich_file_upload_font'"
+ <div class="rich-fileupload-button-border" style=" float:right; display: none;">
+ <div class="rich-fileupload-button rich-fileupload-font #{component.attributes['cleanButtonClass']}" onmouseover="this.className='rich-fileupload-button-light rich-fileupload-font'" onmousedown="this.className='rich-fileupload-button-press rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button rich-fileupload-font'"
+ onmouseout="this.className='rich-fileupload-button rich-fileupload-font'"
onclick="return $('#{clientId}').component.clear();"
id="#{clientId}:clean1">
- <a href="#" class="rich_file_upload_button_selection">
- <div class="rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_clear_dis #{component.attributes['cleanButtonClass']}"
+ <a href="#" class="rich-fileupload-button-selection">
+ <div class="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear-dis #{component.attributes['cleanButtonClass']}"
id="#{clientId}:clean2">#{clearAllLabel}</div>
</a>
</div>
@@ -119,7 +119,7 @@
</tr>
</table>
- <div class="rich_file_upload_list_overflow #{uploadListClass}" style="width: 100%; height: #{listHeight}" id="#{clientId}:fileItems">
+ <div class="rich-fileupload-list-overflow #{uploadListClass}" style="width: 100%; height: #{listHeight}" id="#{clientId}:fileItems">
</div>
@@ -127,36 +127,36 @@
<script type="text/javascript">
FileUpload.CLASSES = {
ADD : {
- ENABLED : 'rich_file_upload_button rich_file_upload_font #{component.attributes["addButtonClass"]}',
- DISABLED : 'rich_file_upload_button_dis rich_file_upload_font #{component.attributes["addButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["addButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-dis rich-file-upload-font #{component.attributes["addButtonClassDisabled"]}'
},
ADD_CONTENT : {
- ENABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_add #{component.attributes["addButtonClass"]}',
- DISABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_add_dis #{component.attributes["addButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add #{component.attributes["addButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add-dis #{component.attributes["addButtonClassDisabled"]}'
},
UPDATE : {
- ENABLED : 'rich_file_upload_button rich_file_upload_font #{component.attributes["uploadButtonClass"]}',
- DISABLED : 'rich_file_upload_button_dis rich_file_upload_font #{component.attributes["uploadButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["uploadButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["uploadButtonClassDisabled"]}'
},
UPDATE_CONTENT : {
- ENABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_start #{component.attributes["uploadButtonClass"]}',
- DISABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_start_dis #{component.attributes["uploadButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start #{component.attributes["uploadButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start-dis #{component.attributes["uploadButtonClassDisabled"]}'
},
CANCEL : {
- ENABLED : 'rich_file_upload_button rich_file_upload_font #{component.attributes["cancelButtonClass"]}',
- DISABLED : 'rich_file_upload_button_dis rich_file_upload_font #{component.attributes["cancelButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["cancelButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["cancelButtonClassDisabled"]}'
},
CANCEL_CONTENT : {
- ENABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_stop #{component.attributes["cancelButtonClass"]}',
- DISABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_stop_dis #{component.attributes["cancelButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop #{component.attributes["cancelButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop-dis #{component.attributes["cancelButtonClassDisabled"]}'
},
CLEAN : {
- ENABLED : 'rich_file_upload_button rich_file_upload_font #{component.attributes["cleanButtonClass"]}',
- DISABLED : 'rich_file_upload_button_dis rich_file_upload_font #{component.attributes["cleanButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["cleanButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["cleanButtonClassDisabled"]}'
},
CLEAN_CONTENT : {
- ENABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_clear #{component.attributes["cleanButtonClass"]}',
- DISABLED : 'rich_file_upload_button_content rich_file_upload_font rich_file_upload_ico rich_file_upload_ico_clear_dis #{component.attributes["cleanButtonClassDisabled"]}'
+ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear #{component.attributes["cleanButtonClass"]}',
+ DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear-dis #{component.attributes["cleanButtonClassDisabled"]}'
},
FILE_ENTRY : {
ENABLED : '#{component.attributes["fileEntryClass"]}',
16 years, 9 months
JBoss Rich Faces SVN: r7310 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: gmap and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-27 11:55:50 -0400 (Thu, 27 Mar 2008)
New Revision: 7310
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml
Log:
Demo site: compControl, gmap demos layout correction
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/usage.xhtml 2008-03-27 15:51:13 UTC (rev 7309)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/usage.xhtml 2008-03-27 15:55:50 UTC (rev 7310)
@@ -19,13 +19,17 @@
In this simple example <b>componentControl</b> components are used to open and close modal panel.
The component is attached to links and calls "show" and "hide" functions on Modal Panel.
</p>
- <div class="sample-container">
- <ui:include src="/richfaces/componentControl/examples/mpusage.xhtml" />
- <rich:spacer height="20"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/componentControl/examples/mpusage.xhtml"/>
- </ui:include>
- </div>
+
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Component Control with modal panel example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/componentControl/examples/mpusage.xhtml"/>
+ <br/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/componentControl/examples/mpusage.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
<p>
<b>Main component attributes:</b>
</p>
@@ -68,14 +72,16 @@
Click at any table row to see the context menu that generated individually for
every row using parameters.
</p>
- <div class="sample-container">
- <ui:include src="/richfaces/componentControl/examples/cmenuusage.xhtml" />
- <rich:spacer height="20"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/componentControl/examples/cmenuusage.xhtml"/>
- </ui:include>
- </div>
-
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Component Control with rich:dataTable example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/componentControl/examples/cmenuusage.xhtml"/>
+ <br/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/componentControl/examples/cmenuusage.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml 2008-03-27 15:51:13 UTC (rev 7309)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/gmap/usage.xhtml 2008-03-27 15:55:50 UTC (rev 7310)
@@ -21,12 +21,15 @@
component that allows to invoke the server side data and convert it into a JSON format.
</p>
- <ui:include src="/richfaces/gmap/examples/mapUsage.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/gmap/examples/mapUsage.xhtml"/>
- <ui:param name="openlable" value="View page Source"/>
- </ui:include>
-
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">GoogleMap example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/gmap/examples/mapUsage.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/gmap/examples/mapUsage.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
16 years, 9 months
JBoss Rich Faces SVN: r7309 - in trunk/samples/richfaces-demo/src/main/webapp: richfaces/progressBar and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-27 11:51:13 -0400 (Thu, 27 Mar 2008)
New Revision: 7309
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
Log:
progress bar demo explanation started
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-03-27 15:46:00 UTC (rev 7308)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-03-27 15:51:13 UTC (rev 7309)
@@ -31,11 +31,10 @@
<rich:menuItem submitMode="ajax" value="Save"
action="#{ddmenu.doSave}" icon="/images/icons/save.gif" />
<rich:menuItem submitMode="ajax" value="Save All"
- action="#{ddmenu.doSaveAll}" icon="" >
+ action="#{ddmenu.doSaveAll}">
<f:facet name="icon">
- <h:graphicImage value="richfaces/toolBar/images/icons/save_all.gif" />
+ <h:graphicImage value="/images/icons/save_all.gif" />
</f:facet>
-
</rich:menuItem>
</rich:menuGroup>
<rich:menuItem submitMode="ajax" value="Close"
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml 2008-03-27 15:46:00 UTC (rev 7308)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/examples/polling.xhtml 2008-03-27 15:51:13 UTC (rev 7309)
@@ -1,26 +1,29 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
-
- <h:form>
- <h:outputText value="http://jira.jboss.com/jira/browse/RF-2364"/>
- <a4j:outputPanel id="progressPanel">
- <br/>
- <a4j:commandButton action="#{progressBarBean.startProcess}" value="startProcess" reRender="progressPanel" rendered="#{not progressBarBean.enabled}" style="margin: 9px 0px 5px;"/>
- <rich:progressBar value="#{progressBarBean.currentValue}" interval="2000"
- label="#{progressBarBean.currentValue} %" enabled="#{progressBarBean.enabled}">
- <f:facet name="initial">
- <br/>
- <h:outputText value="Process doesn't started yet"/>
- </f:facet>
- <f:facet name="complete">
- <br/>
- <h:outputText value="Process Done"/>
- </f:facet>
- </rich:progressBar>
- </a4j:outputPanel>
- </h:form>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <h:form>
+ <a4j:outputPanel id="progressPanel">
+ <br />
+ <a4j:commandButton action="#{progressBarBean.startProcess}"
+ value="startProcess" reRender="progressPanel"
+ rendered="#{not progressBarBean.enabled}"
+ style="margin: 9px 0px 5px;" />
+ <rich:progressBar value="#{progressBarBean.currentValue}"
+ interval="2000" label="#{progressBarBean.currentValue} %"
+ enabled="#{progressBarBean.enabled}" minValue="-1" maxValue="100">
+ <f:facet name="initial">
+ <br />
+ <h:outputText value="Process doesn't started yet" />
+ </f:facet>
+ <f:facet name="complete">
+ <br />
+ <h:outputText value="Process Done" />
+ </f:facet>
+ </rich:progressBar>
+ </a4j:outputPanel>
+ </h:form>
</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/usage.xhtml 2008-03-27 15:46:00 UTC (rev 7308)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/progressBar/usage.xhtml 2008-03-27 15:51:13 UTC (rev 7309)
@@ -7,10 +7,17 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
- <p>
- SHORT DESCRIPTION
+ <p><b>
+ rich:progressBar</b> is a component which could be used to display progress of
+ any client or server side process.
+ </p>
+
+ <p>
+ In order to display progress of some server side process(<b>mode="ajax"</b>) component
+ uses polling method. It just polls server to get the <b>value </b>which should be
+ updated by server side process.
</p>
-
+ <p>Next simple example shows you progress bar which polls server every two second to get new progress value</p>
<fieldset class="demo_fieldset">
<legend class="demo_legend">Server Side</legend>
<div class="sample-container" >
@@ -19,8 +26,26 @@
<ui:param name="sourcepath" value="/richfaces/progressBar/examples/polling.xhtml"/>
</ui:include>
</div>
- </fieldset>
-
+ </fieldset>
+ <p>
+ In order to customize progressBar next main attributes used:
+ </p>
+ <ul>
+ <li><b>minValue, maxValue</b> - defines boundary values for progress bar</li>
+ <li><b>value</b> - value binding to property which kept process progress</li>
+ <li><b>enabled</b> - boolean attribute. If false progress stops polling</li>
+ </ul>
+ <p>
+ Also next two facets could be defined for states customization:
+ </p>
+ <ul>
+ <li><b>initial</b> rendered before progress started</li>
+ <li><b>complete</b> rendered after process complete</li>
+ </ul>
+ <p>
+ Next example shows client side progress bar. Progress Bar JS API should be
+ used to update progress value from client side process.
+ </p>
<fieldset class="demo_fieldset">
<legend class="demo_legend">Client Side</legend>
<div class="sample-container" >
@@ -29,7 +54,17 @@
<ui:param name="sourcepath" value="/richfaces/progressBar/examples/client.xhtml"/>
</ui:include>
</div>
- </fieldset>
+ </fieldset>
+ <p>
+ Next JS API functions should be used to update progress:
+ </p>
+ <ul>
+ <li><b>enable()</b> </li>
+ <li><b>disable()</b> </li>
+ <li><b>setValue(newValue)</b> </li>
+ <li><b>setLabel(newLabel)</b> </li>
+ </ul>
+
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-03-27 15:46:00 UTC (rev 7308)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-03-27 15:51:13 UTC (rev 7309)
@@ -7,7 +7,7 @@
<ui:composition>
<rich:panel styleClass="panel_menu">
-<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" width="100%">
+<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" width="100%" height="605px">
<rich:panelBarItem id="ajaxSupport" label="Ajax Support">
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxSupport}" />
16 years, 9 months