alchemy_cms 2.1.beta1 → 2.1.beta5

data/.gitignore

@@ -14,4 +14,5 @@ tmp
 spec/dummy/index/
 log
 spec/dummy/uploads/
-.sass-cache
+.sass-cache
+spec/dummy/db/test.sqlite3-journal

data/.rspec

@@ -1,2 +1,2 @@
---color
---format progress
+--format Fuubar
+--color

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  #- 1.9.3
+  - 1.9.3
+  - ree
 branches:
   only:
     - next_stable

data/Gemfile

@@ -1,20 +1,19 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in alchemy.gemspec
 gemspec
 
-# gem 'tvdeyen-fleximage', :git => 'git@github.com:masche842/fleximage.git'
-# gem 'userstamp', :git => 'git@github.com:masche842/userstamp.git'
-
-#gem 'attachment_magic', :path => '/Users/tvd/code/ruby/gems/attachment_magic'
-
-group :development, :test do
-	gem 'gettext', '>=1.9.3', :require => false
-end
+gem 'declarative_authorization', :git => 'git://github.com/stffn/declarative_authorization.git'
 
 group :test do
 	gem 'factory_girl_rails'
 	gem "capybara"
+	#gem 'capybara-webkit'
 	gem "launchy"
 	gem "database_cleaner"
+	gem "fuubar"
+end
+
+group :assets do
+	gem 'sass-rails', '~> 3.1.4'
+	gem 'uglifier', '>= 1.0.3'
 end

data/README.md

