[pLog-svn] r5940 - in plog/trunk: class/action/admin flash flash/swfupload js js/swfupload js/ui js/ui/assets js/ui/assets/upload locale/admin templates/admin
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Thu Sep 20 14:18:28 EDT 2007
Author: oscar
Date: 2007-09-20 14:18:27 -0400 (Thu, 20 Sep 2007)
New Revision: 5940
Added:
plog/trunk/flash/swfupload/
plog/trunk/flash/swfupload/swfupload-r6.2.swf
plog/trunk/js/swfupload/
plog/trunk/js/swfupload/swfupload-r6.2.js
plog/trunk/js/ui/assets/
plog/trunk/js/ui/assets/upload/
plog/trunk/js/ui/assets/upload/icon_progressbar.png
plog/trunk/js/ui/assets/upload/icon_success-16.png
plog/trunk/js/ui/assets/upload/icon_upload_cancel-16.png
plog/trunk/js/ui/assets/upload/icon_uploading-16.gif
plog/trunk/js/ui/assets/upload/upload.css
plog/trunk/js/ui/upload.js
Modified:
plog/trunk/class/action/admin/adminuploadblogtemplatefileaction.class.php
plog/trunk/js/ui/ui.js
plog/trunk/locale/admin/locale_en_UK.php
plog/trunk/templates/admin/editblogtemplate.template
plog/trunk/templates/admin/jslocale.template
plog/trunk/templates/admin/newblogtemplatefile_form.template
Log:
Preliminary version of the flash-based uploader. It's an extension of SWFUpload that I found elsewhere, based on the original code but with plenty of useful improvements and therefore I have named it accordingly so that we don't mix them up.
Everything seems to be working fine and we can now see pretty rotating icons and progress bars when uploading files, with multiple file uploading thrown in for the same price. For those cases when Flash (Flash 9 is required) or Javascript is not enabled, a plain HTML-based upload field is offered as done so far... But for once, I must admit that Flash here is really useful and we would have never been able to implement anything like this without it.
The following things are still missing and need to be checked:
- Error handling is currently not implemented, and error messages need to be localized.
- Apparently the Flash 9 player in Windows and Linux (but not OS X) will send a 'test' POST request if the file to be sent is smaller than 100kb or so. This is not a problem of SWFUpload but built into the Flash player itself, so I'll have to test this in Windows and if this is the case, build some code to ignore these test POSTs.
- More complex scenarios should be tested
Modified: plog/trunk/class/action/admin/adminuploadblogtemplatefileaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminuploadblogtemplatefileaction.class.php 2007-09-15 18:10:22 UTC (rev 5939)
+++ plog/trunk/class/action/admin/adminuploadblogtemplatefileaction.class.php 2007-09-20 18:18:27 UTC (rev 5940)
@@ -9,6 +9,8 @@
class AdminUploadBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
+
+ var $_log;
function __construct( $actionInfo, $request )
{
@@ -23,6 +25,8 @@
$this->blogId = $this->_blogInfo->getId();
$this->requirePermission( "update_blog_template" );
+
+ $this->_log = LoggerManager::getLogger( "debug" );
}
function validate()
@@ -33,11 +37,14 @@
function perform()
{
$this->_view = new AdminEditBlogTemplateView( $this->_blogInfo, $this->_templateId, $this->_path );
-
+
+ $this->_log->debug($_FILES["templateFile"]);
+
// process the files and make sure that we're uploading an allowed file
$uploads = new FileUploads();
$v = new UploadValidator();
foreach( $uploads as $upload ) {
+ $this->_log->debug("processing upload: ".$upload->getFileName());
if( $v->validate( $upload ) < 0) {
$this->_view->setErrorMessage( $this->_locale->tr("error_file_cannot_be_uploaded" ));
$this->setCommonData();
Added: plog/trunk/flash/swfupload/swfupload-r6.2.swf
===================================================================
(Binary files differ)
Property changes on: plog/trunk/flash/swfupload/swfupload-r6.2.swf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: plog/trunk/js/swfupload/swfupload-r6.2.js
===================================================================
--- plog/trunk/js/swfupload/swfupload-r6.2.js (rev 0)
+++ plog/trunk/js/swfupload/swfupload-r6.2.js 2007-09-20 18:18:27 UTC (rev 5940)
@@ -0,0 +1,803 @@
+/**
+ * SWFUpload 0.8.3 Revision 6.2 by Jacob Roberts, July 2007, linebyline.blogspot.com
+ * -------- -------- -------- -------- -------- -------- -------- --------
+ * SWFUpload is (c) 2006 Lars Huring and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * See Changelog.txt for version history
+ *
+ * + Added ServerData event callback
+ * = Changed upload_params to query_params
+ * + Added post_params
+ * + Added PreuploadValidation callback
+ * + Added automatic cookie transmission to workaround the Flash browser bug
+ * ? Added custom file post name setting
+ */
+
+/* *********** */
+/* Constructor */
+/* *********** */
+
+var SWFUpload = function (init_settings) {
+ // Remove background flicker in IE (read this: http://misterpixel.blogspot.com/2006/09/forensic-analysis-of-ie6.html)
+ // This doesn't have anything to do with SWFUpload but can help your UI behave better
+ try {
+ document.execCommand('BackgroundImageCache', false, true);
+ } catch (ex) {
+ this.debugMessage(ex);
+ }
+
+
+ try {
+ this.settings = {};
+ this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
+ this.movieElement = null;
+
+ // Setup global control tracking
+ SWFUpload.instances[this.movieName] = this;
+
+ // Load the settings. Load the Flash movie.
+ this.initSettings(init_settings);
+ this.loadFlash();
+
+ if (this.debug_enabled) {
+ this.displayDebugInfo();
+ }
+
+ } catch (ex) {
+ this.debugMessage(ex);
+ }
+};
+
+/* *************** */
+/* Static thingies */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.ERROR_CODE_HTTP_ERROR = -10;
+SWFUpload.ERROR_CODE_MISSING_UPLOAD_TARGET = -20;
+SWFUpload.ERROR_CODE_IO_ERROR = -30;
+SWFUpload.ERROR_CODE_SECURITY_ERROR = -40;
+SWFUpload.ERROR_CODE_FILE_EXCEEDS_SIZE_LIMIT = -50;
+SWFUpload.ERROR_CODE_ZERO_BYTE_FILE = -60;
+SWFUpload.ERROR_CODE_UPLOAD_LIMIT_EXCEEDED = -70;
+SWFUpload.ERROR_CODE_UPLOAD_FAILED = -80;
+SWFUpload.ERROR_CODE_QUEUE_LIMIT_EXCEEDED = -90;
+SWFUpload.ERROR_CODE_SPECIFIED_FILE_NOT_FOUND = -100;
+SWFUpload.ERROR_CODE_INVALID_FILETYPE = -110;
+
+/* ***************** */
+/* Instance Thingies */
+/* ***************** */
+// init is a private method that ensures that all the object settings are set, getting a default value if one was not assigned.
+
+SWFUpload.prototype.initSettings = function (init_settings) {
+
+ this.addSetting("control_id", this.movieName, "");
+
+ // UI setting
+ this.addSetting("ui_function", init_settings.ui_function, null);
+ this.addSetting("ui_container_id", init_settings.ui_container_id, "");
+ this.addSetting("degraded_container_id", init_settings.degraded_container_id, "");
+
+ // Upload backend settings
+ this.addSetting("upload_target_url", init_settings.upload_target_url, "");
+ this.addSetting("file_post_name", init_settings.file_post_name, "Filedata");
+ this.addSetting("post_params", init_settings.post_params, {});
+
+ // Flags
+ this.addSetting("begin_upload_on_queue", init_settings.begin_upload_on_queue, true);
+ this.addSetting("use_server_data_event", init_settings.use_server_data_event, false);
+ this.addSetting("validate_files", init_settings.validate_files, false);
+
+ // File Settings
+ this.addSetting("file_types", init_settings.file_types, "*.gif;*.jpg;*.png");
+ this.addSetting("file_types_description", init_settings.file_types_description, "Common Web Image Formats (gif, jpg, png)");
+ this.addSetting("file_size_limit", init_settings.file_size_limit, "1024");
+ this.addSetting("file_upload_limit", init_settings.file_upload_limit, "0");
+ this.addSetting("file_queue_limit", init_settings.file_queue_limit, "0");
+
+ // Flash Settings
+ this.addSetting("flash_url", init_settings.flash_url, "swfupload.swf");
+ this.addSetting("flash_width", init_settings.flash_width, "1px");
+ this.addSetting("flash_height", init_settings.flash_height, "1px");
+ this.addSetting("flash_color", init_settings.flash_color, "#FFFFFF");
+
+ // Debug Settings
+ this.addSetting("debug_enabled", init_settings.debug, false);
+ this.debug_enabled = this.getSetting("debug_enabled");
+
+ // Event Handlers
+ this.flashReady = this.retrieveSetting(init_settings.flash_ready_handler, this.flashReady);
+ this.dialogCancelled = this.retrieveSetting(init_settings.dialog_cancelled_handler, this.dialogCancelled);
+ this.fileQueued = this.retrieveSetting(init_settings.file_queued_handler, this.fileQueued);
+ this.fileValidation = this.retrieveSetting(init_settings.file_validation_handler, this.fileValidation);
+ this.fileProgress = this.retrieveSetting(init_settings.file_progress_handler, this.fileProgress);
+ this.fileCancelled = this.retrieveSetting(init_settings.file_cancelled_handler, this.fileCancelled);
+ this.fileComplete = this.retrieveSetting(init_settings.file_complete_handler, this.fileComplete);
+ this.queueStopped = this.retrieveSetting(init_settings.queue_stopped_handler, this.queueStopped);
+ this.queueComplete = this.retrieveSetting(init_settings.queue_complete_handler, this.queueComplete);
+ this.error = this.retrieveSetting(init_settings.error_handler, this.error);
+ this.debug = this.retrieveSetting(init_settings.debug_handler, this.debug);
+};
+
+// loadFlash is a private method that generates the HTML tag for the Flash
+// It then adds the flash to the "target" or to the body and stores a
+// reference to the flash element in "movieElement".
+SWFUpload.prototype.loadFlash = function () {
+ var html, target_element, container;
+
+ // Make sure an element with the ID we are going to use doesn't already exist
+ if (document.getElementById(this.movieName) !== null) {
+ return false;
+ }
+
+ // Get the body tag where we will be adding the flash movie
+ target_element = document.getElementsByTagName("body")[0];
+ if (typeof(target_element) === "undefined" || target_element === null) {
+ this.debugMessage('Could not find an element to add the Flash too. Failed to find element for "flash_container_id" or the BODY element.');
+ return false;
+ }
+
+ // Append the container and load the flash
+ container = document.createElement("div");
+ container.style.width = this.getSetting("flash_width");
+ container.style.height = this.getSetting("flash_height");
+
+ target_element.appendChild(container);
+ container.innerHTML = this.getFlashHTML(); // Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+};
+
+// Generates the embed/object tags needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+ var html = "";
+
+ // Create Mozilla Embed HTML
+ if (navigator.plugins && navigator.mimeTypes && navigator.mimeTypes.length) {
+ // Build the basic embed html
+ html = '<embed type="application/x-shockwave-flash" src="' + this.getSetting("flash_url") + '" width="' + this.getSetting("flash_width") + '" height="' + this.getSetting("flash_height") + '"';
+ html += ' id="' + this.movieName + '" name="' + this.movieName + '" ';
+ html += 'bgcolor="' + this.getSetting("flash_color") + '" quality="high" menu="false" flashvars="';
+
+ html += this.getFlashVars();
+
+ html += '" />';
+
+ // Create IE Object HTML
+ } else {
+
+ // Build the basic Object tag
+ html = '<object id="' + this.movieName + '" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="' + this.getSetting("flash_width") + '" height="' + this.getSetting("flash_height") + '">';
+ html += '<param name="movie" value="' + this.getSetting("flash_url") + '">';
+
+ html += '<param name="bgcolor" value="' + this.getSetting("flash_color") + '" />';
+ html += '<param name="quality" value="high" />';
+ html += '<param name="menu" value="false" />';
+
+ html += '<param name="flashvars" value="' + this.getFlashVars() + '" />';
+ html += '</object>';
+ }
+
+ return html;
+};
+
+// This private method builds the parameter string that will be passed
+// to flash.
+SWFUpload.prototype.getFlashVars = function () {
+ // Add the cookies to the backend string
+ var upload_target_url = this.getSetting("upload_target_url");
+ var param_string = this.buildParamString();
+
+ // Build the parameter string
+ var html = "";
+ html += "controlID=" + encodeURIComponent(this.getSetting("control_id"));
+ html += "&uploadTargetURL=" + encodeURIComponent(upload_target_url);
+ html += "¶ms=" + encodeURIComponent(param_string);
+ html += "&filePostName=" + encodeURIComponent(this.getSetting("file_post_name"));
+ html += "&beginUploadOnQueue=" + encodeURIComponent(this.getSetting("begin_upload_on_queue"));
+ html += "&useServerDataEvent=" + encodeURIComponent(this.getSetting("use_server_data_event"));
+ html += "&fileValidation=" + encodeURIComponent(this.getSetting("validate_files"));
+ html += "&fileTypes=" + encodeURIComponent(this.getSetting("file_types"));
+ html += "&fileTypesDescription=" + encodeURIComponent(this.getSetting("file_types_description"));
+ html += "&fileSizeLimit=" + encodeURIComponent(this.getSetting("file_size_limit"));
+ html += "&fileUploadLimit=" + encodeURIComponent(this.getSetting("file_upload_limit"));
+ html += "&fileQueueLimit=" + encodeURIComponent(this.getSetting("file_queue_limit"));
+ html += "&debugEnabled=" + encodeURIComponent(this.getSetting("debug_enabled"));
+
+ return html;
+};
+
+SWFUpload.prototype.getMovieElement = function () {
+ if (typeof(this.movieElement) === "undefined" || this.movieElement === null) {
+ this.movieElement = document.getElementById(this.movieName);
+
+ // Fix IEs "Flash can't callback when in a form" issue (http://www.extremefx.com.ar/blog/fixing-flash-external-interface-inside-form-on-internet-explorer)
+ // Removed because Revision 6 always adds the flash to the body (inside a containing div)
+ //if (typeof(window[this.movieName]) === "undefined" || window[this.moveName] !== this.movieElement) {
+ // window[this.movieName] = this.movieElement;
+ //}
+ }
+
+ return this.movieElement;
+};
+
+SWFUpload.prototype.buildParamString = function () {
+ var post_params = this.getSetting("post_params");
+ var param_string_pairs = [];
+ var i, value, name;
+
+ // Retrieve the user defined parameters
+ if (typeof(post_params) === "object") {
+ for (name in post_params) {
+ if (post_params.hasOwnProperty(name)) {
+ if (typeof(post_params[name]) === "string" /*&& upload_params[name] != ""*/) {
+ param_string_pairs.push(encodeURIComponent(name) + "=" + encodeURIComponent(post_params[name]));
+ }
+ }
+ }
+ }
+
+ return param_string_pairs.join("&");
+};
+
+// This private method "loads" the UI. If a target was specified then it is assumed that "display: none" was set and
+// it does a "display: block" so the UI is shown. Then if a degraded_target is specified it hides it by setting "display: none"
+// If you want SWFUpload to do something else then provide a "ui_function" setting and that will be called instead.
+SWFUpload.prototype.showUI = function () {
+ var ui_container_id, ui_target, degraded_container_id, degraded_target;
+ try {
+ ui_container_id = this.getSetting("ui_container_id");
+
+ if (ui_container_id !== "") {
+ ui_target = document.getElementById(ui_container_id);
+ if (ui_target !== null) {
+ ui_target.style.display = "block";
+
+ // Now that the UI has been taken care of hide the degraded UI
+ degraded_container_id = this.getSetting("degraded_container_id");
+ if (degraded_container_id !== "") {
+ degraded_target = document.getElementById(degraded_container_id);
+ if (degraded_target !== null) {
+ degraded_target.style.display = "none";
+ }
+ }
+ }
+ }
+
+ } catch (ex) {
+ this.debugMessage(ex);
+ }
+};
+
+// Saves a setting. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+ if (typeof(value) === "undefined" || value === null) {
+ this.settings[name] = default_value;
+ } else {
+ this.settings[name] = value;
+ }
+
+ return this.settings[name];
+};
+
+// Gets a setting. Returns null if it wasn't found.
+SWFUpload.prototype.getSetting = function (name) {
+ if (typeof(this.settings[name]) === "undefined") {
+ return "";
+ } else {
+ return this.settings[name];
+ }
+};
+
+// Gets a setting, if the setting is undefined then return the default value
+// This does not affect or use the interal setting object.
+SWFUpload.prototype.retrieveSetting = function (value, default_value) {
+ if (typeof(value) === "undefined" || value === null) {
+ return default_value;
+ } else {
+ return value;
+ }
+};
+
+
+// This method is used when debugging is enabled.
+// It loops through all the settings and displays
+// them in the debug Console.
+SWFUpload.prototype.displayDebugInfo = function () {
+ var key, debug_message = "";
+
+ debug_message += "----- DEBUG OUTPUT ----\nID: " + this.getMovieElement().id + "\n";
+
+ debug_message += this.outputObject(this.settings);
+
+ debug_message += "----- DEBUG OUTPUT END ----\n";
+ debug_message += "\n";
+
+ this.debugMessage(debug_message);
+};
+SWFUpload.prototype.outputObject = function (object, prefix) {
+ var output = "", key;
+
+ if (typeof(prefix) !== "string") {
+ prefix = "";
+ }
+ if (typeof(object) !== "object") {
+ return "";
+ }
+
+ for (key in object) {
+ if (object.hasOwnProperty(key)) {
+ if (typeof(object[key]) === "object") {
+ output += (prefix + key + ": { \n" + this.outputObject(object[key], "\t" + prefix) + prefix + "}" + "\n");
+ } else {
+ output += (prefix + key + ": " + object[key] + "\n");
+ }
+ }
+ }
+
+ return output;
+};
+
+/* *****************************
+ -- Flash control methods --
+ Your UI should use these
+ to operate SWFUpload
+ ***************************** */
+
+SWFUpload.prototype.browse = function () {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.Browse) === "function") {
+ try {
+ movie_element.Browse();
+ }
+ catch (ex) {
+ this.debugMessage("Could not call browse: " + ex);
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+
+};
+
+// Begins the uploads (if begin_upload_on_queue is disabled)
+// The file_id is optional. If specified only that file will be uploaded. If not specified SWFUpload will
+// begin to process the queue.
+SWFUpload.prototype.startUpload = function (file_id) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.StartUpload) === "function") {
+ try {
+ movie_element.StartUpload(file_id);
+ }
+ catch (ex) {
+ this.debugMessage("Could not call StartUpload: " + ex);
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+
+};
+
+// Cancels the current uploading item. If no item is uploading then nothing happens.
+SWFUpload.prototype.cancelUpload = function (file_id) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.CancelUpload) === "function") {
+ try {
+ movie_element.CancelUpload(file_id);
+ }
+ catch (ex) {
+ this.debugMessage("Could not call CancelUpload");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+
+};
+
+// Cancels all the files in the queue. Including any current uploads.
+SWFUpload.prototype.cancelQueue = function () {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.CancelQueue) === "function") {
+ try {
+ movie_element.CancelQueue();
+ }
+ catch (ex) {
+ this.debugMessage("Could not call CancelQueue");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+
+};
+
+// Stops the current upload. The file is re-queued. If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.StopUpload) === "function") {
+ try {
+ movie_element.StopUpload();
+ }
+ catch (ex) {
+ this.debugMessage("Could not call StopUpload");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+
+};
+
+
+SWFUpload.prototype.addFileParam = function (file_id, name, value) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.AddFileParam) === "function") {
+ try {
+ return movie_element.AddFileParam(file_id, name, value);
+ }
+ catch (ex) {
+ this.debugMessage("Could not call AddFileParam");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+};
+
+SWFUpload.prototype.removeFileParam = function (file_id, name) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.RemoveFileParam) === "function") {
+ try {
+ return movie_element.RemoveFileParam(file_id, name);
+ }
+ catch (ex) {
+ this.debugMessage("Could not call AddFileParam");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element");
+ }
+
+};
+
+SWFUpload.prototype.setUploadTargetURL = function (url) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetUploadTargetURL) === "function") {
+ try {
+ this.addSetting("upload_target_url", url);
+ movie_element.SetUploadTargetURL(this.getSetting("upload_target_url"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetUploadTargetURL");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetUploadTargetURL");
+ }
+};
+
+SWFUpload.prototype.setPostParams = function (param_object) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetPostParams) === "function") {
+ try {
+ this.addSetting("post_params", param_object);
+ movie_element.SetPostParams(this.getSetting("post_params"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetPostParams");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetPostParams");
+ }
+};
+
+SWFUpload.prototype.setFileTypes = function (types, description) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetFileTypes) === "function") {
+ try {
+ this.addSetting("file_types", types);
+ this.addSetting("file_types_description", description);
+ movie_element.SetFileTypes(this.getSetting("file_types"), this.getSetting("file_types_description"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetFileTypes");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetFileTypes");
+ }
+};
+
+SWFUpload.prototype.setFileSizeLimit = function (file_size_limit) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetFileSizeLimit) === "function") {
+ try {
+ this.addSetting("file_size_limit", file_size_limit);
+ movie_element.SetFileSizeLimit(this.getSetting("file_size_limit"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetFileSizeLimit");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetFileSizeLimit");
+ }
+};
+
+SWFUpload.prototype.setFileUploadLimit = function (file_upload_limit) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetFileUploadLimit) === "function") {
+ try {
+ this.addSetting("file_upload_limit", file_upload_limit);
+ movie_element.SetFileUploadLimit(this.getSetting("file_upload_limit"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetFileUploadLimit");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetFileUploadLimit");
+ }
+};
+
+SWFUpload.prototype.setFileQueueLimit = function (file_queue_limit) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetFileQueueLimit) === "function") {
+ try {
+ this.addSetting("file_queue_limit", file_queue_limit);
+ movie_element.SetFileQueueLimit(this.getSetting("file_queue_limit"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetFileQueueLimit");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetFileQueueLimit");
+ }
+};
+
+SWFUpload.prototype.setBeginUploadOnQueue = function (begin_upload_on_queue) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetBeginUploadOnQueue) === "function") {
+ try {
+ this.addSetting("begin_upload_on_queue", begin_upload_on_queue);
+ movie_element.SetBeginUploadOnQueue(this.getSetting("begin_upload_on_queue"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetBeginUploadOnQueue");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetBeginUploadOnQueue");
+ }
+};
+
+SWFUpload.prototype.setUseServerDataEvent = function (use_server_data_event) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetUseServerDataEvent) === "function") {
+ try {
+ this.addSetting("use_server_data_event", use_server_data_event);
+ movie_element.SetUseServerDataEvent(this.getSetting("use_server_data_event"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetUseServerDataEvent");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetUseServerDataEvent");
+ }
+};
+
+SWFUpload.prototype.setValidateFiles = function (validate_files) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetValidateFiles) === "function") {
+ try {
+ this.addSetting("validate_files", validate_files);
+ movie_element.SetValidateFiles(this.getSetting("validate_files"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetValidateFiles");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetValidateFiles");
+ }
+};
+
+SWFUpload.prototype.setFilePostName = function (file_post_name) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetFilePostName) === "function") {
+ try {
+ this.addSetting("file_post_name", file_post_name);
+ movie_element.SetFilePostName(this.getSetting("file_post_name"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetFilePostName");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetFilePostName");
+ }
+};
+
+SWFUpload.prototype.setDebugEnabled = function (debug_enabled) {
+ var movie_element = this.getMovieElement();
+ if (movie_element !== null && typeof(movie_element.SetDebugEnabled) === "function") {
+ try {
+ this.addSetting("debug_enabled", debug_enabled);
+ this.debug_enabled = this.getSetting("debug_enabled");
+ movie_element.SetDebugEnabled(this.getSetting("debug_enabled"));
+ }
+ catch (ex) {
+ this.debugMessage("Could not call SetDebugEnabled");
+ }
+ } else {
+ this.debugMessage("Could not find Flash element in SetDebugEnabled");
+ }
+};
+
+
+
+/* *******************************
+ Default Event Handlers
+******************************* */
+// This is the callback method that the Flash movie will call when it has been loaded and is ready to go.
+// Calling this or showUI "manually" bypass the Flash Detection built in to SWFUpload.
+// FlashReady should not generally be overwritten. Use a ui_function setting if you want to control the UI loading after the flash has loaded.
+SWFUpload.prototype.flashReady = function () {
+ var ui_function;
+ try {
+ this.debugMessage("Flash called back and is ready.");
+
+ ui_function = this.getSetting("ui_function");
+ if (typeof(ui_function) === "function") {
+ ui_function.apply(this);
+ } else {
+ this.showUI();
+ }
+ } catch (ex) {
+ this.debugMessage(ex);
+ }
+};
+
+// Called when the user cancels the File browser window.
+SWFUpload.prototype.dialogCancelled = function () {
+ this.debugMessage("browse Dialog Cancelled.");
+};
+
+// Called once for each file the user selects
+SWFUpload.prototype.fileQueued = function (file) {
+ this.debugMessage("File Queued: " + file.id);
+};
+
+// Called before a file is queued if the validateFiles setting is true. This function
+// must return true or false to indicate to flash whether the file should be
+// uploaded.
+SWFUpload.prototype.fileValidation = function (file) {
+ this.debugMessage("File Validation: " + file.id);
+
+ return true;
+};
+
+// Called during upload as the file progresses
+SWFUpload.prototype.fileProgress = function (file, bytes_complete) {
+ this.debugMessage("File Progress: " + file.id + ", Bytes: " + bytes_complete);
+};
+
+// Called after a file is cancelled
+SWFUpload.prototype.fileCancelled = function (file) {
+ this.debugMessage("File Cancelled: " + file.id);
+};
+
+// Called when a file upload has completed
+SWFUpload.prototype.fileComplete = function (file, server_data) {
+ this.debugMessage("File Complete: " + file.id);
+ if (typeof(server_data) !== "undefined") {
+ this.debugMessage("Upload Response Data: " + server_data);
+ }
+};
+
+// Called when at least 1 file has been uploaded and there are no files remaining in the queue.
+SWFUpload.prototype.queueComplete = function (file_upload_count) {
+ this.debugMessage("Queue Complete. Files Uploaded:" + file_upload_count);
+};
+
+// Called when the upload is stopped.
+SWFUpload.prototype.queueStopped = function (file) {
+ this.debugMessage("Queue Stopped. File Stopped:" + file.id);
+};
+
+// Called by SWFUpload JavaScript and Flash flash functions when debug is enabled
+SWFUpload.prototype.debug = function (message) {
+ this.debugMessage(message);
+};
+
+// Called when an error occurs. Use errcode to determine which error occurred.
+SWFUpload.prototype.error = function (errcode, file, msg) {
+ try {
+ switch (errcode) {
+ case SWFUpload.ERROR_CODE_HTTP_ERROR:
+ this.debugMessage("Error Code: HTTP Error, File name: " + file.name + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_MISSING_UPLOAD_TARGET:
+ this.debugMessage("Error Code: No backend file, File name: " + file.name + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_IO_ERROR:
+ this.debugMessage("Error Code: IO Error, File name: " + file.name + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_SECURITY_ERROR:
+ this.debugMessage("Error Code: Security Error, File name: " + file.name + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_FILE_EXCEEDS_SIZE_LIMIT:
+ this.debugMessage("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_ZERO_BYTE_FILE:
+ this.debugMessage("Error Code: Zero Byte File, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_UPLOAD_LIMIT_EXCEEDED:
+ this.debugMessage("Error Code: Upload limit reached, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_QUEUE_LIMIT_EXCEEDED:
+ this.debugMessage("Error Code: Upload limit reached, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_UPLOAD_FAILED:
+ this.debugMessage("Error Code: Upload Initialization exception, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_SPECIFIED_FILE_NOT_FOUND:
+ this.debugMessage("Error Code: File ID specified for upload was not found, Message: " + msg);
+ break;
+ case SWFUpload.ERROR_CODE_INVALID_FILETYPE:
+ this.debugMessage("Error Code: File extension is not allowed, Message: " + msg);
+ break;
+ default:
+ this.debugMessage("Error Code: Unhandled error occured. Errorcode: " + errcode);
+ }
+ } catch (ex) {
+ this.debugMessage(ex);
+ }
+};
+
+/* **********************************
+ Debug Console
+ The debug console is a self contained, in page location
+ for debug message to be sent. The Debug Console adds
+ itself to the body if necessary.
+
+ The console is automatically scrolled as messages appear.
+ ********************************** */
+SWFUpload.prototype.debugMessage = function (message) {
+ var exception_message, exception_values;
+
+ if (this.debug_enabled) {
+ if (typeof(message) === "object" && typeof(message.name) === "string" && typeof(message.message) === "string") {
+ exception_message = "";
+ exception_values = [];
+ for (var key in message) {
+ exception_values.push(key + ": " + message[key]);
+ }
+ exception_message = exception_values.join("\n");
+ exception_values = exception_message.split("\n");
+ exception_message = "EXCEPTION: " + exception_values.join("\nEXCEPTION: ");
+ SWFUpload.Console.writeLine(exception_message);
+ } else {
+ SWFUpload.Console.writeLine(message);
+ }
+ }
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+ var console, documentForm;
+
+ try {
+ console = document.getElementById("SWFUpload_Console");
+
+ if (!console) {
+ documentForm = document.createElement("form");
+ document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+ console = document.createElement("textarea");
+ console.id = "SWFUpload_Console";
+ console.style.fontFamily = "monospace";
+ console.setAttribute("wrap", "off");
+ console.wrap = "off";
+ console.style.overflow = "auto";
+ console.style.width = "700px";
+ console.style.height = "350px";
+ console.style.margin = "5px";
+ documentForm.appendChild(console);
+ }
+
+ console.value += message + "\n";
+
+ console.scrollTop = console.scrollHeight - console.clientHeight;
+ } catch (ex) {
+ alert("Exception: " + ex.name + " Message: " + ex.message);
+ }
+};
Added: plog/trunk/js/ui/assets/upload/icon_progressbar.png
===================================================================
(Binary files differ)
Property changes on: plog/trunk/js/ui/assets/upload/icon_progressbar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: plog/trunk/js/ui/assets/upload/icon_success-16.png
===================================================================
(Binary files differ)
Property changes on: plog/trunk/js/ui/assets/upload/icon_success-16.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: plog/trunk/js/ui/assets/upload/icon_upload_cancel-16.png
===================================================================
(Binary files differ)
Property changes on: plog/trunk/js/ui/assets/upload/icon_upload_cancel-16.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: plog/trunk/js/ui/assets/upload/icon_uploading-16.gif
===================================================================
(Binary files differ)
Property changes on: plog/trunk/js/ui/assets/upload/icon_uploading-16.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: plog/trunk/js/ui/assets/upload/upload.css
===================================================================
--- plog/trunk/js/ui/assets/upload/upload.css (rev 0)
+++ plog/trunk/js/ui/assets/upload/upload.css 2007-09-20 18:18:27 UTC (rev 5940)
@@ -0,0 +1,42 @@
+#Lifetype_UI_UploadQueue ul
+{
+ list-style-type: none;
+ display: inline;
+}
+
+.Lifetype_UI_QueueItem
+{
+ position:relative;
+}
+
+.Lifetype_UI_Upload_uploadCompleted
+{
+
+}
+
+.Lifetype_UI_Upload_CancelLink
+{
+
+}
+
+.Lifetype_UI_Upload_CancelIcon
+{
+ width: 16px;
+ height: 16px;
+ border: 0px;
+}
+
+.Lifetype_UI_Upload_FileUploading
+{
+
+}
+
+span.Lifetype_UI_ProgressBar {
+ background-color:#FFFFFF;
+ display:block;
+ font-size:10px;
+ height:4px;
+ margin-bottom:10px;
+ margin-top:2px;
+ width:200px;
+}
\ No newline at end of file
Modified: plog/trunk/js/ui/ui.js
===================================================================
--- plog/trunk/js/ui/ui.js 2007-09-15 18:10:22 UTC (rev 5939)
+++ plog/trunk/js/ui/ui.js 2007-09-20 18:18:27 UTC (rev 5940)
@@ -317,4 +317,25 @@
{
anchor.target = "_blank";
return( true );
+}
+
+/**
+ * Class that formats file sizes into readable data
+ */
+Lifetype.UI.Misc.nicerFileSize = function( fileSize )
+{
+ var result;
+ if( fileSize < 1024 ) {
+ result = fileSize + Lifetype.Locale.tr( " bytes" );
+ }
+ else {
+ if( fileSize < (1024 * 1024 )) {
+ result = Math.round((fileSize / 1024)) + Lifetype.Locale.tr( " kb" );
+ }
+ else {
+ result = Math.round((fileSize / ( 1024 * 1024 ))) + Lifetype.Locale.tr( " mb" );
+ }
+ }
+
+ return( result );
}
\ No newline at end of file
Added: plog/trunk/js/ui/upload.js
===================================================================
--- plog/trunk/js/ui/upload.js (rev 0)
+++ plog/trunk/js/ui/upload.js 2007-09-20 18:18:27 UTC (rev 5940)
@@ -0,0 +1,323 @@
+// ----------
+//
+// Flash-based uploader
+//
+// ----------
+Lifetype.UI.Upload = function() {}
+
+/**
+ * Events generated by this class, to which other code can hook up to
+ */
+Lifetype.UI.Upload.Events = function() {}
+Lifetype.UI.Upload.Events.allFilesUploaded = new YAHOO.util.CustomEvent('allFilesUploaded');
+Lifetype.UI.Upload.Events.fileUploaded = new YAHOO.util.CustomEvent('fileUploaded');
+
+/**
+ * The Flash upload object
+ */
+Lifetype.UI.Upload.swfu = null;
+
+/**
+ * Keeps track of the total amount of bytes queued to be uploaded
+ */
+Lifetype.UI.Upload.totalSize = 0;
+
+/**
+ * Controls whether there was an error at some point
+ * uploading data or not
+ */
+Lifetype.UI.Upload.uploadSuccessful = true;
+
+/**
+ * Initializer method
+ */
+Lifetype.UI.Upload.init = function( params )
+{
+ Lifetype.UI.Upload.swfu = new SWFUpload({
+ // Backend settings
+ upload_target_url: params.url, // Relative to the SWF file
+ file_post_name: params.fieldName,
+
+ // Flash file settings
+ file_size_limit : "10240", // 10 MB
+ file_types : "*.*", // or you could use something like: "*.doc;*.wpd;*.pdf",
+ file_types_description : "All Files",
+ //file_upload_limit : "1",
+ begin_upload_on_queue : false,
+ use_server_data_event : false,
+ validate_files: false,
+
+ // Event handler settings
+ file_queued_handler: Lifetype.UI.Upload.fileQueued,
+ file_progress_handler : Lifetype.UI.Upload.uploadProgress,
+ file_complete_handler : Lifetype.UI.Upload.uploadFileComplete,
+ queue_complete_handler : Lifetype.UI.Upload.uploadQueueComplete,
+ error_handler : Lifetype.UI.Upload.uploadError,
+
+ // Flash Settings
+ flash_url : Lifetype.Config.getValue( "base_url") + "/flash/swfupload/swfupload-r6.2.swf", // Relative to this file
+
+ // UI settings
+ ui_function: Lifetype.UI.Upload.showUI,
+ ui_container_id : params.container,
+ degraded_container_id : "degradedUI",
+
+ // Debug settings
+ debug: true
+ });
+
+ // This is a setting that my Handlers will use. It's not part of SWFUpload
+ // But I can add it to the SWFUpload object and then use it where I need to
+ Lifetype.UI.Upload.swfu.addSetting("progress_target", "fsUploadProgress");
+
+ // reset the counter
+ Lifetype.UI.Upload.totalSize = 0;
+
+ // pointer to the parameters
+ Lifetype.UI.Upload.params = params;
+ }
+
+/**
+ * Render the UI
+ */
+Lifetype.UI.Upload.showUI = function()
+{
+ // place our 'browse...' link
+ var browseLink = document.createElement( 'a' );
+ browseLink.href = '#';
+ browseLink.onclick = Lifetype.UI.Upload.browse;
+ browseLink.appendChild( document.createTextNode( tr("browse" )));
+
+ // place our container for the queue
+ var queueContainer = document.createElement( 'div' );
+ queueContainer.id = 'Lifetype_UI_UploadQueue';
+ var ul = document.createElement( 'ul' );
+ queueContainer.appendChild( ul );
+
+ // append all the elements to the main container
+ var container = Lifetype.Dom.$( Lifetype.UI.Upload.params.container );
+ container.appendChild( browseLink );
+ container.appendChild( queueContainer );
+
+ // add our 'upload' button
+ var uploadButton = Lifetype.Dom.$( Lifetype.UI.Upload.params.uploadButton );
+ if( uploadButton ) {
+ uploadButton.type = 'button';
+ uploadButton.onclick = Lifetype.UI.Upload.uploadQueue;
+ }
+ else
+ window.alert( 'Could not find the upload button: ' + params.uploadButton );
+
+ this.showUI(); // Let SWFUpload finish loading the UI.
+}
+
+/**
+ * Queue a new file
+ */
+Lifetype.UI.Upload.fileQueued = function( file, queuelength )
+{
+ var listingfiles = document.getElementById("Lifetype_UI_UploadQueue");
+
+ listingfiles = listingfiles.getElementsByTagName("ul")[0];
+
+ var li = document.createElement("li");
+ li.id = file.id;
+ li.className = "Lifetype_UI_QueueItem";
+ li.innerHTML = "<a id='" + file.id + "deletebtn' class='Lifetype_UI_Upload_CancelButton' href='javascript:Lifetype.UI.Upload.removeFile(\"" + file.id + "\");'><!-- IE -->" +
+ "<img src=\"js/ui/assets/upload/icon_upload_cancel-16.png\" alt=\"cancel\" class=\"Lifetype_UI_Upload_CancelIcon\" id='" + file.id + "delete_icon' /></a> " +
+ file.name + " (" + Lifetype.UI.Misc.nicerFileSize( file.size ) + ") <span class='Lifetype_UI_ProgressBar' id='" + file.id + "progress'></span>";
+
+ listingfiles.appendChild(li);
+
+ var queueinfo = document.getElementById("queueinfo");
+ queueinfo.innerHTML = queuelength + " files queued";
+ document.getElementById(Lifetype.UI.Upload.swfu.movieName + "UploadBtn").style.display = "block";
+ document.getElementById("cancelqueuebtn").style.display = "block";
+
+ // increase the total size
+ Lifetype.UI.Upload.totalSize += file.size;
+}
+
+/**
+ * Remove a file from the queue
+ */
+Lifetype.UI.Upload.removeFile = function( fileId )
+{
+ // remove the element from the list completely
+ var li = document.getElementById( fileId );
+ li.parentNode.removeChild( li );
+
+ // and remove it from the upload queue
+ Lifetype.UI.Upload.swfu.cancelUpload( fileId );
+}
+
+/**
+ * Starts the upload process
+ */
+Lifetype.UI.Upload.uploadQueue = function()
+{
+ Lifetype.UI.Upload.swfu.startUpload();
+}
+
+/**
+ * Show the browse dialog
+ */
+Lifetype.UI.Upload.browse = function()
+{
+ Lifetype.UI.Upload.swfu.browse();
+}
+
+/**
+ * Error handler
+ *
+ * @param error_code
+ * @param fileObj
+ * @param message
+ *
+ * :TODO: this needs to be improved
+ */
+Lifetype.UI.Upload.uploadError = function(error_code, fileObj, message)
+{
+ try {
+ // Handle this error separately because we don't want to create a FileProgress element for it.
+ switch(error_code) {
+ case SWFUpload.ERROR_CODE_QUEUE_LIMIT_EXCEEDED:
+ alert("You have attempted to queue too many files.\n" + (message == 0 ? "You have reached the upload limit." : "You may select " + (message > 1 ? "up to " + message + " files." : "one file.")));
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_MISSING_UPLOAD_TARGET:
+ alert("There was a configuration error. You will not be able to upload a resume at this time.");
+ this.debugMessage("Error Code: No backend file, File name: " + file.name + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_FILE_EXCEEDS_SIZE_LIMIT:
+ alert("The file you selected is too big.");
+ this.debugMessage("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_ZERO_BYTE_FILE:
+ alert("The file you select is empty. Please select another file.");
+ this.debugMessage("Error Code: Zero byte file, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_UPLOAD_LIMIT_EXCEEDED:
+ alert("You may only upload 1 file.");
+ this.debugMessage("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_INVALID_FILETYPE:
+ alert("The file you choose is not an allowed file type.");
+ this.debugMessage("Error Code: Invalid File Type, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ default:
+ alert("An error occurred in the upload. Try again later.");
+ this.debugMessage("Error Code: " + error_code + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ }
+
+ switch(error_code) {
+ case SWFUpload.ERROR_CODE_HTTP_ERROR:
+ progress.SetStatus("Upload Error");
+ this.debugMessage("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.ERROR_CODE_UPLOAD_FAILED:
+ progress.SetStatus("Upload Failed.");
+ this.debugMessage("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.ERROR_CODE_IO_ERROR:
+ progress.SetStatus("Server (IO) Error");
+ this.debugMessage("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.ERROR_CODE_SECURITY_ERROR:
+ progress.SetStatus("Security Error");
+ this.debugMessage("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
+ break;
+ }
+ } catch (e) {}
+}
+
+/**
+ * @param file
+ * @param position
+ * @param queuelength
+ */
+Lifetype.UI.Upload.uploadFileStart = function(file, position, queuelength)
+{
+ var li = document.getElementById(file.id);
+ li.className += " fileUploading";
+
+ // hide the cancel button, we don't allow to cancel at this point anymore
+ var cancelButton = Lifetype.Dom.$( 'deletebtn' );
+ cancelButton.style.display = 'none';
+}
+
+/**
+ * Event generated every time some data is sent to a server
+ *
+ * @param file
+ * @param bytesLoaded
+ */
+Lifetype.UI.Upload.uploadProgress = function(file, bytesLoaded)
+{
+ var li = document.getElementById(file.id);
+ li.className += " Lifetype_UI_Upload_FileUploading";
+
+ // hide the cancel button, we don't allow to cancel at this point anymore
+ var cancelButton = Lifetype.Dom.$( file.id + 'deletebtn' );
+ cancelButton.onclick = null;
+
+ // change the icon only if it's not already the one we want
+ cancelIcon = Lifetype.Dom.$( file.id + 'delete_icon' );
+ var uploadingIconUrl = Lifetype.Config.getValue( 'base_url' ) + "/js/ui/assets/upload/icon_uploading-16.gif";
+ if( cancelIcon.src != uploadingIconUrl )
+ cancelIcon.src = uploadingIconUrl;
+
+ // display the progress bar
+ var progress = Lifetype.Dom.$( file.id + "progress" );
+ var percent = Math.ceil(( bytesLoaded / file.size ) * 200 );
+ progress.style.width = percent + "px";
+ progress.style.backgroundColor = "green";
+}
+
+/**
+ * Callback generated when a file is totally uploaded
+ *
+ * @param file a file object
+ * @param serverData If use_server_data_event is set to 'true', this will contain
+ * the output that was returned by the server
+ */
+Lifetype.UI.Upload.uploadFileComplete = function(file, serverData )
+{
+ // if the file was loaded in one go, uploadProgress will not be called,
+ // so we need to make sure that we fill the progress bar completely to
+ // indicate completion
+ Lifetype.UI.Upload.uploadProgress( file, file.size );
+
+ // modify the <li> element that contains the file name
+ var li = document.getElementById(file.id);
+ li.className = "Lifetype_UI_Upload_uploadCompleted";
+
+ // change the 'delete' button into an 'success' button
+ var deleteBtn = Lifetype.Dom.$( file.id + 'deletebtn' );
+ deleteBtn.onclick = '';
+ var deleteIcon = Lifetype.Dom.$( file.id + 'delete_icon' );
+ deleteIcon.src = Lifetype.Config.getValue( 'base_url' ) + '/js/ui/assets/upload/icon_success-16.png';
+
+ // throw our custom event
+ Lifetype.UI.Upload.Events.fileUploaded.fire( { file:file, upload:Lifetype.UI.Uploads.swfu } );
+}
+
+/**
+ * Event generated when the whole queue has been uploaded
+ */
+Lifetype.UI.Upload.uploadQueueComplete = function(file)
+{
+ /*var div = document.getElementById("queueinfo");
+ div.innerHTML = "All files uploaded..."
+ document.getElementById("cancelqueuebtn").style.display = "none";*/
+
+ // notify other code that the queue has been completely uploaded
+ Lifetype.UI.Upload.Events.allFilesUploaded.fire( { file:file, upload:Lifetype.UI.Uploads.swfu } );
+}
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php 2007-09-15 18:10:22 UTC (rev 5939)
+++ plog/trunk/locale/admin/locale_en_UK.php 2007-09-20 18:18:27 UTC (rev 5940)
@@ -1351,4 +1351,6 @@
$messages['ok'] = 'Ok';
$messages['cancel'] = 'Cancel';
+
+$messages['browse'] = 'Browse...';
?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/editblogtemplate.template
===================================================================
--- plog/trunk/templates/admin/editblogtemplate.template 2007-09-15 18:10:22 UTC (rev 5939)
+++ plog/trunk/templates/admin/editblogtemplate.template 2007-09-20 18:18:27 UTC (rev 5940)
@@ -1,8 +1,11 @@
{include file="$blogtemplate/header.template"}
{include file="$admintemplatepath/navigation.template" showOpt=blogTemplates title=$locale->tr("blogTemplates")}
<link rel="stylesheet" href="js/editor/lifetypeeditor.css" type="text/css" />
+<link rel="stylesheet" href="js/ui/assets/upload/upload.css" type="text/css" />
{js src="js/editor/lifetypeeditor.js"}
{js src="js/ui/pages/templateeditor.js"}
+{js src="js/swfupload/swfupload-r6.2.js"}
+{js src="js/ui/upload.js"}
{check_perms perm=add_blog_template}
<div class="extraFunctions">
<div class="left">
Modified: plog/trunk/templates/admin/jslocale.template
===================================================================
--- plog/trunk/templates/admin/jslocale.template 2007-09-15 18:10:22 UTC (rev 5939)
+++ plog/trunk/templates/admin/jslocale.template 2007-09-20 18:18:27 UTC (rev 5940)
@@ -37,4 +37,10 @@
Lifetype.Locale.add( 'enter_new_template_file_name', '{$locale->tr("enter_new_template_file_name")}');
Lifetype.Locale.add( 'hide_global_templates', '{$locale->tr("hide_global_templates")}');
Lifetype.Locale.add( 'show_global_templates', '{$locale->tr("show_global_templates")}');
+
+// flash uploader
+Lifetype.Locale.add( 'kb', '{$locale->tr("kb")}');
+Lifetype.Locale.add( 'mb', '{$locale->tr("gb")}');
+Lifetype.Locale.add( 'gb', '{$locale->tr("mb")}');
+Lifetype.Locale.add( 'browse', '{$locale->tr("browse")}');
</script>
\ No newline at end of file
Modified: plog/trunk/templates/admin/newblogtemplatefile_form.template
===================================================================
--- plog/trunk/templates/admin/newblogtemplatefile_form.template 2007-09-15 18:10:22 UTC (rev 5939)
+++ plog/trunk/templates/admin/newblogtemplatefile_form.template 2007-09-20 18:18:27 UTC (rev 5940)
@@ -4,17 +4,22 @@
<div class="field" id="fileFields">
<label for="resourceFile_1">{$locale->tr("file")}</label>
<span class="required">*</span>
- <div class="formHelp">{$locale->tr("new_template_file_help")}</div>
- <input type="file" id="templateFile" name="templateFile" />
+ <div class="formHelp">{$locale->tr("new_template_file_help")}</div>
+ {** used whenever flash or javascript are not available **}
+ <div id="degradedUI">
+ <input type="file" id="templateFile" name="templateFile" />
+ </div>
+ {** container for the flash-based uploader **}
+ <div id="flashUI" style="display: none;">
+ <script type="text/javascript">
+ Lifetype.UI.Upload.init( {literal}{{/literal} container:'flashUI', fieldName:'templateFile', uploadButton:'addFile', url:'{$url->getAdminUrl()}?op=uploadBlogTemplateFile&path='+Lifetype.Dom.$('currentPath').value+'&output=flash&templateId='+Lifetype.Dom.$('templateId').value+'&{$session}={$smarty.cookies.LThttplocalhosttrunk}'{literal}}{/literal});
+ </script>
+ </div>
</div>
</fieldset>
<div class="buttons" id="buttons">
<input type="reset" name="resetButton" value="{$locale->tr("reset")}" />
- <input type="submit" name="addFile" onclick="showProgressBar('buttons')" value="{$locale->tr("add")}" />
+ <input type="submit" name="addFile" value="{$locale->tr("add")}" id="addFile" />
<input type="hidden" name="op" value="uploadBlogTemplateFile" />
</div>
- <div class="status_bar" id="status_bar" style="display:none">
- {$locale->tr("upload_in_progress")}
- <img src="imgs/admin/spinner_small.gif" alt="Spinner" />
- </div>
</form>
\ No newline at end of file
More information about the pLog-svn
mailing list