alchemy_cms 2.1.beta6 → 2.1.rc2

data/.gitignore

@@ -15,4 +15,6 @@ spec/dummy/index/
 log
 spec/dummy/uploads/
 .sass-cache
-spec/dummy/db/test.sqlite3-journal
+spec/dummy/db/test.sqlite3-journal
+spec/dummy/db/seeds.rb
+.rvmrc

data/Gemfile

@@ -2,8 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'declarative_authorization', :git => 'git://github.com/stffn/declarative_authorization.git'
-
 group :test do
 	gem 'factory_girl_rails'
 	gem "capybara"
@@ -17,3 +15,13 @@ group :assets do
 	gem 'sass-rails', '~> 3.1.4'
 	gem 'uglifier', '>= 1.0.3'
 end
+
+group :development do
+	if !ENV["CI"]
+		gem 'ruby-debug-base19', '~> 0.11.26', :platform => :ruby_19
+		gem 'linecache19', '~> 0.5.13', :platform => :ruby_19
+		gem 'ruby-debug19', '~> 0.11.6', :require => 'ruby-debug', :platform => :ruby_19
+		gem 'ruby-debug', :platform => :ruby_18
+		gem 'guard-spork'
+	end
+end

data/Guardfile

@@ -0,0 +1,16 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
+  watch(%r{lib/})
+  watch('spec/dummy/config/application.rb')
+  watch('spec/dummy/config/environment.rb')
+  watch(%r{^spec/dummy/config/environments/.+\.rb$})
+  watch(%r{^spec/dummy/config/initializers/.+\.rb$})
+  watch('Gemfile')
+  watch('Gemfile.lock')
+  watch('spec/factories.rb')
+  watch('spec/spec_helper.rb') { :rspec }
+  watch('test/test_helper.rb') { :test_unit }
+  watch(%r{features/support/}) { :cucumber }
+end

data/README.md

@@ -95,14 +95,14 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', '~> 2.1.beta5', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
+    gem 'alchemy_cms', '~> 2.1.beta7', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
 
 Run in terminal:
 
     bundle install
-    rake alchemy:prepare
+    rake alchemy:install:migrations
     rake db:migrate
-    rake db:seed
+    rake alchemy:db:seed
 
 Tipps
 -----

data/Rakefile

@@ -24,11 +24,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('app/**/*.rb')
 end
 
-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'
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 

data/alchemy_cms.gemspec

@@ -32,15 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
   s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
 
-	s.add_development_dependency(%q<rspec-rails>, ["~> 2.7"])
+	s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
 	s.add_development_dependency(%q<sqlite3>)
 
-	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

