alchemy_cms 2.1.1 → 2.1.2

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - ree
 branches:
   only:
-    - next_stable
+    - master
 before_script:
   #- "mysql -e 'create database alchemy_cms_test;'"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"

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

@@ -106,6 +106,17 @@ if (typeof(Alchemy) === 'undefined') {
 			};
 		},
 		
+		removePicture : function(selector) {
+			var $form_field = $(selector);
+			var $element = $form_field.parents('.element_editor');
+			if ($form_field) {
+				$form_field.val('');
+				$form_field.prev().remove();
+				$form_field.parent().addClass('missing');
+				Alchemy.setElementDirty($element);
+			}
+		},
+		
 		saveElement : function(form) {
 			// disabled for now. I think we don't need this.
 			return true;

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

@@ -30,7 +30,7 @@ if (typeof(Alchemy) === 'undefined') {
 		},
 
 		setElementDirty : function(element) {
-			var	$element = $(element);
+			var $element = $(element);
 			$element.addClass('dirty');
 			$element.find('.element_head .icon').addClass('element_dirty');
 		},

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

@@ -65,7 +65,6 @@ if (typeof(Alchemy) === 'undefined') {
 			$(selector).sortable({
 				items: 'div.dragable_picture',
 				handle: 'div.picture_handle',
-				placeholder: 'droppable_content_placeholder',
 				opacity: 0.5,
 				cursor: 'move',
 				tolerance: 'pointer',

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

@@ -923,17 +923,6 @@ div#image_assign_filter_and_image_sizing {
 	cursor: image-url('alchemy/lupe.cur'), zoom-in, pointer;
 }
 
-.essence_picture_editor .picture_thumbnail {
-	width: 111px;
-	height: 115px;
-	margin: 1px;
-}
-
-.essence_picture_editor .picture_thumbnail .thumbnail_background {
-	width: 111px;
-	height: 93px;
-}
-
 div.picture_thumbnail.small {
 	width: 80px;
 	height: 75px;

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

@@ -245,7 +245,6 @@ form.add_gallery_to_index {
 }
 
 div.picture_gallery_images {
-	margin-top: 8px;
 	overflow: hidden;
 	margin-bottom: 8px;
 	border: 1px inset #cecece;
@@ -434,9 +433,18 @@ a.icon_button.linked {
 }
 
 div.essence_picture_editor {
-	position: relative;
 	float: left;
-	margin: 0;
+	height: 126px;
+	margin: 1px;
+	position: relative;
+}
+
+div.essence_picture_editor.content_editor {
+	float: none;
+	height: auto;
+	display: inline;
+	display: inline-block;
+	margin: 8px 0;
 }
 
 div.essence_picture_editor .picture_tool_delete {
@@ -470,28 +478,18 @@ div.essence_picture_css_class {
 	overflow: hidden;
 }
 
-div.essence_picture_editor:hover .picture_tool_delete {
+div.essence_picture_editor .picture_thumbnail:hover .picture_tool_delete {
 	display: block;
 }
 
-.dragable_picture {
-	float: left;
-}
-
-.picture_thumbnail div.missing_image {
-	height: 94px;
-	text-align: center;
-	line-height: 28px;
-	color: #b3b3b3;
+div.essence_picture_editor .thumbnail_background.missing {
+	background-image: image-url('alchemy/placeholder.png');
+	background-repeat: no-repeat;
+	background-position: center 12px;
 }
 
-.validation_failed .picture_thumbnail div.missing_image {
-	color: #931f23;
-}
-
-.picture_thumbnail div.missing_image img {
-	position: relative;
-	top: 10px;
+.dragable_picture {
+	float: left;
 }
 
 .picture_thumbnail .picture_handle {
@@ -510,10 +508,30 @@ div.essence_picture_editor:hover .picture_tool_delete {
 }
 
 .picture_content_spinner {
+	background: #666666;
+	height: 93px;
+	left: 4px;
 	position: absolute;
-	z-index: 0;
-	top: 35px;
-	left: 39px;
+	top: 4px;
+	width: inherit;
+	img {
+		top: 50%;
+		left: 50%;
+		position: absolute;
+		margin-top: -16px;
+		margin-left: -16px;
+	}
+}
+
+.essence_picture_editor .picture_thumbnail {
+	width: 111px;
+	height: 115px;
+	margin: 0;
+}
+
+.essence_picture_editor .picture_thumbnail .thumbnail_background {
+	width: 111px;
+	height: 93px;
 }
 
 div.file {
@@ -689,6 +707,7 @@ div.content_editor label {
 	font-size: 10px;
 	text-shadow: #fff5e1 1px 1px 0;
 	line-height: 15px;
+	text-indent: 1px;
 }
 
 div.content_editor label span.warning.icon {
@@ -777,16 +796,6 @@ textarea.tinymce {
 	border-width: 1px;
 }
 
-.droppable_content_placeholder {
-	border: 1px dotted #bba589;
-	background-color: #f0e8d7;
-	float: left;
-	width: 111px;
-	height: 115px;
-	padding: 4px;
-	margin: 1px;
-}
-
 div.element_editor div.error {
 	padding: 8px 4px 8px 32px;
 	margin-bottom: 8px;

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

@@ -18,7 +18,7 @@ module Alchemy
 					@options = Rack::Utils.parse_query(@options)
 				end
 				if @content.essence_type == "Alchemy::EssencePicture"
-					@content.essence.picture = Picture.find(params[:picture_id])
+					@content.essence.picture_id = params[:picture_id]
 					@content.essence.save
 					@contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
 					@dragable = @contents_of_this_type.length > 1

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

@@ -50,7 +50,7 @@ module Alchemy
 				resource_instance_variable.save
 				render_errors_or_redirect(
 					resource_instance_variable,
-					url_for({:action => :index}),
+					resource_url_scope.url_for({:action => :index}),
 					flash_notice_for_resource_action
 				)
 			end
@@ -59,7 +59,7 @@ module Alchemy
 				resource_instance_variable.update_attributes(params[resource_model_name.to_sym])
 				render_errors_or_redirect(
 					resource_instance_variable,
-					url_for({:action => :index}),
+					resource_url_scope.url_for({:action => :index}),
 					flash_notice_for_resource_action
 				)
 			end

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

@@ -37,20 +37,22 @@ module Alchemy
 				render_element(element, :editor)
 			end
 
-			# This helper renderes the picture editor for the elements on the Alchemy Desktop.
-			# It brings full functionality for adding images to the element, deleting images from it and sorting them via drag'n'drop.
+			# Renders a drag'n'drop picture gallery editor for all EssencePictures.
+			# 
+			# It brings full functionality for adding images, deleting images and sorting them via drag'n'drop.
 			# Just place this helper inside your element editor view, pass the element as parameter and that's it.
 			#
-			# Options:
-			# :maximum_amount_of_images (integer), default nil. This option let you handle the amount of images your customer can add to this element.
-			def render_picture_editor(element, options={})
+			# === Options:
+			# 
+			#   :maximum_amount_of_images    [Integer]   # This option let you handle the amount of images your customer can add to this element.
+			# 
+			def render_picture_gallery_editor(element, options={})
 				default_options = {
-					:last_image_deletable => true,
 					:maximum_amount_of_images => nil,
-					:refresh_sortable => true
+					:grouped => true
 				}
 				options = default_options.merge(options)
-				picture_contents = element.all_contents_by_type("Alchemy::EssencePicture")
+				picture_contents = element.contents.where(:essence_type => "Alchemy::EssencePicture")
 				render(
 					:partial => "alchemy/admin/elements/picture_editor",
 					:locals => {
@@ -60,6 +62,7 @@ module Alchemy
 					}
 				)
 			end
+			alias_method :render_picture_editor, :render_picture_gallery_editor
 
 			# Returns all elements that could be placed on that page because of the pages layout.
 			# The elements are returned as an array to be used in alchemy_selectbox form builder.

data/app/helpers/alchemy/pages_helper.rb

@@ -442,7 +442,9 @@ module Alchemy
 		def render_search_form(options={})
 			default_options = {
 				:page => @search_result_page,
-				:html5 => false
+				:html5 => false,
+				:button_value => t("search"),
+				:button_class => nil
 			}
 			options = default_options.merge(options)
 			if options[:page].class.name != "Alchemy::Page"
@@ -453,7 +455,7 @@ module Alchemy
 				if options[:html5]
 					search_field_tag(:query, params[:query])
 				else
-					text_field_tag(:query, params[:query]) + submit_tag(t("search"))
+					text_field_tag(:query, params[:query]) + submit_tag(options[:button_value], :class => options[:button_class], :name => nil)
 				end
 			end
 		end

data/app/models/alchemy/element.rb

@@ -11,7 +11,7 @@ module Alchemy
 		has_and_belongs_to_many :to_be_sweeped_pages, :class_name => 'Alchemy::Page', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
 
 		validates_uniqueness_of :position, :scope => [:page_id, :cell_id]
-		validates_presence_of :name, :on => :create, :message => '^'+Alchemy::I18n.t("Please choose an element.")
+		validates_presence_of :name, :on => :create, :message => '^'+Alchemy::I18n.t(:choose_element)
 
 		attr_accessor :create_contents_after_create
 

data/app/models/alchemy/essence_picture.rb

@@ -8,6 +8,13 @@ module Alchemy
 
 		belongs_to :picture
 		before_save :replace_newlines
+		before_save :fix_crop_from
+
+	private
+
+		def fix_crop_from
+			write_attribute(:crop_from, self.crop_from.to_s.split('x').map { |number| number.to_i < 0 ? "0" : number }.join('x'))
+		end
 
 		def replace_newlines
 			return nil if caption.nil?

data/app/views/alchemy/admin/elements/_element_head.html.erb

@@ -20,7 +20,7 @@
     ) %>
     <%= link_to_function(
       "",
-      "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{ t('Warning!') }', message: '#{ t('This element has unsaved changes. Do you really want to fold it?') }', okLabel: '#{ t('Yes') }', cancelLabel: '#{ t('No') }'})",
+      "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{ t('Warning!') }', message: '#{ t(:element_dirty_notice) }', okLabel: '#{ t('Yes') }', cancelLabel: '#{ t('No') }'})",
       :class => element.folded? ? 'expand_element' : 'fold_element',
       :title => element.folded? ? t('show_element_content') : t('hide_element_content'),
       :id => "element_#{element.id}_folder"

data/app/views/alchemy/admin/elements/_picture_editor.html.erb

@@ -1,22 +1,25 @@
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
-<div class="picture_gallery_images" id="element_<%= element.id %>_contents">
-	<%- for picture_content in picture_contents do -%>
-		<%= render_essence_editor(picture_content, {
-			:dragable => (picture_contents.size > 1)
-		}.merge(options)) %>
-	<%- end -%>
-	<%- if max_image_count.blank? || picture_contents.length < max_image_count.to_i -%>
-		<%= render(
-			:partial => 'alchemy/admin/elements/add_content',
-			:locals => {
-				:element => element,
-				:essence_type => "Alchemy::EssencePicture",
-				:link_text => t("add_image_to_element"),
-				:options => options,
+<div class="content_editor">
+	<label><%= t("picture_gallery_editor.#{element.name}", :default => t('picture_gallery_editor')) %></label>
+	<div class="picture_gallery_images" id="element_<%= element.id %>_contents">
+		<%- picture_contents.each do |picture_content| -%>
+			<%= render_essence_editor(picture_content, {
 				:dragable => (picture_contents.size > 1)
-			}
-		) %>
-	<%- end -%>
+			}.merge(options)) %>
+		<%- end -%>
+		<%- if max_image_count.blank? || picture_contents.length < max_image_count.to_i -%>
+			<%= render(
+				:partial => 'alchemy/admin/elements/add_content',
+				:locals => {
+					:element => element,
+					:essence_type => "Alchemy::EssencePicture",
+					:link_text => t("add_image_to_element"),
+					:options => options,
+					:dragable => (picture_contents.size > 1)
+				}
+			) %>
+		<%- end -%>
+	</div>
 </div>
 <%- if picture_contents.size > 1 -%>
 <script type="text/javascript" charset="utf-8">

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -102,7 +102,7 @@
 			texts: {
 				title: '<%= t("Elements") -%>',
 				dirtyTitle: '<%= t("Warning!") -%>',
-				dirtyMessage: '<%= t("You have unsaved elements. Do you really want to close the elements window?") -%>',
+				dirtyMessage: '<%= t(:element_dirty_close_window_notice) -%>',
 				okLabel: '<%= t("Yes") -%>',
 				cancelLabel: '<%= t("No") -%>'
 			},
@@ -165,12 +165,14 @@
 	jQuery(document).ready(function($) {
 		var texts = {
 			title: '<%= t("Warning!") %>',
-			message: '<%= t("You have unsaved elements on this page. Do you really want to continue?") %>',
+			message: '<%= t(:element_dirty_page_leave_warning) %>',
 			okLabel: '<%= t("Yes") %>',
 			cancelLabel: '<%= t("No") %>'
 		};
 		$('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
-			return Alchemy.checkPageDirtyness(this, texts);
+			var not_dirty = Alchemy.checkPageDirtyness(this, texts);
+			if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
+			return not_dirty;
 		});
 		Alchemy.PageLeaveObserver(texts);
 		Alchemy.openElementsWindow();

data/app/views/alchemy/elements/_searchresult_editor.html.erb

@@ -1 +1 @@
-<p><%= t('This element displays the search and the searchresults.') %></p>
+<p><%= t(:searchresults_editor_info) %></p>

data/app/views/alchemy/elements/_sitemap_editor.html.erb

@@ -1,3 +1,3 @@
 <div class="content_editor">
-	<p><%= t('The sitemap is autogenerated.') %></p>
+	<p><%= t(:sitemap_editor_info) %></p>
 </div>

data/app/views/alchemy/essences/_essence_picture_editor.html.erb

@@ -1,69 +1,75 @@
-<div id="<%= content_dom_id(content) %>" class="<%= options[:dragable] ? 'essence_picture_editor dragable_picture' : 'essence_picture_editor' %>">
-  <div class="picture_thumbnail">
-    <span class="picture_tool_delete">
-    <%= link_to_confirmation_window(
-      "",
-      t("confirm_to_delete_image"),
-      alchemy.admin_essence_picture_path(
-        :id => content,
-        :options => options
-      ),
-      {
-        :title => t("delete_image"),
-        :class => "picture_delete"
-      }
-    ) -%>
-    </span>
-    <%- if content.ingredient.nil? -%>
-    <div class="missing_image">
-      <p>
-        <%= image_tag('alchemy/placeholder.png') %><br>
-        <%= t('Image missing') %><%= '<span class="validation_indicator">*</span>'.html_safe if content.has_validations? %>
-      </p>
-    </div>
-    <%- else -%>
-    <div class="picture_handle" title="<%= t('drag_to_sort') if options[:dragable] %>"></div>
-    <div class="picture_content_spinner">
-      <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-    </div>
-    <div class="picture_image">
-      <div class="thumbnail_background">
-        <%= image_tag(
-          alchemy.thumbnail_path(
-            :id => content.ingredient.id,
-            :size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
-            :crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
-            :crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
-            :crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil,
-			:name => content.ingredient.urlname
-          ),
-          :alt => content.ingredient.name,
-          :class => 'img_paddingtop',
-          :title => t("image_name") + ": #{content.ingredient.name}",
-          :onload => "Alchemy.fadeImage(this, '##{content_dom_id(content)} .picture_content_spinner');",
-          :style => "display: none;"
-        ) %>
-      </div>
-      <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
-    </div>
-    <%- end -%>
-    <%- unless options[:css_class].blank? || content.essence.css_class.blank? -%>
-    <div class="essence_picture_css_class">
-      <%= t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", :default => content.essence.css_class.camelcase) %>
-    </div>
-    <%- end -%>
-    <div class="edit_images_bottom">
-      <%= render(
-        :partial => 'alchemy/essences/essence_picture_tools',
-        :locals => {
-          :content => content,
-          :options => options
-        }
-      ) %>
-    </div>
-  </div>
-  <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
-  <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
-  <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
-  <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
+<div id="<%= content_dom_id(content) %>" class="<%= options[:dragable] ? 'essence_picture_editor dragable_picture' : "essence_picture_editor#{options[:grouped] ? nil : ' content_editor'}" %>">
+	<% unless options[:grouped] %>
+	<label><%= render_content_name(content) %></label>
+	<% end %>
+	<div class="picture_thumbnail">
+		<span class="picture_tool_delete">
+			<% if options[:grouped] %>
+			<%= link_to_confirmation_window(
+				"",
+				t("confirm_to_delete_image"),
+				alchemy.admin_essence_picture_path(
+					:id => content,
+					:options => options
+				),
+				{
+					:title => t("delete_image"),
+					:class => "picture_delete"
+				}
+			) -%>
+			<% else %>
+			<%= link_to(
+				'',
+				'#',
+				:onclick => "Alchemy.removePicture('##{content.form_field_id(:picture_id)}');"
+			) %>
+			<% end %>
+		</span>
+		<%- if content.ingredient -%>
+		<div class="picture_handle" title="<%= t('drag_to_sort') if options[:dragable] %>"></div>
+		<div class="picture_content_spinner">
+			<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
+		</div>
+		<%- end -%>
+		<div class="picture_image">
+			<div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
+				<%- if content.ingredient -%>
+				<%= image_tag(
+					alchemy.thumbnail_path(
+						:id => content.ingredient.id,
+						:size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
+						:crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
+						:crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
+						:crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil,
+						:name => content.ingredient.urlname
+					),
+					:alt => content.ingredient.name,
+					:class => 'img_paddingtop',
+					:title => t("image_name") + ": #{content.ingredient.name}",
+					:onload => "Alchemy.fadeImage(this, '##{content_dom_id(content)} .picture_content_spinner');",
+					:style => "display: none;"
+				) %>
+				<%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
+				<% end %>
+			</div>
+		</div>
+		<%- unless options[:css_class].blank? || content.essence.css_class.blank? -%>
+		<div class="essence_picture_css_class">
+			<%= t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", :default => content.essence.css_class.camelcase) %>
+		</div>
+		<%- end -%>
+		<div class="edit_images_bottom">
+			<%= render(
+				:partial => 'alchemy/essences/essence_picture_tools',
+				:locals => {
+					:content => content,
+					:options => options
+				}
+			) %>
+		</div>
+	</div>
+	<%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
+	<%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
+	<%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
+	<%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
 </div>

data/bin/alchemy

@@ -29,107 +29,113 @@ class AlchemyInstaller < Thor
 	method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
 	def new(project)
 		@application = project.downcase.strip.gsub(/ /, '_')
-		if yes?("Install Alchemy CMS into ./#{@application}? (y/N)")
+		say "Install Alchemy CMS into ./#{@application}", :yellow
+		say "Generating new Rails App...", :yellow
+		
+		if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
 			
-			say "Generating new Rails App...", :yellow
+			create_database_yml if options[:database] == 'mysql'
 			
-			if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
-				
-				create_database_yml if options[:database] == 'mysql'
-				
-				mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
-				mountpoint = "/" if mountpoint.empty?
-				sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-				inject_into_file "#{@application}/config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
+			mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
+			mountpoint = "/" if mountpoint.empty?
+			sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+			inject_into_file "#{@application}/config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
+			
+			with_standard_set = yes?("\nDo you want to copy the files of Alchemy´s Standardset into your App? (y/N)")
+			
+			if with_standard_set
+				sentinel = /::Application\.configure do\s*$/
+				inject_into_file "#{@application}/environments/production.rb", "\n  config.assets.precompile += %w( alchemy/standard_set.css )\n", { :after => sentinel, :verbose => true }
+			end
+			
+			%x[
+				cd ./#{@application}
+				rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}
+				rm ./public/index.html
+				rm ./app/views/layouts/application.html.erb
+				rm ./app/assets/images/rails.png
+			]
+			
+			if !options[:scm].nil? && !options[:scm].empty?
 				
-				with_standard_set = yes?("\nDo you want to copy the files of Alchemy´s Standardset into your App? (y/N)")
+				clean_mountpoint = mountpoint.gsub('/', '')
 				
 				%x[
 					cd ./#{@application}
-					rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}
-					rm ./public/index.html
-					rm ./app/assets/images/rails.png
+					rm -rf ./tmp/*
+					rm -rf ./log/*
+					mkdir -p ./index
+					mkdir -p ./uploads
 				]
 				
-				if !options[:scm].nil? && !options[:scm].empty?
-					
-					clean_mountpoint = mountpoint.gsub('/', '')
-					
-					%x[
-						cd ./#{@application}
-						rm -rf ./tmp/*
-						rm -rf ./log/*
-						mkdir -p ./index
-						mkdir -p ./uploads
-					]
-					
-					if yes?("\nDo you want to generate a deploy script for Capistrano? (y/N)")
-						system "cd #{@application} && rails g alchemy:deploy_script --scm=#{options[:scm]} --db=#{options[:database]}"
-						say "\nCapifying...", :yellow
-						system "cd #{@application} && capify ."
-					end
-					
-					case options[:scm]
-						when 'svn'
-							server = ask("\nURL of your svn server:")
-							repository = ask("\nName of the repository (#{@application}):")
-							repository = @application if repository.empty?
-							
-							say "\nImporting #{@application} into #{server}/#{repository} ...", :yellow
-							output = %x[svn import ./#{@application} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
+				if yes?("\nDo you want to generate a deploy script for Capistrano? (y/N)")
+					system "cd #{@application} && rails g alchemy:deploy_script --scm=#{options[:scm]} --db=#{options[:database]}"
+					say "\nCapifying...", :yellow
+					system "cd #{@application} && capify ."
+				end
+				
+				case options[:scm]
+					when 'svn'
+						server = ask("\nURL of your svn server:")
+						repository = ask("\nName of the repository (#{@application}):")
+						repository = @application if repository.empty?
+						
+						say "\nImporting #{@application} into #{server}/#{repository} ...", :yellow
+						output = %x[svn import ./#{@application} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
+						
+						if imported
 							
-							if imported
-								
-								say "Removing and checking out again...", :yellow
-								%x[
-									rm -rf ./#{@application}
-									svn co #{server}/#{repository} #{@application}
-								]
-								
-								say "Committing ignores...", :yellow
-								%x[
-									cd ./#{@application}
-									svn propset svn:ignore '*' tmp/ log/ index/ uploads/
-									svn propset svn:ignore '#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}' ./public
-									svn propset svn:ignore 'assets' ./public
-									svn propset svn:ignore 'database.yml' ./config
-									svn commit -m 'set ignores'
-								]
-								
-							else
-								say "Error while importing!", :red
-							end
+							say "Removing and checking out again...", :yellow
+							%x[
+								rm -rf ./#{@application}
+								svn co #{server}/#{repository} #{@application}
+							]
 							
-						when 'git'
-							gitignore = <<-GIT
-								log/*
-								tmp/*
-								.DS_Store
-								upload/*
-								index/*
-								public/#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}
-								public/assets
-								config/database.yml
-							GIT
+							say "Committing ignores...", :yellow
 							%x[
-								cd #{@application}
-								echo "#{gitignore}" > .gitignore
-								touch ./index/.gitkeep
-								touch ./uploads/.gitkeep
-								git init .
-								git add .
-								git commit -am 'inital commit'
+								cd ./#{@application}
+								svn propset svn:ignore '*' tmp/ log/ index/ uploads/
+								svn propset svn:ignore '#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}' ./public
+								svn propset svn:ignore 'assets' ./public
+								svn propset svn:ignore 'database.yml' ./config
+								svn commit -m 'set ignores'
 							]
-					end
-					
+							
+						else
+							say "Error while importing!", :red
+						end
+						
+					when 'git'
+						gitignore = <<-GIT
+log/*
+tmp/*
+.DS_Store
+upload/*
+index/*
+public/#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}
+public/assets
+config/database.yml
+GIT
+						
+						%x[
+							cd #{@application}
+							echo "#{gitignore}" > .gitignore
+							touch ./index/.gitkeep
+							touch ./uploads/.gitkeep
+							git init .
+							git add .
+							git commit -am 'inital commit'
+						]
 				end
 				
-				%x[
-					cd ./#{@application}
-					rake db:create alchemy:install:migrations db:migrate alchemy:db:seed
-				]
-				
-				readme = <<-EOF
+			end
+			
+			%x[
+				cd ./#{@application}
+				rake db:create alchemy:install:migrations db:migrate alchemy:db:seed
+			]
+			
+			readme = <<-EOF
 
 Successfully installed Alchemy CMS into ./#{@application}
 
@@ -137,15 +143,15 @@ Next steps:
 
 1. Go into your projects folder:
 
-  cd ./#{@application}
+ cd ./#{@application}
 
 2. Start your local Rails server:
 
-  rails server
+ rails server
 
 3. Open a browser and enter the following URL:
 
-  http://localhost:3000
+ http://localhost:3000
 
 4. Follow the instructions to complete the installation!
 
@@ -153,13 +159,9 @@ Thank you for using Alchemy CMS!
 http://alchemy-cms.com
 
 EOF
-				say readme, :green
-			else
-				say "\nError while installation!\n", :red
-			end
-			
+			say readme, :green
 		else
-			return
+			say "\nError while installation!\n", :red
 		end
 	end
 

data/config/locales/alchemy.de.yml

@@ -250,7 +250,7 @@ de:
     "Please check contents below.": "Bitte überprüfen Sie die markierten Felder."
     "Please choose": "Bitte wählen"
     "Please choose a page layout.": "Bitte wählen Sie einen Seitentyp."
-    "Please choose an element.": "Bitte wählen Sie ein Element."
+    choose_element: "Bitte wählen Sie ein Element."
     "Please log in": "Bitte melden Sie sich an."
     use_alternative_uploader_instead: "Benutzen Sie bitte diesen alternativen Uploader."
     "Publish page": "veröffentlichen"
@@ -274,9 +274,9 @@ de:
     "Successfully deleted content": "%{content} wurde gelöscht"
     "Successfully saved content position": "Die Position wurde gespeichert."
     "Switch to Flash® Uploader": "Auf den Flash® Uploader wechseln"
-    "The sitemap is autogenerated.": "Die Sitemap wird automatisch generiert"
-    "This element displays the search and the searchresults.": "Dieses Element stellt die Suchergebnisse dar. Es Bedarf keinerlei Anpassung."
-    "This element has unsaved changes. Do you really want to fold it?": "Dieses Element hat nicht gespeicherte Änderungen. Möchten Sie es wirklich einklappen?"
+    sitemap_editor_info: "Die Sitemap wird automatisch generiert"
+    searchresults_editor_info: "Dieses Element stellt die Suchergebnisse dar. Es Bedarf keinerlei Anpassung."
+    element_dirty_notice: "Dieses Element hat nicht gespeicherte Änderungen. Möchten Sie es wirklich einklappen?"
     "This page is locked by %{name}": "Diese Seite wird gerade von %{name} blockiert"
     "Title": "Titel"
     "To manage your website open a browser and go to": "Um die Inhalte Ihrer Webseite zu bearbeiten klicken Sie bitte auf folgenden Link"
@@ -299,9 +299,7 @@ de:
     "Who else is online": "Wer ist noch online"
     "Yes": "Ja"
     "You are not authorized": "Sie sind dazu nicht authorisiert."
-    "You have unsaved elements on this page. Do you really want to clear the page cache?": "Sie haben ungesicherte Elemente auf der Seite. Möchten Sie den Cache wirklich löschen?"
-    "You have unsaved elements on this page. Do you really want to leave this page?": "Sie haben ungesicherte Elemente auf der Seite. Möchten Sie die Seite wirklich verlassen?"
-    "You have unsaved elements. Do you really want to close the elements window?": "Sie haben ungesicherte Elemente. Möchten Sie das Elemente Fenster wirklich schließen?"
+    element_dirty_close_window_notice: "Sie haben ungesicherte Elemente. Möchten Sie das Elemente Fenster wirklich schließen?"
     "You may upload files with following extensions": "Sie können %{file_types_description} mit folgenden Endungen hochladen: %{file_types}"
     "You may upload any file": "Sie können jede Art von Datei hochladen."
     "Your last login was on %{time}": "Sie waren zuletzt angemeldet am %{time}."
@@ -364,6 +362,7 @@ de:
     edit_page: "Seite bearbeiten"
     edit_page_properties: "Seiteneigenschaften bearbeiten"
     edit_user: "Benutzer bearbeiten"
+    element_dirty_page_leave_warning: "Sie haben ungesicherte Elemente auf der Seite. Möchten Sie wirklich fortfahren?"
     element_editor_not_found: "Bei diesem Element ist ein Fehler aufgetreten"
     element_of_type: "Element"
     element_saved: "Element wurde gespeichert."
@@ -466,6 +465,7 @@ de:
       previous_page: "vorherige Seite"
     password: "Passwort"
     paste: "einfügen"
+    picture_gallery_editor: 'Bilder'
     place_link: "Text verlinken"
     player_version: "Flashplayer Version"
     "please enter a name": "Bitte geben Sie einen Namen ein."

data/config/locales/alchemy.en.yml

@@ -186,6 +186,7 @@ en:
     big_thumbnails: "Big thumbnails"
     choose_element_as_target: "Please choose an element as target"
     choose_element_to_link: "Please choose an element"
+    choose_element: "Please choose an element."
     choose_file_to_link: "Please choose a file to link"
     click_to_show_all: "Click to show all again."
     confirm_to_delete_file: "Do you really want to delete this file from the server?"
@@ -219,6 +220,9 @@ en:
     edit_page: "Edit this page"
     edit_page_properties: "Edit the page´s properties."
     edit_user: "Edit the user´s properties."
+    element_dirty_notice: "This element has unsaved changes. Do you really want to fold it?"
+    element_dirty_close_window_notice: "You have unsaved elements. Do you really want to close the elements window?"
+    element_dirty_page_leave_warning: "You have unsaved elements on this page. Do you really want to continue?"
     element_editor_not_found: "Error within this Element"
     element_of_type: "Element"
     element_saved: "Saved element."
@@ -307,6 +311,7 @@ en:
       next_page: "next page"
       previous_page: "previous page"
     password: "Password"
+    picture_gallery_editor: 'Pictures'
     "Picture uploaded succesfully": "Picture %{name} uploaded succesfully"
     "Picture renamed successfully": "Picture renamed successfully from %{from} to %{to}"
     "Picture deleted successfully": "Picture %{name} deleted"
@@ -327,6 +332,8 @@ en:
     show_eq: "Show EQ"
     show_navigation: "Show in navigation"
     show_page_in_sitemap: "Show page in sitemap."
+    sitemap_editor_notice: "The sitemap is autogenerated."
+    searchresults_editor_info: "This element displays the search and the searchresults."
     small_thumbnails: "Small thumbnails"
     successfully_added_element: "Succesfully added new element."
     successfully_saved_element_position: "Element position updated succesfully."

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.1"
+	VERSION = "2.1.2"
 
 end

data/spec/models/essence_picture_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Alchemy::EssencePicture do
+
+	it "should not store negative values for crop_from" do
+		essence = Alchemy::EssencePicture.new(:crop_from => '-1x100')
+		essence.save!
+		essence.crop_from.should == "0x100"
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70362121763680 !ruby/object:Gem::Requirement
+  requirement: &70295293852440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70362121763680
+  version_requirements: *70295293852440
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70362121763060 !ruby/object:Gem::Requirement
+  requirement: &70295293851260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362121763060
+  version_requirements: *70295293851260
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70362121762500 !ruby/object:Gem::Requirement
+  requirement: &70295293848080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362121762500
+  version_requirements: *70295293848080
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70362121761980 !ruby/object:Gem::Requirement
+  requirement: &70295293862020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70362121761980
+  version_requirements: *70295293862020
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70362121761320 !ruby/object:Gem::Requirement
+  requirement: &70295293859620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70362121761320
+  version_requirements: *70295293859620
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70362121760820 !ruby/object:Gem::Requirement
+  requirement: &70295293856680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362121760820
+  version_requirements: *70295293856680
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70362121760340 !ruby/object:Gem::Requirement
+  requirement: &70295293869400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70362121760340
+  version_requirements: *70295293869400
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70362121683540 !ruby/object:Gem::Requirement
+  requirement: &70295293867480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70362121683540
+  version_requirements: *70295293867480
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70362121682980 !ruby/object:Gem::Requirement
+  requirement: &70295293865640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70362121682980
+  version_requirements: *70295293865640
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70362121682480 !ruby/object:Gem::Requirement
+  requirement: &70295293864160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70362121682480
+  version_requirements: *70295293864160
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70362121681960 !ruby/object:Gem::Requirement
+  requirement: &70295293863160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70362121681960
+  version_requirements: *70295293863160
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70362121681440 !ruby/object:Gem::Requirement
+  requirement: &70295293876280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70362121681440
+  version_requirements: *70295293876280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70362121680920 !ruby/object:Gem::Requirement
+  requirement: &70295293872400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70362121680920
+  version_requirements: *70295293872400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70362121680540 !ruby/object:Gem::Requirement
+  requirement: &70295293884580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362121680540
+  version_requirements: *70295293884580
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -674,6 +674,7 @@ files:
 - spec/integration/security_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
+- spec/models/essence_picture_spec.rb
 - spec/models/essence_richtext_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_spec.rb
@@ -807,7 +808,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 395153038709539496
+      hash: -3492770316894394278
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -816,7 +817,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 395153038709539496
+      hash: -3492770316894394278
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
@@ -882,6 +883,7 @@ test_files:
 - spec/integration/security_spec.rb
 - spec/models/content_spec.rb
 - spec/models/element_spec.rb
+- spec/models/essence_picture_spec.rb
 - spec/models/essence_richtext_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_spec.rb