alchemy_cms 2.1.beta5 → 2.1.beta6

data/Gemfile

@@ -7,7 +7,7 @@ gem 'declarative_authorization', :git => 'git://github.com/stffn/declarative_aut
 group :test do
 	gem 'factory_girl_rails'
 	gem "capybara"
-	#gem 'capybara-webkit'
+	gem 'capybara-webkit'
 	gem "launchy"
 	gem "database_cleaner"
 	gem "fuubar"

data/README.md

@@ -76,6 +76,20 @@ Start the local server:
 
 Then just switch to your browser and open `http://localhost:3000`
 
+Upgrading
+------------
+
+Projects running with Alchemy CMS version < 2.1 needs to be upgraded.
+
+Otherwise errors will be raised like this:
+`uninitialized constant EssenceText`
+
+You have to use the following Upgrade-Task.
+Run in terminal:
+
+    rake alchemy:upgrade
+
+
 Add to existing Rails project
 -----------------------------
 

data/alchemy_cms.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
   s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
   s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
-  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2"])
+  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
 
 	s.add_development_dependency(%q<rspec-rails>, ["~> 2.7"])
 	s.add_development_dependency(%q<sqlite3>)

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

@@ -27,7 +27,8 @@ if (typeof(Alchemy) === 'undefined') {
 					url: Alchemy.routes.admin_picture_path(id),
 					type: 'PUT',
 					data: {
-						name: value
+						name: value,
+						size: Alchemy.getUrlParam('size')
 					}
 				});
 				return false;
@@ -211,8 +212,13 @@ if (typeof(Alchemy) === 'undefined') {
 				console.debug(e);
 				console.trace();
 			}
+		},
+
+		getUrlParam : function(name){
+			var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
+			return results[1] || 0;
 		}
-		
+
 	});
 	
 })(jQuery);

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