@@ -127,7 +127,6 @@ if (typeof(Alchemy) === 'undefined') {
 		
 		resizeFrame : function() {
 			var options = {
-				top: 90,
 				left: 65,
 				right: 0
 			};
@@ -135,11 +134,12 @@ if (typeof(Alchemy) === 'undefined') {
 			var $topFrame = $('#top_menu');
 			var view_height = $(window).height();
 			var view_width = $(window).width();
-			var mainFrameHeight = view_height - options.top;
-			var topFrameHeight = options.top;
+			var topFrameHeight = $topFrame.height();
+			var mainFrameHeight = view_height - topFrameHeight;
 			var width = view_width - options.left - options.right;
 			if ($mainFrame.length > 0) {
 				$mainFrame.css({
+					top: topFrameHeight,
 					width: width,
 					height: mainFrameHeight
 				});
@@ -216,7 +216,8 @@ if (typeof(Alchemy) === 'undefined') {
 
 		getUrlParam : function(name){
 			var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
-			return results[1] || 0;
+			if (results)
+				return results[1] || 0;
 		}
 
 	});

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

@@ -0,0 +1,96 @@
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+(function($) {
+
+	var ElementsWindow = {};
+	$.extend(Alchemy, ElementsWindow);
+
+	Alchemy.ElementsWindow = {
+
+		init : function (path, options, callback) {
+			var $dialog = $('<div style="display: none" id="alchemyElementWindow"></div>');
+			var closeCallback = function() {
+				$dialog.dialog("destroy");
+				$('#alchemyElementWindow').remove();
+				Alchemy.ElementsWindow.button.enable();
+			};
+			$dialog.html(Alchemy.getOverlaySpinner({x: 420, y: 300}));
+			Alchemy.ElementsWindow.currentWindow = $dialog.dialog({
+				modal: false, 
+				minWidth: 422, 
+				minHeight: 300,
+				height: $(window).height() - 90,
+				title: options.texts.title,
+				show: "fade",
+				hide: "fade",
+				position: [$(window).width() - 428, 84],
+				closeOnEscape: false,
+				create: function() {
+					$dialog.before(Alchemy.ElementsWindow.createToolbar(options.toolbarButtons));
+				},
+				open: function(event, ui) {
+					Alchemy.ElementsWindow.button.disable();
+					$.ajax({
+						url: path,
+						success: function(data, textStatus, XMLHttpRequest) {
+							$dialog.html(data);
+							Alchemy.ButtonObserver('#alchemyElementWindow .button');
+							callback.call();
+						},
+						error: function(XMLHttpRequest, textStatus, errorThrown) {
+							Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
+						}
+					});
+				},
+				beforeClose : function() {
+					if (Alchemy.isPageDirty()) {
+						Alchemy.openConfirmWindow({
+							title: options.texts.dirtyTitle,
+							message: options.texts.dirtyMessage,
+							okLabel: options.texts.okLabel,
+							cancelLabel: options.texts.cancelLabel,
+							okCallback: closeCallback
+						});
+						return false;
+					} else {
+						return true;
+					}
+				},
+				close: closeCallback
+			});
+		},
+
+		button : {
+			enable: function() {
+				$('div#show_element_window').removeClass('disabled');
+			},
+			disable: function() {
+				$('div#show_element_window').addClass('disabled');
+			},
+			toggle: function() {
+				$('div#show_element_window').toggleClass('disabled');
+			}
+		},
+
+		createToolbar : function(buttons) {
+			var $toolbar = $('<div id="overlay_toolbar"></div>'), btn;
+			for (i = 0; i < buttons.length; i++) {
+				btn = buttons[i];
+				$toolbar.append(
+					Alchemy.ToolbarButton({
+						buttonTitle: btn.title, 
+						buttonLabel: btn.label, 
+						iconClass: btn.iconClass,
+						onClick: btn.onClick,
+						buttonId: btn.buttonId
+					})
+				);
+			}
+			return $toolbar;
+		}
+
+	}
+
+})(jQuery);

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

@@ -1,56 +1,54 @@
 if (typeof(Alchemy) === 'undefined') {
-  var Alchemy = {};
+	var Alchemy = {};
 }
 
 (function($) {
-  
-  var ImageCropper = {};
-  ImageCropper.initialized = false;
-  $.extend(Alchemy, ImageCropper);
-  
-  Alchemy.ImageCropper = {
-    
-    init : function (box, size_x, size_y, default_box, ratio) {
-      var crop_from_field = $('#essence_picture_crop_from');
-      var crop_size_field = $('#essence_picture_crop_size');
-      var options = {
-        onSelect: function(coords) {
-          crop_from_field.val(coords.x + "x" + coords.y);
-          crop_size_field.val(coords.w + "x" + coords.h);
-        },
-        setSelect: box,
-        aspectRatio: ratio ? ratio : undefined,
-        minSize: [size_x, size_y]
-      };
-      Alchemy.ImageCropper.box = box;
-      Alchemy.ImageCropper.default_box = default_box;
-      Alchemy.ImageCropper.crop_from_field = crop_from_field;
-      Alchemy.ImageCropper.crop_size_field = crop_size_field;
-      
-      if (!Alchemy.ImageCropper.initialized) {
-        Alchemy.ImageCropper.api = $.Jcrop('#imageToCrop', options);
-        Alchemy.ImageCropper.initialized = true;
-      }
-      
-      $('#image_cropper_form').submit(Alchemy.ImageCropper.destroy);
-      $('.ui-dialog-titlebar-close').click(Alchemy.ImageCropper.destroy);
-    },
-    
-    undo : function() {
-      Alchemy.ImageCropper.api.setSelect(Alchemy.ImageCropper.box);
-    },
-    
-    reset : function() {
-      Alchemy.ImageCropper.api.setSelect(Alchemy.ImageCropper.default_box);
-      Alchemy.ImageCropper.crop_from_field.val('');
-      Alchemy.ImageCropper.crop_size_field.val('');
-    },
-    
-    destroy : function() {
-      Alchemy.ImageCropper.api.destroy();
-      Alchemy.ImageCropper.initialized = false;
-    }
-    
+
+	var ImageCropper = {};
+	ImageCropper.initialized = false;
+	$.extend(Alchemy, ImageCropper);
+
+	Alchemy.ImageCropper = {
+
+		init : function (box, size_x, size_y, default_box, ratio) {
+			var crop_from_field = $('#essence_picture_crop_from');
+			var crop_size_field = $('#essence_picture_crop_size');
+			var options = {
+				onSelect: function(coords) {
+					crop_from_field.val(coords.x + "x" + coords.y);
+					crop_size_field.val(coords.w + "x" + coords.h);
+				},
+				setSelect: box,
+				aspectRatio: ratio ? ratio : undefined,
+				minSize: [size_x, size_y]
+			};
+			Alchemy.ImageCropper.box = box;
+			Alchemy.ImageCropper.default_box = default_box;
+			Alchemy.ImageCropper.crop_from_field = crop_from_field;
+			Alchemy.ImageCropper.crop_size_field = crop_size_field;
+			
+			if (!Alchemy.ImageCropper.initialized) {
+				Alchemy.ImageCropper.api = $.Jcrop('#imageToCrop', options);
+				Alchemy.ImageCropper.initialized = true;
+			}
+			$('.ui-dialog-titlebar-close').click(Alchemy.ImageCropper.destroy);
+		},
+
+		undo : function() {
+			Alchemy.ImageCropper.api.setSelect(Alchemy.ImageCropper.box);
+		},
+
+		reset : function() {
+			Alchemy.ImageCropper.api.setSelect(Alchemy.ImageCropper.default_box);
+			Alchemy.ImageCropper.crop_from_field.val('');
+			Alchemy.ImageCropper.crop_size_field.val('');
+		},
+
+		destroy : function() {
+			Alchemy.ImageCropper.api.destroy();
+			Alchemy.ImageCropper.initialized = false;
+		}
+
   }
-  
+
 })(jQuery);

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

@@ -0,0 +1,41 @@
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+// Load jQuery on demand. Use this if jQuery is not present.
+// Found on http://css-tricks.com/snippets/jquery/load-jquery-only-if-not-present/
+Alchemy.loadjQuery = function(callback) {
+
+	var thisPageUsingOtherJSLibrary = false;
+
+	if (typeof($) === 'function') {
+		thisPageUsingOtherJSLibrary = true;
+	}
+
+	function getScript(url, success) {
+		var script = document.createElement('script');
+		var head = document.getElementsByTagName('head')[0], done = false;
+		script.src = url;
+		// Attach handlers for all browsers
+		script.onload = script.onreadystatechange = function() {
+			if (!done && (!this.readyState || this.readyState === 'loaded' || this.readyState === 'complete')) {
+				done = true;
+				// callback function provided as param
+				success();
+				script.onload = script.onreadystatechange = null;
+				head.removeChild(script);
+			};
+		};
+		head.appendChild(script);
+	};
+
+	getScript('/assets/jquery.min.js', function() {
+		if (typeof(jQuery) !== 'undefined') {
+			if (thisPageUsingOtherJSLibrary) {
+				jQuery.noConflict();
+			}
+			callback();
+		}
+	});
+
+}

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

@@ -19,3 +19,5 @@
 //= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.swf_upload
 //= require alchemy/alchemy.windows
+//= require alchemy/alchemy.preview_window
+//= require alchemy/alchemy.elements_window

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

@@ -0,0 +1,55 @@
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+Alchemy.loadAlchemyMenuBar = function (options) {
+
+	Alchemy.Menubar = {
+
+		show: function() {
+			$('body').prepend(Alchemy.Menubar.build());
+		},
+
+		build: function() {
+			var bar = $('<div id="alchemy_menubar"/>')
+				.append('<ul/>');
+			bar.find('ul')
+				.append('<li><a href="'+options.route+'/admin">'+Alchemy.Menubar.t("to_alchemy")+'</a></li>')
+				.append('<li><a href="'+options.route+'/admin/pages/'+options.page_id+'/edit">'+Alchemy.Menubar.t("edit_page")+'</a></li>')
+				.append('<li><a href="'+options.route+'/admin/logout">'+Alchemy.Menubar.t("logout")+'</a></li>');
+			return bar;
+		},
+
+		translations: {
+			'to_alchemy' : {
+				'de' : 'zu Alchemy',
+				'en' : 'To Alchemy'
+			},
+			'edit_page' : {
+				'de' : 'Seite bearbeiten',
+				'en' : 'Edit Page'
+			},
+			'logout' : {
+				'de' : 'abmelden',
+				'en' : 'Log out'
+			}
+		},
+
+		t : function(id) {
+			var translation = Alchemy.Menubar.translations[id];
+			if (translation) {
+				return translation[options.locale];
+			} else {
+				return id;
+			}
+		}
+
+	};
+
+	if (typeof(jQuery) === 'undefined') {
+		Alchemy.loadjQuery(Alchemy.Menubar.show);
+	} else {
+		Alchemy.Menubar.show();
+	}
+
+};

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

@@ -1,145 +1,100 @@
-function initAlchemyPreviewMode() {
-	
-	if (typeof(Alchemy) === 'undefined') {
-		var Alchemy = {};
-	}
-	
-	(function ($) {
-		
-		// Setting jQueryUIs global animation duration
-		$.fx.speeds._default = 400;
-		
-		// The Alchemy JavaScript Object contains all Functions
-		$.extend(Alchemy, {
-			
-			ElementSelector : {
-				
-				// defaults
-				styles : {
-					reset : { outline: '0 none' },
-					hover : {
-						'outline-width'					: '2px',
-						'outline-style'					: 'solid',
-						'outline-color'					: '#98BAD5',
-						'outline-offset'				: '4px',
-						'-moz-outline-radius'		: '4px',
-						'outline-radius'				: '4px'
-					},
-					selected : {
-						'outline-width'					: '2px',
-						'outline-style'					: 'solid',
-						'outline-color'					: '#DB694C',
-						'outline-offset'				: '4px',
-						'-moz-outline-radius'		: '4px',
-						'outline-radius'				: '4px'
-					},
-				},
-				
-				scrollOffset : 20,
-				
-				init : function() {
-					var self = Alchemy.ElementSelector;
-					var $elements = $('[data-alchemy-element]');
-					var styles = self.styles;
-					$elements.bind('mouseover', function(e) {
-						$(this).attr('title', 'Klicken zum bearbeiten');
-						if (!$(this).hasClass('selected'))
-							$(this).css(styles.hover);
-					});
-					$elements.bind('mouseout', function() {
-						$(this).removeAttr('title');
-						if (!$(this).hasClass('selected'))
-							$(this).css(styles.reset);
-					});
-					$elements.bind('Alchemy.SelectElement', self.selectElement);
-					$elements.bind('click', self.clickElement);
-					self.$previewElements = $elements;
-				},
-				
-				selectElement : function(e) {
-					var $this = $(this);
-					var self = Alchemy.ElementSelector;
-					var $elements = self.$previewElements;
-					var styles = self.styles;
-					var offset = self.scrollOffset;
-					e.preventDefault();
-					$elements.removeClass('selected').css(styles.reset);
-					$this.addClass('selected').css(styles.selected);
-					$('html, body').animate({
-						scrollTop: $this.offset().top - offset,
-						scrollLeft: $this.offset().left - offset
-					}, 400);
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+Alchemy.initAlchemyPreviewMode = function() {
+
+	// Setting jQueryUIs global animation duration
+	$.fx.speeds._default = 400;
+
+	// The Alchemy JavaScript Object contains all Functions
+	$.extend(Alchemy, {
+
+		ElementSelector : {
+
+			// defaults
+			styles : {
+				reset : { outline: '0 none' },
+				hover : {
+					'outline-width'					: '2px',
+					'outline-style'					: 'solid',
+					'outline-color'					: '#98BAD5',
+					'outline-offset'				: '4px',
+					'-moz-outline-radius'		: '4px',
+					'outline-radius'				: '4px'
 				},
-				
-				clickElement : function(e) {
-					var $this = $(this);
-					var parent$ = window.parent.jQuery;
-					var target_id = $this.attr('data-alchemy-element');
-					var $element_editor = parent$('#element_area .element_editor').closest('[id="element_'+target_id+'"]');
-					var $elementsWindow = parent$('#alchemyElementWindow');
-					e.preventDefault();
-					$element_editor.trigger('Alchemy.SelectElementEditor', target_id);
-					if ($elementsWindow.dialog("isOpen")) {
-						$elementsWindow.dialog('moveToTop');
-					} else {
-						$elementsWindow.dialog('open');
-					}
-					$this.trigger('Alchemy.SelectElement');
+				selected : {
+					'outline-width'					: '2px',
+					'outline-style'					: 'solid',
+					'outline-color'					: '#DB694C',
+					'outline-offset'				: '4px',
+					'-moz-outline-radius'		: '4px',
+					'outline-radius'				: '4px'
 				},
-				
 			},
-			
-		});
-		
-	})(jQuery);
-	
-	Alchemy.ElementSelector.init();
-	
-}
 
-// Found on http://css-tricks.com/snippets/jquery/load-jquery-only-if-not-present/
-// 
-// Only do anything if jQuery isn't defined
-// 
+			scrollOffset : 20,
+
+			init : function() {
+				var self = Alchemy.ElementSelector;
+				var $elements = $('[data-alchemy-element]');
+				var styles = self.styles;
+				$elements.bind('mouseover', function(e) {
+					$(this).attr('title', 'Klicken zum bearbeiten');
+					if (!$(this).hasClass('selected'))
+						$(this).css(styles.hover);
+				});
+				$elements.bind('mouseout', function() {
+					$(this).removeAttr('title');
+					if (!$(this).hasClass('selected'))
+						$(this).css(styles.reset);
+				});
+				$elements.bind('Alchemy.SelectElement', self.selectElement);
+				$elements.bind('click', self.clickElement);
+				self.$previewElements = $elements;
+			},
 
-(function() {
-	
-	if (typeof(jQuery) === 'undefined') {
-		
-		var thisPageUsingOtherJSLibrary = false;
-		
-		if (typeof($) === 'function') {
-			thisPageUsingOtherJSLibrary = true;
-		}
-		
-		function getScript(url, success) {
-			var script = document.createElement('script');
-			var head = document.getElementsByTagName('head')[0], done = false;
-			script.src = url;
-			// Attach handlers for all browsers
-			script.onload = script.onreadystatechange = function() {
-				if (!done && (!this.readyState || this.readyState === 'loaded' || this.readyState === 'complete')) {
-					done = true;
-					// callback function provided as param
-					success();
-					script.onload = script.onreadystatechange = null;
-					head.removeChild(script);
-				};
-			};
-			head.appendChild(script);
-		};
-		
-		getScript('/assets/jquery.min.js', function() {
-			if (typeof(jQuery) !== 'undefined') {
-				if (thisPageUsingOtherJSLibrary) {
-					jQuery.noConflict();
+			selectElement : function(e) {
+				var $this = $(this);
+				var self = Alchemy.ElementSelector;
+				var $elements = self.$previewElements;
+				var styles = self.styles;
+				var offset = self.scrollOffset;
+				e.preventDefault();
+				$elements.removeClass('selected').css(styles.reset);
+				$this.addClass('selected').css(styles.selected);
+				$('html, body').animate({
+					scrollTop: $this.offset().top - offset,
+					scrollLeft: $this.offset().left - offset
+				}, 400);
+			},
+
+			clickElement : function(e) {
+				var $this = $(this);
+				var parent$ = window.parent.jQuery;
+				var target_id = $this.attr('data-alchemy-element');
+				var $element_editor = parent$('#element_area .element_editor').closest('[id="element_'+target_id+'"]');
+				var $elementsWindow = parent$('#alchemyElementWindow');
+				e.preventDefault();
+				$element_editor.trigger('Alchemy.SelectElementEditor', target_id);
+				if ($elementsWindow.dialog("isOpen")) {
+					$elementsWindow.dialog('moveToTop');
+				} else {
+					$elementsWindow.dialog('open');
 				}
-				initAlchemyPreviewMode();
-			}
-		});
-		
-	} else {
-		initAlchemyPreviewMode();
-	};
-	
-})();
+				$this.trigger('Alchemy.SelectElement');
+			},
+
+		},
+
+	});
+
+	Alchemy.ElementSelector.init();
+
+}
+
+if (typeof(jQuery) === 'undefined') {
+	Alchemy.loadjQuery(Alchemy.initAlchemyPreviewMode);
+} else {
+	Alchemy.initAlchemyPreviewMode();
+}