@@ -1,10 +1,13 @@
 Alchemy CMS
 ===========
 
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png)](http://travis-ci.org/magiclabs/alchemy_cms)
+![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
+
 About
 -----
 
-**CAUTION: This branch is a pre alpha development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms), or [next_stable](https://github.com/magiclabs/alchemy_cms/tree/next_stable) branch.**
+**CAUTION: This branch is a beta development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms) branch.**
 
 Features
 --------
@@ -48,26 +51,23 @@ Features
 Rails Version
 -------------
 
-This branch of Alchemy runs with Rails 3.1.1 and Ruby 1.9.2.
-<<<<<<< HEAD
+This branch of Alchemy runs with Rails 3.1.3.
 
-If you are looking for a Rails 2 compatible version check the rails-2 branch.
+If you are looking for a Rails 3 compatible version check the master branch.
 
-A Rails 3.1 compatible beta version can be found in the next_stable branch.
+If you are looking for a Rails 2 compatible version check the rails-2 branch.
 
 Ruby Version
 ------------
 
-Alchemy runs with REE, Ruby 1.8.7, Ruby 1.9.2 and Ruby 1.9.3.
-=======
->>>>>>> 1a8411a94fbcf0ebd5a10ce774f29263b70d7665
+Alchemy under Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3 and REE (Ruby Enterprise Edition).
 
 Installation
 ------------
 
 Use the installer (recommended):
 
-    gem install alchemy_cms
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -81,7 +81,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms'
+    gem 'alchemy_cms', '~> 2.1.beta5', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
 
 Run in terminal:
 

data/Rakefile

@@ -28,7 +28,6 @@ APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
 # uncomment the next line if you want to see all dummy app rake tasks
 # load 'rails/tasks/engine.rake'
-load File.join(File.dirname(__FILE__), 'lib/tasks/gettext.rake')
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/alchemy_cms.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
   s.add_runtime_dependency(%q<authlogic>)
   s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
-  s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5"])
+  s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
   s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
-  s.add_runtime_dependency(%q<gettext_i18n_rails>, [">= 0.3"])
   s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
   s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
   s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
@@ -35,14 +34,13 @@ Gem::Specification.new do |s|
 
 	s.add_development_dependency(%q<rspec-rails>, ["~> 2.7"])
 	s.add_development_dependency(%q<sqlite3>)
-	s.add_development_dependency 'sass-rails', ['~> 3.1.4']
-	s.add_development_dependency 'coffee-rails', ['~> 3.1.1']
-	s.add_development_dependency 'uglifier', ['>= 1.0.3']
 
-	if RUBY_VERSION =~ /^1.9/
-		s.add_development_dependency(%q<ruby-debug19>)
-	else
-		s.add_development_dependency(%q<ruby-debug>)
+	if !ENV["CI"]
+		if RUBY_VERSION =~ /^1.9/
+			s.add_development_dependency(%q<ruby-debug19>)
+		else
+			s.add_development_dependency(%q<ruby-debug>)
+		end
 	end
 
 end

data/app/assets/javascripts/alchemy/alchemy.base.js

@@ -22,8 +22,14 @@ if (typeof(Alchemy) === 'undefined') {
 			};
 			var submit_handler = function(element, id, value) {
 				$(element).css({overflow: 'hidden'});
-				id = parseInt(id.replace(/^image_picture_/, ''));
-				$.ajax({url:'/admin/pictures/'+id, type: 'PUT', data: {name: value}});
+				id = id.match(/\d+/)[0];
+				$.ajax({
+					url: Alchemy.routes.admin_picture_path(id),
+					type: 'PUT',
+					data: {
+						name: value
+					}
+				});
 				return false;
 			};
 			

data/app/assets/javascripts/alchemy/{alchemy.dragndrop.js → alchemy.dragndrop.js.erb}

@@ -18,7 +18,7 @@ if (typeof(Alchemy) === 'undefined') {
 				cursor: 'move',
 				tolerance: 'pointer',
 				update: function(event, ui) {
-					var ids = $.map($(event.target).children(), function(child) {
+					var ids = $.map($(this).children(), function(child) {
 						return $(child).attr('data-element-id');
 					});
 					var params_string = '';
@@ -37,7 +37,7 @@ if (typeof(Alchemy) === 'undefined') {
 						params_string += "&cell_id=" + cell_id;
 					}
 					$.ajax({
-						url: '/admin/elements/order',
+						url: Alchemy.routes.order_admin_elements_path,
 						type: 'POST',
 						data: params_string,
 						complete: function () {
@@ -76,7 +76,7 @@ if (typeof(Alchemy) === 'undefined') {
 					});
 					$(event.originalTarget).css("cursor", "progress");
 					$.ajax({
-						url: '/admin/contents/order',
+						url: Alchemy.routes.order_admin_contents_path,
 						type: 'POST',
 						data: "authenticity_token=" + encodeURIComponent(token) + "&" + $.param({content_ids: ids}),
 						complete: function () {

data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js

@@ -76,7 +76,7 @@ if (typeof(Alchemy) === 'undefined') {
 			var self = Alchemy.ElementEditorSelector;
 			$('#element_'+id+'_folder').hide();
 			$('#element_'+id+'_folder_spinner').show();
-			$.post('/admin/elements/'+id+'/fold', function() {
+			$.post(Alchemy.routes.fold_admin_element_path(id), function() {
 				$('#element_'+id+'_folder').show();
 				$('#element_'+id+'_folder_spinner').hide();
 				self.scrollToElement('#element_'+id);

data/app/assets/javascripts/alchemy/alchemy.growler.js

@@ -11,7 +11,7 @@ if (typeof(Alchemy) === 'undefined') {
     
     build : function(message, flash_type) {
       var $flash_container = $('<div class="flash '+flash_type+'" />');
-      var icon_class = flash_type === 'notice' ? 'tick' : 'error';
+      var icon_class = flash_type === 'notice' ? 'tick' : flash_type;
       $flash_container.append('<span class="icon '+icon_class+'" />');
       $flash_container.append(message);
       $('#flash_notices').append($flash_container);
@@ -20,10 +20,10 @@ if (typeof(Alchemy) === 'undefined') {
     },
     
     fade : function() {
-      $('#flash_notices div[class!="flash error"]').delay(5000).hide('drop', { direction: "up" }, 400, function() {
+      $('#flash_notices div[class="flash notice"]').delay(5000).hide('drop', { direction: "up" }, 400, function() {
         $(this).remove();
       });
-      $('#flash_notices div[class="flash error"]')
+      $('#flash_notices div[class!="flash notice"]')
       .css({cursor: 'pointer'})
       .click(function() {
         $(this).hide('drop', { direction: "up" }, 400, function() {

data/app/assets/javascripts/alchemy/alchemy.js

@@ -1,16 +1,14 @@
-// Alchemy CMS Sprocket Manifest
-// -----------------------------
-//= require jquery-1.6.2.min
-//= require jquery-ui-custom-1.8.16.min
+// Alchemy CMS Sprockets Manifest
+// ------------------------------
+//= require jquery
+//= require jquery-ui
 //= require jquery_ujs
-//= require jquery_plugins/jquery.dialogextend.min.js
-//= require jquery_plugins/jquery.in-place-edit.js
-//= require jquery_plugins/jquery.Jcrop.min.js
-//= require jquery_plugins/jquery.sb.min.js
-//= require jquery_plugins/jquery.scrollTo-1.4.2-min.js
-//= require jquery_plugins/jquery.ui.nestedSortable.js
-//= require jquery_plugins/jquery.ui.tabspaging.js
+//= require tiny_mce/tiny_mce
+//= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/
+//= require_tree ../../../../vendor/assets/javascripts/swfupload/
+//= require alchemy/alchemy.routes
 //= require alchemy/alchemy.base
+//= require alchemy/alchemy.buttons
 //= require alchemy/alchemy.dirty
 //= require alchemy/alchemy.dragndrop
 //= require alchemy/alchemy.element_editor_selector
@@ -19,8 +17,5 @@
 //= require alchemy/alchemy.js_extensions
 //= require alchemy/alchemy.link_overlay
 //= require alchemy/alchemy.page_sorter
+//= require alchemy/alchemy.swf_upload
 //= require alchemy/alchemy.windows
-//= require swfupload/swfupload
-//= require swfupload/queue
-//= require swfupload/handlers
-//= require swfupload/fileprogress

data/app/assets/javascripts/alchemy/alchemy.link_overlay.js

@@ -21,9 +21,10 @@ if (typeof(Alchemy) === 'undefined') {
         title: 'Link setzen',
         show: "fade",
         hide: "fade",
+				resizable: false,
         open: function (event, ui) {
           $.ajax({
-            url: '/admin/pages/link',
+            url: Alchemy.routes.link_admin_pages_path,
             success: function(data, textStatus, XMLHttpRequest) {
               $dialog.html(data);
               Alchemy.SelectBox('#alchemyLinkOverlay select');
@@ -132,7 +133,10 @@ if (typeof(Alchemy) === 'undefined') {
             if (internal_anchor) {
               var $select_container = $sitemap_line.parent().find('.elements_for_page');
               $select_container.show();
-              $.get("/admin/elements/?page_urlname=" + $(internal_urlname.split('/')).last()[0] + '&internal_anchor=' + internal_anchor);
+							$.get(Alchemy.routes.list_admin_elements_path, {
+								page_urlname: $(internal_urlname.split('/')).last()[0],
+								internal_anchor: internal_anchor
+							});
             }
           }
         }

data/app/assets/javascripts/alchemy/alchemy.page_sorter.js

@@ -24,7 +24,7 @@ if (typeof(Alchemy) === 'undefined') {
 			});
 			$('#save_page_order').click(function(){
 				var params = $('ul#sitemap').nestedSortable('serialize');
-				$.post('/admin/pages/order', params);
+				$.post(Alchemy.routes.order_admin_pages_path, params);
 			});
 			Alchemy.PageSorter.disableButton();
 			Alchemy.resizeFrame();

data/app/assets/javascripts/alchemy/alchemy.preview.js

@@ -129,7 +129,7 @@ function initAlchemyPreviewMode() {
 			head.appendChild(script);
 		};
 		
-		getScript('/javascripts/alchemy/jquery.js', function() {
+		getScript('/assets/jquery.min.js', function() {
 			if (typeof(jQuery) !== 'undefined') {
 				if (thisPageUsingOtherJSLibrary) {
 					jQuery.noConflict();

data/app/assets/javascripts/alchemy/alchemy.routes.js.erb

@@ -0,0 +1,38 @@
+// This object provides dynamically generated Rails routes in Javascript.
+// A little bit hacky, but the best solution so far. ^_^
+<% alchemy_routes = Alchemy::Engine.routes %>
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+(function($) {
+
+	var routes = {};
+	$.extend(Alchemy, routes);
+
+	Alchemy.routes = {
+
+		admin_picture_path: function(id) {
+			return '<%= alchemy_routes.generate(:controller => "alchemy/admin/pictures", :action => "update", :id => 1).first %>'.replace(/1/, id);
+		},
+
+		admin_trash_path : function(page_id) {
+			var url = '<%= alchemy_routes.generate(:controller => "alchemy/admin/trash", :action => "index").first %>';
+			if (page_id)
+				url += '?page_id=' + page_id;
+			return url;
+		},
+
+		fold_admin_element_path: function(id) {
+			return '<%= alchemy_routes.generate(:controller => "alchemy/admin/elements", :action => "fold", :id => 1).first %>'.replace(/1/, id);
+		},
+
+		list_admin_elements_path: '<%= alchemy_routes.generate(:controller => "alchemy/admin/elements", :action => "list").first %>',
+		order_admin_contents_path: '<%= alchemy_routes.generate(:controller => "alchemy/admin/contents", :action => "order").first %>',
+		order_admin_elements_path: '<%= alchemy_routes.generate(:controller => "alchemy/admin/elements", :action => "order").first %>',
+		order_admin_pages_path: '<%= alchemy_routes.generate(:controller => "alchemy/admin/pages", :action => "order").first %>',
+		link_admin_pages_path: '<%= alchemy_routes.generate(:controller => "alchemy/admin/pages", :action => "link").first %>'
+
+	}
+
+})(jQuery);

data/app/assets/javascripts/alchemy/alchemy.swf_upload.js

@@ -0,0 +1,360 @@
+/* **********************
+   Alchemy SWFUpload Event Handlers
+   ********************** */
+
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+(function($) {
+
+	$.extend(Alchemy, {
+
+		SWFUpload : {
+
+			init : function() {
+				Alchemy.SWFUpload.language = this.customSettings['language'];
+			},
+
+			fileQueued: function(file) {
+				try {
+					var self = Alchemy.SWFUpload;
+					var progress = new self.FileProgress(file);
+					var status_text = self.getTranslation('pending');
+					progress.setStatus(status_text);
+					progress.toggleCancelButton(true, this);
+				} catch (ex) {
+					this.debug(ex);
+				}
+			},
+
+			fileDialogComplete: function(numFilesSelected, numFilesQueued) {
+				try {
+					if (numFilesSelected > 0) {
+						$('#swf_upload_container .button').show();
+						$('#choose_alternative_uploader').hide();
+					}
+					/* I want auto start the upload and I can do that here */
+					this.startUpload();
+				} catch (ex)  {
+					this.debug(ex);
+				}
+			},
+
+			uploadStart: function(file) {
+				try {
+					var self = Alchemy.SWFUpload;
+					var progress = new self.FileProgress(file);
+					progress.setStatus(self.getTranslation('uploading'));
+					progress.toggleCancelButton(true, this);
+				}
+				catch (ex) {}
+				return true;
+			},
+
+			uploadProgress: function(file, bytesLoaded, bytesTotal) {
+				try {
+					var self = Alchemy.SWFUpload;
+					var progress = new self.FileProgress(file);
+					progress.setProgress(file.percentUploaded);
+					progress.setStatus(self.getTranslation('uploading') + ' ('+SWFUpload.speed.formatPercent(file.percentUploaded)+') - ' + SWFUpload.speed.formatTime(file.timeRemaining) + self.getTranslation('remaining'));
+				} catch (ex) {
+					this.debug(ex);
+				}
+			},
+
+			uploadSuccess: function(file, serverData) {
+				eval(serverData);
+				try {
+					var self = Alchemy.SWFUpload;
+					var progress = new self.FileProgress(file);
+					progress.setComplete();
+					progress.setStatus(self.getTranslation('complete'));
+					progress.toggleCancelButton(false);
+				} catch (ex) {
+					this.debug(ex);
+				}
+			},
+
+			uploadError: function(file, errorCode, message) {
+				try {
+					var self = Alchemy.SWFUpload;
+					var progress = new self.FileProgress(file);
+					progress.toggleCancelButton(false);
+					switch (errorCode) {
+					case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+						progress.setStatus("Upload Error: " + message);
+						progress.setError();
+						this.debug("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
+						break;
+					case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
+						progress.setStatus(self.getTranslation("upload_failed"));
+						progress.setError();
+						this.debug("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+						progress.setStatus("Server (IO) Error");
+						progress.setError();
+						this.debug("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
+						break;
+					case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+						progress.setStatus("Security Error");
+						progress.setError();
+						this.debug("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
+						break;
+					case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+						progress.setStatus(self.getTranslation("upload_limit_exceeded"));
+						progress.setError();
+						this.debug("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+						progress.setStatus(self.getTranslation('validation_failed'));
+						progress.setError();
+						this.debug("Error Code: File Validation Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+						// If there aren't any files left (they were all cancelled) disable the cancel button
+						if (this.getStats().files_queued === 0) {
+							self.hideQueueCancelButton();
+						}
+						progress.setStatus(self.getTranslation("cancelled"));
+						progress.setCancelled();
+						break;
+					case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+						progress.setStatus(self.getTranslation('stopped'));
+						progress.setCancelled();
+						break;
+					default:
+						progress.setStatus("Unhandled Error: " + errorCode);
+						progress.setError();
+						this.debug("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					}
+				} catch (ex) {
+					this.debug(ex);
+				}
+			},
+
+			fileQueueError: function(file, errorCode, message) {
+				try {
+					if (errorCode === SWFUpload.QUEUE_ERROR.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;
+					}
+					var self = Alchemy.SWFUpload;
+					var progress = new self.FileProgress(file);
+					progress.setError();
+					progress.toggleCancelButton(false);
+					switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						progress.setStatus(self.getTranslation("file_too_big"));
+						this.debug("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						progress.setStatus(self.getTranslation("zero_byte_file"));
+						this.debug("Error Code: Zero byte file, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						progress.setStatus(self.getTranslation("invalid_file"));
+						this.debug("Error Code: Invalid File Type, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					default:
+						if (file !== null) {
+							progress.setStatus(self.getTranslation("unknown_error"));
+						}
+						this.debug("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+						break;
+					}
+				} catch (ex) {
+					this.debug(ex);
+				}
+			},
+
+			uploadComplete: function(file) {
+				if (this.getStats().files_queued === 0) {
+					Alchemy.SWFUpload.hideQueueCancelButton();
+				}
+			},
+
+			queueComplete: function(numFilesUploaded) {
+				var $status = $("#SWFUploadStatus");
+				$status.show();
+				if (Alchemy.SWFUpload.language == 'en') {
+					$status.append(numFilesUploaded + " file" + (numFilesUploaded === 1 ? "" : "s") + " uploaded.");
+				} else {
+					$status.append(numFilesUploaded + " Datei" + (numFilesUploaded === 1 ? "" : "en") + " hochgeladen.");
+				}
+				Alchemy.SWFUpload.hideQueueCancelButton();
+				setTimeout(function () {
+					Alchemy.closeCurrentWindow();
+				}, 3500);
+			},
+
+			FileProgress: function(file) {
+				var $progressBarContainer;
+				this.fileID = file.id;
+				this.$fileProgressWrapper = $('#' + this.fileID);
+				if (!this.$fileProgressWrapper.get(0)) {
+					// Build Wrapper
+					this.$fileProgressWrapper = $('<div class="progressWrapper" id="'+this.fileID+'"/>');
+					// Build Container
+					this.$fileProgressElement = $('<div class="progressContainer"/>');
+					// Append Cancel Button
+					this.$fileProgressCancel = $('<a href="javascript:void(0);" class="progressCancel" style="display: none"/>');
+					this.$fileProgressElement.append(this.$fileProgressCancel);
+					// Append Filename
+					this.$fileProgressElement.append('<div class="progressName">'+file.name+'</div>');
+					// Append Progressbar Status Text
+					this.$fileProgressStatus = $('<div class="progressBarStatus">&nbsp;</div>');
+					this.$fileProgressElement.append(this.$fileProgressStatus);
+					// Build Progressbar Container
+					$progressBarContainer = $('<div class="progressBarContainer"/>');
+					// Build Progressbar
+					this.$progressBar = $('<div class="progressBarInProgress"/>');
+					// Knit all together
+					$progressBarContainer.append(this.$progressBar);
+					this.$fileProgressElement.append($progressBarContainer);
+					this.$fileProgressWrapper.append(this.$fileProgressElement);
+					$('#uploadProgressContainer').append(this.$fileProgressWrapper);
+				} else {
+					this.$fileProgressElement = this.$fileProgressWrapper.find('.progressContainer');
+					this.$fileProgressCancel = this.$fileProgressElement.find('.progressCancel');
+					this.$fileProgressStatus = this.$fileProgressElement.find('.progressBarStatus');
+					this.$progressBar = this.$fileProgressElement.find('.progressBarContainer *:first-child');
+					this.reset();
+				}
+				this.setTimer(null);
+				return this;
+			},
+
+			translation: {
+				'pending' : {
+					'de' : 'Wartend...',
+					'en' : 'Pending...'
+				},
+				'uploading' : {
+					'de' : 'Ladend...',
+					'en' : 'Uploading...'
+				},
+				'remaining' : {
+					'de' : ' verbleibend.',
+					'en' : ' remaining.'
+				},
+				'complete' : {
+					'de' : 'Abgeschlossen.',
+					'en' : "Complete."
+				},
+				'cancelled' : {
+					'de' : 'Abgebrochen.',
+					'en' : 'Cancelled.'
+				},
+				'stopped' : {
+					'de' : 'Gestoppt',
+					'en' : 'Stopped.'
+				},
+				'upload_failed' : {
+					'de' : 'Fehlgeschlagen!',
+					'en' : 'Upload Failed!'
+				},
+				'file_too_big' : {
+					'de' : 'Datei ist zu groß!',
+					'en' : 'File is too big!'
+				},
+				'upload_limit_exceeded' : {
+					'de' : 'Maximales Dateilimit erreicht.',
+					'en' : 'Upload limit exceeded.'
+				},
+				'validation_failed' : {
+					'de' : 'Validierung fehlgeschlagen. Ladevorgang angehalten.',
+					'en' : "Failed Validation. Upload skipped."
+				},
+				'zero_byte_file' : {
+					'de' : 'Datei hat keinen Inhalt!',
+					'en' : 'Cannot upload Zero Byte files!'
+				},
+				'invalid_file' : {
+					'de' : 'Ungültiger Dateityp!',
+					'en' : 'Invalid File Type!'
+				},
+				'unknown_error' : {
+					'de' : 'Unbekannter Fehler!',
+					'en' : 'Unhandled Error!'
+				}
+			},
+
+			getTranslation : function(id) {
+				try {
+					var self = Alchemy.SWFUpload;
+					var translation = self.translation[id];
+					if (translation) {
+						return translation[self.language];
+					} else {
+						return id;
+					}
+				} catch(ex) {
+					this.debug(ex);
+				}
+			},
+
+			hideQueueCancelButton : function() {
+				$('#swf_upload_container .button').hide();
+				$('#swf_upload_container .cloned-button').remove();
+			}
+
+		}
+
+	});
+
+	Alchemy.SWFUpload.FileProgress.prototype.setTimer = function (timer) {
+		this.$fileProgressElement["FP_TIMER"] = timer;
+	};
+	
+	Alchemy.SWFUpload.FileProgress.prototype.getTimer = function (timer) {
+		return this.$fileProgressElement["FP_TIMER"] || null;
+	};
+
+	Alchemy.SWFUpload.FileProgress.prototype.reset = function () {
+		this.$fileProgressStatus.html("&nbsp;");
+		this.$progressBar.removeClass().addClass("progressBarInProgress");
+		this.$progressBar.css({width: '0%'});
+	};
+
+	Alchemy.SWFUpload.FileProgress.prototype.setProgress = function (percentage) {
+		this.$progressBar.removeClass().addClass("progressBarInProgress");
+		this.$progressBar.css({width: percentage + '%'});
+	};
+
+	Alchemy.SWFUpload.FileProgress.prototype.setComplete = function () {
+		this.$progressBar.removeClass().addClass("progressBarComplete");
+		this.$progressBar.css({width: '100%'});
+		this.$fileProgressWrapper.delay(1500).fadeOut();
+	};
+
+	Alchemy.SWFUpload.FileProgress.prototype.setError = function () {
+		this.$progressBar.removeClass().addClass("progressBarError");
+		this.$progressBar.css({width: '100%'});
+	};
+
+	Alchemy.SWFUpload.FileProgress.prototype.setCancelled = function () {
+		this.$progressBar.removeClass().addClass("progressBarCanceled");
+		this.$progressBar.css({width: '100%'});
+		this.$fileProgressWrapper.delay(1500).fadeOut();
+	};
+
+	Alchemy.SWFUpload.FileProgress.prototype.setStatus = function (status) {
+		this.$fileProgressStatus.text(status);
+	};
+
+	// Show/Hide the cancel button and bind click event.
+	Alchemy.SWFUpload.FileProgress.prototype.toggleCancelButton = function (show, swfUploadInstance) {
+		show ? this.$fileProgressCancel.show() : this.$fileProgressCancel.hide();
+		if (swfUploadInstance) {
+			this.$fileProgressCancel.click(function (e) {
+				e.preventDefault();
+				swfUploadInstance.cancelUpload(this.fileID);
+				return false;
+			});
+		}
+	};
+
+})(jQuery);