@@ -71,7 +71,7 @@ if (typeof(Alchemy) === 'undefined') {
 				tolerance: 'pointer',
 				containment: 'parent',
 				update: function(event, ui) {
-					var ids = $.map($(event.target).children('div.dragable_picture'), function (child) {
+					var ids = $.map($(this).children('div.dragable_picture'), function (child) {
 						return child.id.replace(/essence_picture_/, '');
 					});
 					$(event.originalTarget).css("cursor", "progress");

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

@@ -144,16 +144,7 @@ if (typeof(Alchemy) === 'undefined') {
         // Handling an external link.
         if (link.className == 'external') {
           $('#overlay_tabs').tabs("select", '#overlay_tab_external_link');
-          var protocols = [];
-          $('#url_protocol option').map(function() {
-            protocols.push($(this).attr('value'));
-          });
-          $(protocols).each(function(index, value) {
-            if (link.href.beginsWith(value)) {
-              $('#external_url').val(link.href.replace(value, ""));
-              $('#url_protocol').val(value);
-            }
-          });
+          $('#external_url').val(link.href);
         }
         
         // Handling a file link.

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

@@ -1,6 +1,6 @@
 // This object provides dynamically generated Rails routes in Javascript.
 // A little bit hacky, but the best solution so far. ^_^
-<% alchemy_routes = Alchemy::Engine.routes %>
+<% self.class.send(:include, Alchemy::Engine.routes.url_helpers) %>
 if (typeof(Alchemy) === 'undefined') {
 	var Alchemy = {};
 }
@@ -13,25 +13,25 @@ if (typeof(Alchemy) === 'undefined') {
 	Alchemy.routes = {
 
 		admin_picture_path: function(id) {
-			return '<%= alchemy_routes.generate(:controller => "alchemy/admin/pictures", :action => "update", :id => 1).first %>'.replace(/1/, id);
+			return '<%= admin_picture_path(:id => 1) %>'.replace(/1/, id);
 		},
 
 		admin_trash_path : function(page_id) {
-			var url = '<%= alchemy_routes.generate(:controller => "alchemy/admin/trash", :action => "index").first %>';
+			var url = '<%= admin_trash_path %>';
 			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);
+			return '<%= fold_admin_element_path(:id => 1) %>'.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 %>'
+		list_admin_elements_path: '<%= list_admin_elements_path %>',
+		order_admin_contents_path: '<%= order_admin_contents_path %>',
+		order_admin_elements_path: '<%= order_admin_elements_path %>',
+		order_admin_pages_path: '<%= order_admin_pages_path %>',
+		link_admin_pages_path: '<%= link_admin_pages_path %>'
 
 	}
 

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 html {
 	height: 100%;
@@ -1282,18 +1282,18 @@ div#user_list_legend {
 }
 
 #toolbar div.button_with_label form label {
-	margin-top: 5px;
+	margin-top: $default-margin;
 }
 
 #toolbar div.search_field {
 	position: relative;
 	float: left;
-	margin-bottom: 4px;
+	margin-bottom: $default-margin;
 }
 
 #toolbar div p {
 	float: right;
-	margin: 3px 4px 0 0;
+	margin: 3px $default-margin 0 0;
 	padding: 0;
 }
 
@@ -1303,8 +1303,8 @@ div#toolbar div.toolbar_spacer {
 	height: 37px;
 	border-right-style: dotted;
 	border-right-width: 1px;
-	margin-right: 8px;
-	margin-left: 4px;
+	margin-right: 2*$default-margin;
+	margin-left: $default-margin;
 }
 
 div#toolbar a.button {
@@ -2484,23 +2484,65 @@ div.button_with_label {
 	margin-left: 8px;
 	float: left;
 	min-width: 70px;
-}
-
-div.button_with_label.active .icon_button {
-	background-color: #cdd6db;
-	border-style: inset;
-	border-color: #bfbfbf;
-}
-
-div.button_with_label.active label{
-	color: black;
-	text-shadow: white 0 0 2px;
-}
-
-div.button_with_label.disabled {
-	position: relative;
-	@include opacity(50);
-	cursor: default;
+	line-height: 0;
+	
+	&.active {
+		.icon_button {
+			background-color: #cdd6db;
+			border-style: inset;
+			border-color: #bfbfbf;
+		}
+		label {
+			color: black;
+			text-shadow: white 0 0 2px;
+		}
+	} 
+
+	.disabledButton {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+	}
+
+	a.icon_button {
+		float: none;
+		margin-right: auto;
+		margin-left: auto;
+		display: inline-block;
+		position: relative;
+	}
+
+	&.disabled {
+		position: relative;
+		@include opacity(50);
+		cursor: default;
+		
+		a:hover, a:active {
+			cursor: default;
+			background-color: #f7f7f7;
+			border: 1px solid #9a9a9a;
+		}
+		
+		&:before {
+			content: '';
+			position: absolute;
+			z-index: 1;
+			width: 100%;
+			height: 100%;
+			background-color: transparent;
+			@include opacity(50);
+		}
+		
+		&:hover label {
+			color: $text-color;
+			cursor: default;
+		}
+		
+	}
+	
 }
 
 .icon_button.disabled span {
@@ -2515,50 +2557,10 @@ div.button_with_label.disabled {
 	cursor: default;
 }
 
-div.button_with_label.disabled:before {
-	content: '';
-	position: absolute;
-	z-index: 1;
-	width: 100%;
-	height: 100%;
-	background-color: transparent;
-	@include opacity(50);
-}
-
-div.button_with_label.disabled a:hover, 
-div.button_with_label.disabled a:active {
-	cursor: default;
-	background-color: #f7f7f7;
-	border: 1px solid #9a9a9a;
-}
-
-div.button_with_label.disabled:hover label {
-	color: $text-color;
-	cursor: default;
-}
-
-div.button_with_label .disabledButton {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 1;
-}
-
-div.button_with_label a.icon_button {
-	float: none;
-	margin-right: auto;
-	margin-left: auto;
-	display: inline-block;
-	position: relative;
-}
-
-div#toolbar label,
-div#overlay_toolbar label {
+div#toolbar label, div#overlay_toolbar label {
 	font-size: 10px;
 	text-shadow: #fff 0 1px 2px;
-	margin-top: 2px;
+	margin-top: $default-margin;
 	display: block;
 	line-height: 13px;
 }
@@ -2572,7 +2574,7 @@ div.button_with_label:hover label {
 	padding: $default-padding;
 	border: 1px solid #9a9a9a;
 	@include rounded-corner;
-	margin-right: 4px;
+	margin-right: $default-margin;
 	background: #fff image-url('alchemy/shading.png') repeat-x 0 -75px;
 	text-decoration: none;
 }

data/app/assets/stylesheets/alchemy/elements.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 #alchemy div.content_editor input.text_with_icon.auto_resize.thin_border {
 	padding-right: 52px;
@@ -426,7 +426,7 @@ a.icon_button.linked {
 	cursor: default;
 }
 
-div.content_editor.essence_picture_editor {
+div.essence_picture_editor {
 	position: relative;
 	float: left;
 	margin: 0;
@@ -444,6 +444,7 @@ div.essence_picture_editor.validation_failed .picture_thumbnail {
 	border-color: #931f23;
 	-webkit-box-shadow: #931f23 0px 1px 3px;
 	-moz-box-shadow: #931f23 0px 1px 3px;
+	-ms-box-shadow: #931f23 0px 1px 3px;
 	-o-box-shadow: #931f23 0px 1px 3px;
 	box-shadow: #931f23 0px 1px 3px;
 }

data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 /*
  * jQuery UI CSS Framework 1.8.7

data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
 .jcrop-holder { text-align: left; }
 

data/app/assets/stylesheets/alchemy/jquery.sb.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 /* always visible styles */
 

data/app/assets/stylesheets/alchemy/tinymce_content.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 body, td, pre {
 	color: $text-color;

data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss

@@ -1,4 +1,4 @@
-@import "defaults";
+@import "alchemy/defaults";
 
 /* Generic */
 

data/app/controllers/alchemy/admin/base_controller.rb

@@ -110,7 +110,7 @@ module Alchemy
 			def per_page_value_for_screen_size
 				return 25 if session[:screen_size].blank?
 				screen_height = session[:screen_size].split('x').last.to_i
-				(screen_height / 35) - 5
+				(screen_height / 35) - 6
 			end
 
 		end

data/app/controllers/alchemy/admin/contents_controller.rb

@@ -34,7 +34,7 @@ module Alchemy
 			end
 
 			def order
-				for id in params[:content_ids]
+				params[:content_ids].each do |id|
 					content = Content.find(id)
 					content.move_to_bottom
 				end

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -42,8 +42,9 @@ module Alchemy
 					source_element = Element.find(element_from_clipboard[:id])
 					@element = Element.copy(source_element, {:page_id => @page.id})
 					if element_from_clipboard[:action] == 'cut'
-						source_element.destroy
+						@cutted_element_id = source_element.id
 						@clipboard.delete_if { |i| i[:id].to_i == source_element.id }
+						source_element.destroy
 					end
 				else
 					@element = Element.new_from_scratch(params[:element])

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -54,7 +54,7 @@ module Alchemy
 				else
 					page = Page.create(params[:page])
 				end
-				render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, t("Page created.", :name => page.name), 'form#new_page_form button.button')
+				render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, t("Page created", :name => page.name), 'form#new_page_form button.button')
 			end
 
 			# Edit the content of the page and all its elements and contents.
@@ -210,7 +210,7 @@ module Alchemy
 
 			def switch_language
 				set_language_from(params[:language_id])
-				redirect_path = params[:layoutpages] ? admin_layoutpages_path : admin_pages_path
+				redirect_path = request.referer.include?('admin/layoutpages') ? admin_layoutpages_path : admin_pages_path
 				if request.xhr?
 					@redirect_url = redirect_path
 					render :action => :redirect
@@ -240,12 +240,22 @@ module Alchemy
 
 			def expire_page(page)
 				return if page.do_not_sweep
-				expire_action(
-					:controller => '/pages',
-					:action => :show,
-					:urlname => page.urlname_was,
-					:lang => multi_language? ? page.language_code : nil
-				)
+				# TODO: We should change this back to expire_action after Rails 3.2 was released.
+				# expire_action(
+				# 	alchemy.show_page_url(
+				# 		:urlname => page.urlname_was,
+				# 		:lang => multi_language? ? page.language_code : nil
+				# 	)
+				# )
+				# Temporarily fix for Rails 3 bug
+				expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
+					self,
+					alchemy.show_page_url(
+						:urlname => page.urlname_was,
+						:lang => multi_language? ? page.language_code : nil
+					),
+					false
+				).path)
 			end
 
 		end