alchemy_cms 2.1.5 → 2.1.6

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 bundler_args: --without development
 rvm:
   - 1.8.7

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

@@ -133,7 +133,7 @@ if (typeof(Alchemy) === 'undefined') {
 		setElementSaved : function(selector) {
 			var $element = $(selector);
 			Alchemy.setElementClean(selector);
-			Alchemy.enableButton(selector + ' button.button');
+			Alchemy.enableButton('button.button', $element);
 		},
 		
 		resizeFrame : function() {

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

@@ -7,17 +7,17 @@ if (typeof(Alchemy) === 'undefined') {
 	$.extend(Alchemy, {
 
 		ButtonObserver: function (selector) {
-			$(selector).click(function(event) {
+			$(selector).not('.no-spinner').click(function(event) {
 				Alchemy.disableButton(this);
 			});
 		},
 
 		disableButton: function (button) {
 			var $button = $(button), $clone = $button.clone(), width = $button.outerWidth(), text = $button.text();
-			$button.hide();
+			$button.hide().addClass('disabled');
 			$button.parent().append($clone);
 			$clone.attr({disabled: true, href: 'javascript:void(0)'})
-			.addClass('disabled cloned-button')
+			.addClass('cloned-button')
 			.css({width: width})
 			.html('<img src="/assets/alchemy/ajax_loader.gif" style="width: 16px; height: 16px">')
 			.show();
@@ -25,8 +25,8 @@ if (typeof(Alchemy) === 'undefined') {
 		},
 
 		enableButton: function (button) {
-			var $button = $(button);
-			$button.show();
+			var $button = $(button).not('.no-spinner');
+			$button.show().removeClass('disabled');
 			$button.parent().find('.cloned-button').remove();
 			return true;
 		}

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

@@ -22,7 +22,7 @@ if (typeof(Alchemy) === 'undefined') {
 						return $(child).attr('data-element-id');
 					});
 					var params_string = '';
-					var cell_id = $(event.target).attr('data-cell-id');
+					var cell_id = $(this).attr('data-cell-id');
 					// Is the trash window open?
 					if ($('#alchemyTrashWindow').length > 0) {
 						// updating the trash icon

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

@@ -18,8 +18,8 @@ if (typeof(Alchemy) === 'undefined') {
 		reinit : function(elements) {
 			var self = Alchemy.ElementEditorSelector;
 			var $elements = $(elements);
-			$elements.each(function () {
-				self.bindEvent(this, $elements);
+			$elements.each(function() {
+				self.bindEvent(this);
 			});
 			$elements.find('.element_head').click(self.onClickElement);
 			$elements.find('.element_head').dblclick(function() {

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

@@ -170,7 +170,7 @@ if (typeof(Alchemy) === 'undefined') {
 							Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
 						},
 						complete: function(jqXHR, textStatus) {
-							Alchemy.enableButton('.button');
+							Alchemy.enableButton('.disabled.button');
 						}
 					});
 				},

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

@@ -1469,19 +1469,28 @@ div#overlay_toolbar a.button:active {
 	margin: 1px 0 0 -12px;
 }
 
-#clipboard_items ul {
-	list-style-type: none;
-	margin: 0 0 16px;
-	padding: 0;
-	height: 180px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-#clipboard_items ul li {
-	padding: $default-padding;
-	background: white;
-}
+#clipboard_items {
+
+	ul {
+		list-style-type: none;
+		margin: 0 0 8px;
+		padding: 0;
+		height: 220px;
+		overflow-y: auto;
+		overflow-x: hidden;
+
+		li {
+			padding: 2*$default-padding;
+			border: $default-border;
+			background-color: white;
+			@include rounded-corner;
+			&.element {
+				background-color: #E5DCCA;
+				border: 1px solid #BBA589;
+			}
+		}
+	}
+} 
 
 .mceEditor table {
 	border-spacing: 0 !important;

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

@@ -1,6 +1,6 @@
 @import "alchemy/defaults";
 
-a.button.small.disabled img {
+a.button.small.cloned-button img {
 	display: inline-block;
 	float: none;
 	position: relative;
@@ -82,15 +82,15 @@ a.button:active {
 	background-color: #e5e5e5;
 }
 
-a.button.disabled,
-a.button.disabled:hover,
-a.button.disabled:active,
-input.button.disabled,
-input.button.disabled:hover,
-input.button.disabled:active,
-button.button.disabled,
-button.button.disabled:hover,
-button.button.disabled:active {
+a.button.cloned-button,
+a.button.cloned-button:hover,
+a.button.cloned-button:active,
+input.button.cloned-button,
+input.button.cloned-button:hover,
+input.button.cloned-button:active,
+button.button.cloned-button,
+button.button.cloned-button:hover,
+button.button.cloned-button:active {
 	color: $text-color;
 	text-shadow: none;
 	border-color: #ccc;
@@ -101,15 +101,15 @@ button.button.disabled:active {
 	line-height: 15px;
 }
 
-a.button.disabled,
-a.button.disabled:hover,
-a.button.disabled:active {
+a.button.cloned-button,
+a.button.cloned-button:hover,
+a.button.cloned-button:active {
 	padding: 2px 0 !important;
 	line-height: 13px !important;
 	text-align: center;
 }
 
-a.button.disabled img {
+a.button.cloned-button img {
 	display: inline-block;
 	float: none;
 }

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

@@ -437,6 +437,17 @@ a.icon_button.linked {
 	cursor: default;
 }
 
+div.content_editor.essence_date {
+	float: none;
+	display: inline;
+	display: inline-block;
+	vertical-align: top;
+
+	input.date {
+		width: 154px;
+	}
+}
+
 div.essence_picture_editor {
 	float: left;
 	height: 126px;
@@ -613,12 +624,6 @@ table.content_editor_table {
 	width: 210px;
 }
 
-div.content_editor label.inline {
-	display: inline-block;
-	min-width: 90px;
-	margin-right: 4px;
-}
-
 a.new_content_link {
 	float: none;
 	display: inline-block;
@@ -649,10 +654,6 @@ div.content_text_editor.text_short {
 	display: inline;
 }
 
-div.content_editor input.thin_border {
-	width: 97%;
-}
-
 input.long,
 input.text_long {
 	width: 363px;
@@ -671,53 +672,85 @@ div.content_text_editor input.text_short {
 	padding: 2px;
 }
 
+#alchemy .ui-dialog-content div.content_editor input.auto_resize {
+	width: 100%;
+}
+
+// div.element_content {
+// 	white-space: nowrap;
+
+// 	p, div {
+// 		white-space: normal;
+// 	}
+// }
+
 div.content_editor {
 	margin-bottom: 8px;
 	margin-top: 8px;
 	position: relative;
-}
 
-div.content_editor.missing p {
-	line-height: 25px;
-	padding: 2*$default-padding;
-	border: 1px solid #f5b04e;
-	background-color: #f5dea9;
-	@include rounded-corner;
-	font-size: 11px;
-}
+	input.thin_border {
+		width: 97%;
+	}
 
-div.content_editor.missing p span.icon.warning {
-	position: relative;
-	top: 2px;
-	left: 2px;
-	margin-right: 8px;
-}
+	&.missing p {
+		line-height: 25px;
+		padding: 2*$default-padding;
+		border: 1px solid #f5b04e;
+		background-color: #f5dea9;
+		@include rounded-corner;
+		font-size: 11px;
+
+		span.icon.warning {
+			position: relative;
+			top: 2px;
+			left: 2px;
+			margin-right: 8px;
+		}
+	}
 
-#alchemy .ui-dialog-content div.content_editor input.auto_resize {
-	width: 100%;
-}
+	&.display_inline {
+		display: inline;
+		display: inline-block;
+		margin-right: 4px;
+		vertical-align: top;
+		
+		input.thin_border {
+			width: 170px;
+		}
+	}
 
-div.content_editor.validation_failed label {
-	color: #931f23;
-}
+	&.validation_failed {
 
-div.content_editor.validation_failed input {
-	border: 1px solid #931f23;
-	background-color: #f9e8e9;
-}
+		label {
+			color: #931f23;
+		}
 
-div.content_editor label {
-	display: block;
-	margin-bottom: 0.5em;
-	font-size: 10px;
-	text-shadow: #fff5e1 1px 1px 0;
-	line-height: 15px;
-	text-indent: 1px;
-}
+		input {
+			border: 1px solid #931f23;
+			background-color: #f9e8e9;
+		}
+	}
 
-div.content_editor label span.warning.icon {
-	position: relative;
-	top: 2px;
+	label {
+		display: block;
+		margin-bottom: 0.5em;
+		font-size: 10px;
+		text-shadow: #fff5e1 1px 1px 0;
+		line-height: 15px;
+		text-indent: 1px;
+
+		span.warning.icon {
+			position: relative;
+			top: 2px;
+		}
+
+		&.inline {
+			display: inline-block;
+			min-width: 90px;
+			margin-right: 4px;
+		}
+	}
 }
 
 .element_editor div.error {

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

@@ -70,7 +70,7 @@ module Alchemy
 				else
 					@element_validated = false
 					@notice = t('Validation failed')
-					@error_message = "<h2>#{@notice}</h2><p>#{t('Please check contents below.')}</p>".html_safe
+					@error_message = "<h2>#{@notice}</h2><p>#{t(:content_validations_headline)}</p>".html_safe
 				end
 			end
 

data/app/helpers/alchemy/admin/base_helper.rb

@@ -189,7 +189,8 @@ module Alchemy
 				select_options = options_for_select(select_options, content.essence.content)
 				select_tag(
 					"contents[content_#{content.id}]",
-					select_options
+					select_options,
+					:class => 'alchemy_selectbox'
 				)
 			end
 
@@ -301,13 +302,13 @@ module Alchemy
 			def clipboard_select_tag(items, html_options = {})
 				options = [[t('Please choose'), ""]]
 				items.each do |item|
-					options << [item.class.to_s == 'Element' ? item.display_name_with_preview_text : item.name, item.id]
+					options << [item.class.to_s == 'Alchemy::Element' ? item.display_name_with_preview_text : item.name, item.id]
 				end
 				select_tag(
 					'paste_from_clipboard',
 					!@page.new_record? && @page.can_have_cells? ? grouped_elements_for_select(items, :id) : options_for_select(options),
 					{
-						:class => html_options[:class],
+						:class => [html_options[:class], 'alchemy_selectbox'].join(' '),
 						:style => html_options[:style]
 					}
 				)

data/app/helpers/alchemy/admin/elements_helper.rb

@@ -99,14 +99,14 @@ module Alchemy
 			end
 
 			def element_array_for_options(e, object_method, cell = nil)
-				if e.class.name == 'Element'
+				if e.class.name == 'Alchemy::Element'
 					[
 						e.display_name_with_preview_text,
 						e.send(object_method).to_s + (cell ? "##{cell['name']}" : "")
 					]
 				else
 					[
-						t(e['name'], :scope => :element_names),
+						Alchemy::I18n.t(e['name'], :scope => :element_names),
 						e[object_method] + (cell ? "##{cell['name']}" : "")
 					]
 				end

data/app/helpers/alchemy/admin/essences_helper.rb

@@ -78,28 +78,21 @@ module Alchemy
 			end
 
 			# Renders the EssenceText editor partial with a form select for storing page urlnames
-			# Options:
-			#   * element - element the Content find via content_name to store the pages urlname in.
-			#   * content_name - the name of the content from element to store the pages urlname in.
-			#   * options (Hash)
-			#   ** :only (Hash)  - pass page_layout names to :page_layout => [""] so only pages with this page_layout will be displayed inside the select.
-			#   ** :except (Hash)  - pass page_layout names to :page_layout => [""] so all pages except these with this page_layout will be displayed inside the select.
-			#   ** :page_attribute (Symbol) - The Page attribute which will be stored.
+			# 
+			# === Options:
+			# 
+			#   :only            [Hash]     # Pagelayout names. Only pages with this page_layout will be displayed inside the select.
+			#   :page_attribute  [Symbol]   # The Page attribute which will be stored.
+			# 
 			def page_selector(element, content_name, options = {}, select_options = {})
 				default_options = {
-					:except => {
-						:page_layout => [""]
-					},
-					:only => {
-						:page_layout => [""]
-					},
 					:page_attribute => :id,
 					:prompt => t('Choose page')
 				}
 				options = default_options.merge(options)
 				pages = Page.where({
 					:language_id => session[:language_id],
-					:page_layout => options[:only][:page_layout],
+					:page_layout => options[:only],
 					:public => true
 				})
 				content = element.content_by_name(content_name)

data/app/models/alchemy/element.rb

@@ -372,7 +372,7 @@ module Alchemy
 		end
 
 		def has_ingredient?(name)
-			!self.ingredient(name).blank?
+			self.ingredient(name).present?
 		end
 
 		def save_contents(params)
@@ -400,14 +400,17 @@ module Alchemy
 		def essence_errors
 			essence_errors = {}
 			essences.each do |essence|
-				unless essence.essence_errors.blank?
-					essence_errors[essence.content.name] = essence.essence_errors
+				unless essence.errors.blank?
+					essence_errors[essence.content.name] = essence.validation_errors
 				end
 			end
 			essence_errors
 		end
 
-		# Essence validation errors messages are translated via ::I18n.
+		# Essence validation errors
+		# 
+		# Messages are translated via I18n.
+		# 
 		# Inside your translation file add translations like:
 		# 
 		#   alchemy:
@@ -422,12 +425,12 @@ module Alchemy
 		# * taken
 		# * wrong_format
 		# 
-		# Example:
+		# === Example:
 		# 
 		#   de:
 		#     alchemy:
 		#       content_validations:
-		#         contact:
+		#         contactform:
 		#           email:
 		#             wrong_format: 'Die Email hat nicht das richtige Format'
 		# 
@@ -435,11 +438,11 @@ module Alchemy
 			messages = []
 			essence_errors.each do |content_name, errors|
 				errors.each do |error|
-					messages << I18n.t(
-						"content_validations.#{self.name}.#{content_name}.#{error}",
+					messages << I18n.t(error,
+						:scope => [:content_validations, self.name, content_name],
 						:default => [
-							"content_validations.fields.#{content_name}.#{error}".to_sym,
-							"content_validations.errors.#{error}".to_sym
+							"alchemy.content_validations.fields.#{content_name}.#{error}".to_sym,
+							"alchemy.content_validations.errors.#{error}".to_sym
 						],
 						:field => Content.translated_label_for(content_name)
 					)