[richfaces-svn-commits] JBoss Rich Faces SVN: r5824 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/component and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Feb 5 10:37:21 EST 2008
Author: andrei_exadel
Date: 2008-02-05 10:37:21 -0500 (Tue, 05 Feb 2008)
New Revision: 5824
Added:
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Removed:
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload2.jspx
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload3.jspx
Modified:
trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/FileItem.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
next portion of functionality
Modified: trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-05 15:37:21 UTC (rev 5824)
@@ -43,7 +43,7 @@
</test>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.html.FileUploadRenderer</name>
- <template>org/richfaces/fileUpload3.jspx</template>
+ <template>org/richfaces/fileUpload.jspx</template>
</renderer>
<tag>
<name>fileUpload</name>
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/FileItem.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/FileItem.java 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/FileItem.java 2008-02-05 15:37:21 UTC (rev 5824)
@@ -6,6 +6,7 @@
package org.richfaces.org.jboss.seam.ui.component;
+import java.io.Serializable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -14,8 +15,10 @@
* @author "Andrey Markavtsov"
*
*/
-public class FileItem {
+public class FileItem implements Serializable{
+ private static final long serialVersionUID = 42L;
+
/** Defines list of statuses available */
public static enum Status {ADDED, MARKED_4_UPLOAD, IN_PROGRESS, UPLOADED, CANCELLED};
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-05 15:37:21 UTC (rev 5824)
@@ -4,7 +4,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
@@ -30,7 +32,7 @@
private String localFileName;
private Integer localFileSize;
-
+
private InputStream localInputStream;
private List<FileItem> fileItems;
@@ -38,59 +40,59 @@
private UIComponent progressBar;
- @Override
- public void processUpdates(FacesContext context) {
- ValueExpression dataBinding = getValueExpression("data");
- if (dataBinding != null) {
- Class clazz = dataBinding.getType(context.getELContext());
- if (clazz.isAssignableFrom(InputStream.class)) {
- dataBinding.setValue(context.getELContext(),
- getLocalInputStream());
- } else if (clazz.isAssignableFrom(byte[].class)) {
- byte[] bytes = null;
- if (getLocalInputStream() != null) {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try {
- byte[] buffer = new byte[512];
- int read = getLocalInputStream().read(buffer);
- while (read != -1) {
- bos.write(buffer, 0, read);
- read = getLocalInputStream().read(buffer);
- }
- bytes = bos.toByteArray();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- dataBinding.setValue(context.getELContext(), bytes);
- }
+// @Override
+// public void processUpdates(FacesContext context) {
+// ValueExpression dataBinding = getValueExpression("data");
+// if (dataBinding != null) {
+// Class clazz = dataBinding.getType(context.getELContext());
+// if (clazz.isAssignableFrom(InputStream.class)) {
+// dataBinding.setValue(context.getELContext(),
+// getLocalInputStream());
+// } else if (clazz.isAssignableFrom(byte[].class)) {
+// byte[] bytes = null;
+// if (getLocalInputStream() != null) {
+// ByteArrayOutputStream bos = new ByteArrayOutputStream();
+// try {
+// byte[] buffer = new byte[512];
+// int read = getLocalInputStream().read(buffer);
+// while (read != -1) {
+// bos.write(buffer, 0, read);
+// read = getLocalInputStream().read(buffer);
+// }
+// bytes = bos.toByteArray();
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// }
+// dataBinding.setValue(context.getELContext(), bytes);
+// }
+//
+// if (getLocalContentType() != null) {
+// ValueExpression valueExpression = getValueExpression("contentType");
+// if (valueExpression != null) {
+// valueExpression.setValue(context.getELContext(),
+// getLocalContentType());
+// }
+// }
+//
+// if (getLocalFileName() != null) {
+// ValueExpression valueExpression = getValueExpression("fileName");
+// if (valueExpression != null) {
+// valueExpression.setValue(context.getELContext(),
+// getLocalFileName());
+// }
+// }
+//
+// if (getLocalFileSize() != null) {
+// ValueExpression valueExpression = getValueExpression("fileSize");
+// if (valueExpression != null) {
+// valueExpression.setValue(context.getELContext(),
+// getLocalFileSize());
+// }
+// }
+// }
+// }
- if (getLocalContentType() != null) {
- ValueExpression valueExpression = getValueExpression("contentType");
- if (valueExpression != null) {
- valueExpression.setValue(context.getELContext(),
- getLocalContentType());
- }
- }
-
- if (getLocalFileName() != null) {
- ValueExpression valueExpression = getValueExpression("fileName");
- if (valueExpression != null) {
- valueExpression.setValue(context.getELContext(),
- getLocalFileName());
- }
- }
-
- if (getLocalFileSize() != null) {
- ValueExpression valueExpression = getValueExpression("fileSize");
- if (valueExpression != null) {
- valueExpression.setValue(context.getELContext(),
- getLocalFileSize());
- }
- }
- }
- }
-
public String getLocalContentType() {
return localContentType;
}
@@ -186,7 +188,6 @@
values[0] = super.saveState(context);
values[1] = fileItems;
values[2] = uploadStatus;
- //values[3] = this.getFacet("progress");
return values;
}
@@ -202,9 +203,6 @@
super.restoreState(context, values[0]);
fileItems = (List<FileItem>) values[1];
uploadStatus = (String) values[2];
-// if (values[3] != null) {
-// this.getFacets().put("progress", (UIComponent)values[3]);
-// }
}
/**
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-05 15:37:21 UTC (rev 5824)
@@ -1,6 +1,7 @@
package org.richfaces.org.jboss.seam.ui.renderkit;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Writer;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -78,12 +79,18 @@
Map<String, String[]> params = context.getExternalContext()
.getRequestParameterValuesMap();
+ AjaxContext ajaxContext = AjaxContextImpl
+ .getCurrentInstance(context);
+
+ if (!ajaxContext.isAjaxRequest() && !(request instanceof MultipartRequest)) {
+ fileUpload.getFileItems().clear();
+ fileUpload.setUploadStatus(UIFileUpload.READY);
+ }
+
new AjaxEvent(component).queue();
if (params.containsKey(getActionParameterName(clientId))) {
processEvents(context, component, clientId);
- AjaxContext ajaxContext = AjaxContextImpl
- .getCurrentInstance(context);
ajaxContext.addComponentToAjaxRender(component);
}
if (!(request instanceof MultipartRequest)) {
@@ -104,6 +111,19 @@
}
}
+
+ private void storeData(FacesContext context, UIFileUpload fileUpload) {
+ ValueExpression data = fileUpload.getValueExpression("data");
+ if (data != null) {
+ Class clazz = data.getType(context.getELContext());
+ if (clazz.isAssignableFrom(Map.class)) {
+ Map map = (Map)data.getValue(context.getELContext());
+ map.put(fileUpload.getLocalFileName(),fileUpload.getLocalInputStream());
+ map.isEmpty();
+ }
+ }
+
+ }
public void encodeControlsMarkup(FacesContext context, UIComponent component)
throws IOException {
@@ -143,6 +163,7 @@
}
}
fileUpload.setUploadStatus(UIFileUpload.READY);
+ storeData(context, fileUpload);
}
private FileItem getFileByName(UIFileUpload fileUpload, String name) {
@@ -249,6 +270,7 @@
item.setStatus(FileItem.Status.CANCELLED);
}
}
+ fileUpload.setUploadStatus(UIFileUpload.READY);
}
}
Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-05 15:37:21 UTC (rev 5824)
@@ -58,14 +58,19 @@
}
},
onFileUploaded: function (ev) {
+ var o = $(this.id + ":1");
+ if (o) {
+ o.disabled = true;
+ o.name = "done";
+ o.id = o.name;
+ }
var formId = FileUpload.Uploaders[this.id]['formId'];
var containerId = FileUpload.Uploaders[this.id]['containerId'];
var actionUrl = FileUpload.Uploaders[this.id]['actionUrl'];
var f = {};
f[this.id] = this.id;
f[this.id + "_action"] = "upload";
- A4J.AJAX.StopPoll(formId + ":progressBar");
- //new ProgressBar(formId + ":progressBar").setValue(100);
+ new ProgressBar(formId + ":progressBar").disable();
A4J.AJAX.Submit(containerId,formId,ev,{'parameters':f ,'actionUrl':actionUrl} );
},
createForm: function () {
@@ -111,7 +116,8 @@
},
stop: function () {
new ProgressBar(FileUpload.Uploaders[this.id]['formId']+":progressBar").disable();
- this.fm.reset();
+ var fr = $(this.id + ":fr");
+ fr.src = "about:blank";
var f = $(this.id + ":1");
if (f) {
f.disable = true;
Deleted: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-05 15:37:21 UTC (rev 5824)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:h=" http://ajax4jsf.org/cdk/headers"
- class="org.richfaces.renderkit.html.FileUploadRenderer"
- baseclass="org.richfaces.org.jboss.seam.ui.renderkit.FileUploadRendererBase"
- component="org.richfaces.org.jboss.seam.ui.component.UIFileUpload"
- >
- <h:styles>
- /org/richfaces/renderkit/html/css/fileUpload.xcss
- </h:styles>
-
- <h:scripts>
- new org.ajax4jsf.javascript.PrototypeScript(),
- new org.ajax4jsf.javascript.AjaxScript(),
- /org/richfaces/renderkit/html/js/FileUpload.js,
- </h:scripts>
-
- <f:resource
- name="/org/richfaces/renderkit/html/images/ico_file_32.gif" var="icon" />
-
-<jsp:scriptlet>
- <![CDATA[
- variables.setVariable("url",getActionUrl(context));
-]]>
-</jsp:scriptlet>
-
-<f:clientId var="clientId" />
-
-<div class="upload_list_width upload_list_decor" id="#{clientId}">
-
- <input type="hidden" name="fileName" id="#{clientId}:fileName" />
- <input type="hidden" name="status" id="#{clientId}:status" value="#{this:encodeStatus(component)}" />
-
- <div class="upload_list_width upload_list_overflow">
- <table border="0" cellpadding="0" cellspacing="0" width="100%" id="#{clientId}:upload_table">
- <jsp:scriptlet>
- <![CDATA[
- Iterator<org.richfaces.org.jboss.seam.ui.component.FileItem> it = component.getFileItems().iterator();
- while (it.hasNext()) {
- org.richfaces.org.jboss.seam.ui.component.FileItem item = it.next();
- String fileName = item.getFullFileName();
- String fileNameJs = convertFileName(item.getFullFileName());
- variables.setVariable("fileName",fileName);
- variables.setVariable("fileNameJs",fileNameJs);
- ]]>
- </jsp:scriptlet>
- <tr>
- <td>
- <div class="upload_font upload_icon"><img src="#{icon}" width="32" height="32" alt="" border="0" /></div>
- </td>
- <td>
- <div class="upload_font upload_name">
- #{fileName}
- </div>
-
- <div class="upload_font upload_name">
- <jsp:scriptlet>
- <![CDATA[
- encodeFileItemStatus(context,component,item);
- ]]>
- </jsp:scriptlet>
- </div>
-
- </td>
- <td>
- <div class="upload_font upload_del"><a href="#" onclick="new FileUpload('#{clientId}').clear('#{fileNameJs}'); #{this:getActionOnClick(context,component,'CLEAR','false')}; return false;"
- class="upload_anc">Delete</a></div>
- <div class="upload_font upload_del"><a href="#" class="upload_anc" onclick="new FileUpload('#{clientId}').beforeUploadFile('#{fileNameJs}'); #{this:getActionOnClick(context,component,'UPLOAD','true')}; return false;">Upload</a></div>
- </td>
- <td>
- <div class="upload_font upload_scroll"></div>
- </td>
- </tr>
- <jsp:scriptlet>
- <![CDATA[
- }
- ]]>
- </jsp:scriptlet>
- </table>
- </div>
- <a href="#" onclick="new FileUpload('#{clientId}').test(event);">crack</a>
- <div class="upload_list_width upload_footer_decor">
- <table border="0" cellpadding="0" cellspacing="0" id="upload_footer" style="width: 100%">
- <tr>
- <td class="upload_footer_firstcol" style="width: 40px; position: relative; text-align: left;">
- <div style="overflow: hidden; left: 7px; direction: rtl; position: relative; width: 48px;">
- <input value="...Add" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'"
- style="position: relative; width: 40px; top: 0px" />
- <input type="file"
- style="cursor: pointer; z-index: 3; left: 0px; height: 30px; position: absolute; top: 0px"
- class="hidden"
- onchange="new FileUpload('#{clientId}').addFile(this); #{this:getActionOnClick(context,component,'ADD','false')}; return false;" />
- </div>
- </td>
- <td style="position: relative; text-align: left; padding-left: 7px;">
- <input style="padding-left : 10; padding-right : 10; font-weight : bold" value="Upload" type="Button" class="upload_btn_over upload_font"
- onmouseover="this.className='upload_btn_over upload_font'"
- onmouseout="this.className='upload_btn_over upload_font'"
- onmousedown="this.className='upload_btn_press upload_font'"
- onclick="new FileUpload('#{clientId}').uploadAll(); return false;" />
-
- </td>
- <td style="position: relative; text-align: right; width: 10px">
- <div class="upload_font upload_footer_del">
- <input value="Clear" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'"
- onmousedown="this.className='upload_btn_press upload_font'"
- onclick="new FileUpload('#{clientId}').clearAll(); #{this:getActionOnClick(context,component,'CLEARALL','false')}; return false;" />
- </div>
- </td>
- <td>
- <div class="upload_font upload_scroll">
- </div>
- </td>
- </tr>
- </table>
- </div>
- <script>
- new FileUpload('#{clientId}').init('#{url}');
- </script>
-</div>
-</f:root>
-
-
-
\ No newline at end of file
Copied: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx (from rev 5814, trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload3.jspx)
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx (rev 0)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-05 15:37:21 UTC (rev 5824)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+ xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:h=" http://ajax4jsf.org/cdk/headers"
+ class="org.richfaces.renderkit.html.FileUploadRenderer"
+ baseclass="org.richfaces.org.jboss.seam.ui.renderkit.FileUploadRendererBase"
+ component="org.richfaces.org.jboss.seam.ui.component.UIFileUpload"
+ >
+ <h:styles>
+ /org/richfaces/renderkit/html/css/fileUpload.xcss,
+ /org/richfaces/renderkit/html/css/progressBar.xcss
+ </h:styles>
+
+ <h:scripts>
+ new org.ajax4jsf.javascript.PrototypeScript(),
+ new org.ajax4jsf.javascript.AjaxScript(),
+ /org/richfaces/renderkit/html/scripts/utils.js,
+ /org/richfaces/renderkit/html/scripts/json/json-dom.js,
+ /org/richfaces/renderkit/html/js/FileUpload.js,
+ /org/richfaces/renderkit/html/js/progressBar.js,
+ </h:scripts>
+
+ <f:clientId var="clientId" />
+
+<div class="upload_list_width upload_list_decor" id="#{clientId}">
+
+ <table class="upload_toolbar_decor">
+ <tr>
+ <td>
+ <div class="upload_button_border" style=" float:left;">
+ <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" onmouseout="this.className='upload_button upload_font'"
+ style="position: relative; overflow: hidden; direction: rtl; width:70px">
+ <div class="upload_button_content upload_font upload_ico upload_ico_add" style="">Add...</div>
+ <input type="file" style="cursor: pointer; z-index: 3; width: 0px; height: 22px; left: 0px; top: 0px; position: absolute"
+ class="hidden"
+ id="#{clientId}:file"
+ name="fileName"
+ onchange="#{this:getAddFileClick(context,component)}; return false;"/>
+ </div>
+ </div>
+ <div class="upload_button_border" style=" float:left;">
+ <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
+ onmouseout="this.className='upload_button upload_font'"
+ onclick="javascript: if ((new FileUpload('#{clientId}').getFilesCount()) > 0) { #{this:getUploadAllClick(context, component)} }">
+ <a href="#" class="upload_button_selection">
+ <div class="upload_button_content upload_font upload_ico upload_ico_start"><b>Upload</b>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="upload_button_border" style=" float:right">
+ <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
+ onmouseout="this.className='upload_button upload_font'"
+ onclick="#{this:getClearAllClick(context, component)}">
+ <a href="#" class="upload_button_selection">
+ <div class="upload_button_content upload_font upload_ico upload_ico_clear">Clear All</div>
+ </a>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ <div class="upload_list_width upload_list_overflow" id="#{clientId}:fileItems">
+
+ <jsp:scriptlet>
+ <![CDATA[
+ Iterator<org.richfaces.org.jboss.seam.ui.component.FileItem> it = component.getFileItems().iterator();
+ Integer i = 0;
+ while (it.hasNext()) {
+ org.richfaces.org.jboss.seam.ui.component.FileItem item = it.next();
+ String fullFileName = item.getFullFileName();
+ String fileName = item.getFileName();
+ variables.setVariable("fileName",fileName);
+ variables.setVariable("fullFileName",fullFileName);
+ variables.setVariable("n",i);
+ ]]>
+ </jsp:scriptlet>
+
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="upload_font upload_name upload_table_td">
+ <div class="upload_name_padding">
+ #{fileName}
+ </div>
+
+ <jsp:scriptlet>
+ <![CDATA[
+ renderProgress(context, component, item);
+ ]]>
+ </jsp:scriptlet>
+ <br/>
+
+ <div class="upload_name_padding">
+ <b>
+ <jsp:scriptlet>
+ <![CDATA[
+ renderLabel(context, component, item);
+ ]]>
+ </jsp:scriptlet>
+ </b>
+ </div>
+
+
+ </td>
+ <td class="upload_table_td" style="vertical-align: center;">
+ <jsp:scriptlet>
+ <![CDATA[
+ if (isCanClear(item)) {
+ ]]>
+ </jsp:scriptlet>
+ <div class="upload_font upload_del">
+ <a href="#" class="upload_anc"
+ onmousedown="return new FileUpload().confirm(this,'Clear','text-decoration:none; color:black','#{clientId}:clear#{n}');"
+ onclick="#{this:getClearFileClick(context, component)}"
+ style="text-decoration: none; color:black">Clear</a>
+ </div>
+ <jsp:scriptlet>
+ <![CDATA[
+ } else {
+ ]]>
+ </jsp:scriptlet>
+ <div class="upload_font upload_del">
+ <a href="#" class="upload_anc"
+ onmousedown="return new FileUpload().confirm(this,'Stop','text-decoration:none; color:black','#{clientId}:stop#{n}');"
+ onclick="new FileUpload('#{clientId}').stop(); #{this:getStopFileClick(context, component)}"
+ style="text-decoration: none; color:black">Stop</a>
+ </div>
+
+ <jsp:scriptlet>
+ <![CDATA[
+ }
+ ]]>
+ </jsp:scriptlet>
+ </td>
+ <td class="upload_table_td">
+ <div class="upload_font upload_scroll"></div>
+ </td>
+ </tr>
+ </table>
+
+ <jsp:scriptlet>
+ <![CDATA[
+ i++;
+ }
+ ]]>
+ </jsp:scriptlet>
+
+ <span>
+ <script type="text/javascript">
+ <f:call name="encodeUploadScript" />
+ </script>
+ </span>
+
+ </div>
+
+ <span>
+ <script type="text/javascript">
+ <f:call name="encodeInitialScript" />
+ </script>
+ </span>
+</div>
+
+
+</f:root>
\ No newline at end of file
Deleted: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload2.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload2.jspx 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload2.jspx 2008-02-05 15:37:21 UTC (rev 5824)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:h=" http://ajax4jsf.org/cdk/headers"
- class="org.richfaces.renderkit.html.FileUploadRenderer"
- baseclass="org.richfaces.org.jboss.seam.ui.renderkit.FileUploadRendererBase"
- component="org.richfaces.org.jboss.seam.ui.component.UIFileUpload"
- >
- <h:styles>
- /org/richfaces/renderkit/html/css/fileUpload.xcss
- </h:styles>
-
- <h:scripts>
- new org.ajax4jsf.javascript.PrototypeScript(),
- new org.ajax4jsf.javascript.AjaxScript(),
- /org/richfaces/renderkit/html/scripts/utils.js,
- /org/richfaces/renderkit/html/scripts/json/json-dom.js,
- /org/richfaces/renderkit/html/js/FileUpload.js,
- </h:scripts>
-
- <f:clientId var="clientId" />
-
-<div class="upload_list_width upload_list_decor" id="#{clientId}">
- <table class="upload_toolbar_decor">
- <tr>
- <td id="#{clientId}:header"></td>
- </tr>
- </table>
- <script>
-
- new FileUpload('#{clientId}').renderControl(<f:call name="encodeControlsMarkup" />,
- {'add': "<f:call name='encodeAddControl' />",
- 'upload': "<f:call name='encodeUploadControl' />",
- 'clean': "<f:call name='encodeCleanControl' />"});
- </script>
- <div class="upload_list_width upload_list_overflow">
-
- <table border="0" cellpadding="0" cellspacing="0" id="upload_table">
- <tr>
- <td class="upload_font upload_name">
- <div class="upload_name_padding">
- file_upload.html
- </div>
-
-
- <!--div class="upload_bar_exterior">
- <div class="upload_bar_shell">
- <div class="upload_bar_uploaded">
-
- </div>
- </div>
- </div-->
-
- <div class="upload_name_padding">
- <b>Done</b>
- </div>
-
-
- </td>
- <td>
- <div class="upload_font upload_del"><a href="#" class="upload_anc">Clear</a></div>
- <div class="upload_font upload_del"><br /></div>
- </td>
- <td>
- <div class="upload_font upload_scroll"></div>
- </td>
- </tr>
- </table>
- </div>
-</div>
-
-
-</f:root>
\ No newline at end of file
Deleted: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload3.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload3.jspx 2008-02-05 15:36:33 UTC (rev 5823)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload3.jspx 2008-02-05 15:37:21 UTC (rev 5824)
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:h=" http://ajax4jsf.org/cdk/headers"
- class="org.richfaces.renderkit.html.FileUploadRenderer"
- baseclass="org.richfaces.org.jboss.seam.ui.renderkit.FileUploadRendererBase"
- component="org.richfaces.org.jboss.seam.ui.component.UIFileUpload"
- >
- <h:styles>
- /org/richfaces/renderkit/html/css/fileUpload.xcss,
- /org/richfaces/renderkit/html/css/progressBar.xcss
- </h:styles>
-
- <h:scripts>
- new org.ajax4jsf.javascript.PrototypeScript(),
- new org.ajax4jsf.javascript.AjaxScript(),
- /org/richfaces/renderkit/html/scripts/utils.js,
- /org/richfaces/renderkit/html/scripts/json/json-dom.js,
- /org/richfaces/renderkit/html/js/FileUpload.js,
- /org/richfaces/renderkit/html/js/progressBar.js,
- </h:scripts>
-
- <f:clientId var="clientId" />
-
-<div class="upload_list_width upload_list_decor" id="#{clientId}">
-
- <table class="upload_toolbar_decor">
- <tr>
- <td>
- <div class="upload_button_border" style=" float:left;">
- <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" onmouseout="this.className='upload_button upload_font'"
- style="position: relative; overflow: hidden; direction: rtl; width:70px">
- <div class="upload_button_content upload_font upload_ico upload_ico_add" style="">Add...</div>
- <input type="file" style="cursor: pointer; z-index: 3; width: 0px; height: 22px; left: 0px; top: 0px; position: absolute"
- class="hidden"
- id="#{clientId}:file"
- name="fileName"
- onchange="#{this:getAddFileClick(context,component)}; return false;"/>
- </div>
- </div>
- <div class="upload_button_border" style=" float:left;">
- <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
- onmouseout="this.className='upload_button upload_font'"
- onclick="javascript: if ((new FileUpload('#{clientId}').getFilesCount()) > 0) { #{this:getUploadAllClick(context, component)} }">
- <a href="#" class="upload_button_selection">
- <div class="upload_button_content upload_font upload_ico upload_ico_start"><b>Upload</b>
- </div>
- </a>
- </div>
- </div>
- <div class="upload_button_border" style=" float:right">
- <div class="upload_button upload_font" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
- onmouseout="this.className='upload_button upload_font'"
- onclick="#{this:getClearAllClick(context, component)}">
- <a href="#" class="upload_button_selection">
- <div class="upload_button_content upload_font upload_ico upload_ico_clear">Clear All</div>
- </a>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
- <div class="upload_list_width upload_list_overflow" id="#{clientId}:fileItems">
-
- <jsp:scriptlet>
- <![CDATA[
- Iterator<org.richfaces.org.jboss.seam.ui.component.FileItem> it = component.getFileItems().iterator();
- Integer i = 0;
- while (it.hasNext()) {
- org.richfaces.org.jboss.seam.ui.component.FileItem item = it.next();
- String fullFileName = item.getFullFileName();
- String fileName = item.getFileName();
- variables.setVariable("fileName",fileName);
- variables.setVariable("fullFileName",fullFileName);
- variables.setVariable("n",i);
- ]]>
- </jsp:scriptlet>
-
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="upload_font upload_name upload_table_td">
- <div class="upload_name_padding">
- #{fileName}
- </div>
-
- <jsp:scriptlet>
- <![CDATA[
- renderProgress(context, component, item);
- ]]>
- </jsp:scriptlet>
- <br/>
-
- <div class="upload_name_padding">
- <b>
- <jsp:scriptlet>
- <![CDATA[
- renderLabel(context, component, item);
- ]]>
- </jsp:scriptlet>
- </b>
- </div>
-
-
- </td>
- <td class="upload_table_td">
- <jsp:scriptlet>
- <![CDATA[
- if (isCanClear(item)) {
- ]]>
- </jsp:scriptlet>
- <div class="upload_font upload_del">
- <a href="#" class="upload_anc"
- onmousedown="return new FileUpload().confirm(this,'Clear','text-decoration:none; color:#EAF0F8','#{clientId}:clear#{n}');"
- onclick="#{this:getClearFileClick(context, component)}"
- style="text-decoration: none; color:#EAF0F8">Clear</a>
- </div>
- <jsp:scriptlet>
- <![CDATA[
- } else {
- ]]>
- </jsp:scriptlet>
- <div class="upload_font upload_del">
- <a href="#" class="upload_anc"
- onclick="new FileUpload('#{clientId}').stop(); #{this:getStopFileClick(context, component)}">Stop</a>
- </div>
-
- <jsp:scriptlet>
- <![CDATA[
- }
- ]]>
- </jsp:scriptlet>
- <div class="upload_font upload_del"><br /></div>
- </td>
- <td class="upload_table_td">
- <div class="upload_font upload_scroll"></div>
- </td>
- </tr>
- </table>
-
- <jsp:scriptlet>
- <![CDATA[
- i++;
- }
- ]]>
- </jsp:scriptlet>
-
- <span>
- <script type="text/javascript">
- <f:call name="encodeUploadScript" />
- </script>
- </span>
-
- </div>
-
- <span>
- <script type="text/javascript">
- <f:call name="encodeInitialScript" />
- </script>
- </span>
-</div>
-
-
-</f:root>
\ No newline at end of file
More information about the richfaces-svn-commits
mailing list