alchemy_cms 2.1.4 → 2.1.5

data/Gemfile

@@ -7,7 +7,7 @@ group :test do
 	gem 'sqlite3'
 	gem 'factory_girl_rails', '1.4.0'
 	gem "capybara"
-	gem 'capybara-webkit'
+	gem 'capybara-webkit', '~>0.8.0'
 	gem "launchy"
 	gem "database_cleaner"
 	gem "fuubar"

data/README.md

@@ -1,7 +1,7 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
 ![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
 
 About
@@ -10,40 +10,20 @@ About
 Features
 --------
 
-- Highly flexible Templating:
-  - Content is stored in small parts not as a complete, monolithic page
-  - The designer chooses the template structure, not the CMS!
-  - Every Design is possible, no templating, or theming restrictions
-  - Even Flash® Content Management is possible
-- Gorgious End-User centric interface:
-  - No markup editors
-- Multilingual:
-  - Create as many (complete independent) language trees as you want
-  - URL based language switching
+- Highly flexible Templating
+- Gorgious End-User centric interface
+- Multilingual
 - SEO
-  - Every Part of SEO is manageable by the user
-  - Human readable urls (multilingual)
-  - automatic XML Sitemap generation
-- Access Control:
-  - Rolebased Authentification (RBAS)
-  - Protect pages for restricted access
+- Access Control
 - Fulltext Search
 - RSS Feeds
 - Contactforms
 - Attachments and downloads
 - Powerfull image rendering
-  - Resizing
-  - Image Cropping via an graphical Userinterface!
-  - Borders, Text, Rotation
-  - and much more via Imagemagick processing (polaroid effect, etc.)
-  - and all this gets cached!
-- Extendable:
-  - Flexible Plugin DSL allows you to add custom plugins into Alchemy
+- Extendable
 - Integrates in exsiting Rails Apps
 - Caching
-- Completely free:
-  - BSD License
-  - No Enterprise Licences, or Community Editions
+- BSD License
 - Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy_cms/wiki/Software-Requirements))
 
 Rails Version
@@ -51,14 +31,14 @@ Rails Version
 
 This branch of Alchemy runs with Rails 3.1.3.
 
-If you are looking for a Rails 3 compatible version check the rails-3 branch.
+If you are looking for a Rails 3 compatible version check the 2.0-stable branch.
 
-If you are looking for a Rails 2 compatible version check the rails-2 branch.
+If you are looking for a Rails 2 compatible version check the 1.6-stable branch.
 
 Ruby Version
 ------------
 
-Alchemy under Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3 and REE (Ruby Enterprise Edition).
+Alchemy runs under Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3 and REE (Ruby Enterprise Edition).
 
 Installation
 ------------
@@ -93,7 +73,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', '~> 2.1'
+    gem 'alchemy_cms'
 
 Run in terminal:
 

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

@@ -38,7 +38,9 @@ if (typeof(Alchemy) === 'undefined') {
 							$dialog.html(data);
 							Alchemy.ButtonObserver('#alchemyElementWindow .button');
 							Alchemy.Datepicker('#alchemyElementWindow input.date, #alchemyElementWindow input[type="date"]');
-							callback.call();
+							if (callback) {
+								callback.call();
+							}
 						},
 						error: function(XMLHttpRequest, textStatus, errorThrown) {
 							Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);

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.disabled');
+							Alchemy.enableButton('.button');
 						}
 					});
 				},

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

@@ -1392,10 +1392,6 @@ select#url_protocol.medium {
 	margin: 0;
 }
 
-#alchemy .ui-dialog-content .short {
-	width: 40px;
-}
-
 #alchemy .ui-dialog-content p a.button {
 	float: right;
 }

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

@@ -122,6 +122,7 @@ div.button_with_label {
 	float: left;
 	min-width: 70px;
 	line-height: 0;
+	cursor: pointer;
 	
 	&.active {
 		.icon_button {
@@ -313,13 +314,15 @@ a.icon_button {
 		float: none;
 		display: inline-block;
 		background-position: 0 -8px;
-		vertical-align: -1px;
+		vertical-align: -2px;
 		
 		.icon {
-			position: absolute;
-			right: 5px;
+			height: 9px;
 			left: auto;
-			top: 4px;
+			position: absolute;
+			right: 1px;
+			top: 1px;
+			width: 9px;
 		}
 	}
 	

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

@@ -16,7 +16,13 @@
 }
 
 .icon.delete-small {
-	background-position: 0 -72px;
+	background-position: -1px -72px;
+}
+
+.icon_button.small {
+	.icon.delete-small {
+		background-position: -4px -76px;
+	}
 }
 
 .icon.zoom-in {

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

@@ -33,6 +33,10 @@ a:hover {
 
 /* Forms */
 
+form {
+	margin: 0;
+}
+
 fieldset {
 	margin: 0;
 	padding: 4px;
@@ -89,20 +93,12 @@ input.checkbox {
 /* Buttons */
 
 #insert, #cancel, input.button, .updateButton {
-	font: 11px "Lucida Grande", Arial, sans-serif;
-	border: 1px solid #9a9a9a;
-	height: 21px;
-	padding-left: 8px;
-	padding-right: 8px;
-	padding-bottom: 2px;	
-	margin: 0;
-	background: #eaeaea image-url('alchemy/shading.png') repeat-x 0 -75px;
-	-webkit-border-radius: 2px;
-	-moz-border-radius: 2px;
-	border-radius: 2px;
-	cursor: pointer;
-	color: #333;
-	text-shadow: #f2f2f2 1px 1px 0;
+	@include button-styles;
+	height: 26px;
+
+	&:hover {
+		@include button-hover-styles;
+	}
 }
 
 /* Browse */
@@ -327,7 +323,7 @@ h3 {
 .title {
 	font-size: 12px;
 	font-weight: bold;
-	color: #2B6FB6;
+	color: $text-color;
 }
 
 /* Dialog specific */

data/app/assets/{javascripts → stylesheets}/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss

@@ -65,7 +65,7 @@
 .alchemy .mceTop, .alchemy .mceTop div {
 	top: 0;
 	width: 100%;
-	height: 29px;
+	height: 31px;
 }
 
 .alchemy .mceTop .mceLeft {
@@ -75,17 +75,15 @@
 .alchemy .mceTop .mceCenter,
 a.mceMove {
 	width: 100%;
-	height: 29px;
-	background: #c6dbe7;
-	color: #333333;
-	font-weight: bold;
-	border-bottom: 2px solid #ededed;
+	height: 31px;
+	background: $light-blue;
+	color: $text-color;
 }
 
 .alchemy .mceTop .mceRight {
 	right: 0;
 	width: 0px;
-	height: 29px;
+	height: 32px;
 }
 
 .alchemy .mceTop span {
@@ -197,7 +195,6 @@ a.mceMove {
 .alchemy a {
 	width: 29px;
 	height: 16px;
-	top: 3px;
 }
 
 .alchemy .mceClose {
@@ -206,6 +203,7 @@ a.mceMove {
 	width: 16px;
 	height: 16px;
 	top: 6px;
+
 }
 
 .alchemy .mceMin {
@@ -231,10 +229,41 @@ a.mceMove {
 	top: 6px;
 }
 
+.alchemy .mceClose, .alchemy .mceMin, .alchemy .mceMed, .alchemy .mceMax {
+	&:hover {
+		border: 1px solid $button-hover-border-color;
+		@include rounded-corner;
+		background-color: $button-hover-bg-color;
+		color: $text-color;
+		font-weight: normal;
+	}
+}
+
+.alchemy .mceClose {
+	&:hover {
+		background-position: -97px -129px;
+		right: 6px;
+	}
+}
+
+.alchemy .mceMax {
+	&:hover {
+		background-position: -33px -81px;
+		right: 26px;
+	}
+}
+
+.alchemy .mceMed {
+	&:hover {
+		background-position: -50px -81px;
+		right: 26px;
+	}
+}
+
 .alchemy .mceMove {
 	display: none;
 	cursor: move;
-	height: 26px;
+	height: 31px;
 	width: 100%;
 }
 
@@ -340,14 +369,18 @@ a.mceMove {
 /* Alert/Confirm */
 
 .alchemy .mceButton {
-	font-weight: bold;
+	@include button-styles;
 	bottom: 10px;
 	width: 80px;
-	height: 31px;
-	line-height: 31px;
+	height: 25px;
+	line-height: 25px;
 	vertical-align: middle;
 	text-align: center;
-	outline: 0
+	outline: 0;
+
+	&:hover {
+		@include button-hover-styles;
+	}
 }
 
 .alchemy .mceMiddle .mceIcon {
@@ -359,21 +392,21 @@ a.mceMove {
 
 .alchemy .mceAlert .mceMiddle span, .alchemy .mceConfirm .mceMiddle span {
 	background: transparent;
-	left: 60px;
+	left: 8px;
 	top: 35px;
-	width: 320px;
+	width: auto;
 	height: 50px;
-	font-weight: bold;
+	text-align: center;
 	overflow: auto;
 	white-space: normal
 }
 
 .alchemy a:hover {
-	font-weight: bold;
+	font-weight: normal;
 }
 
 .alchemy .mceAlert .mceMiddle, .alchemy .mceConfirm .mceMiddle {
-	background: #D6D7D5
+	background: $light-gray;
 }
 
 .alchemy .mceAlert .mceOk {

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

@@ -42,12 +42,12 @@ module Alchemy
 			end
 
 			def destroy
-				content = Content.find(params[:id])
-				element = content.element
-				content_name = content.name
-				@content_dom_id = "#{content.essence_type.underscore}_#{content.id}"
+				@content = Content.find(params[:id])
+				@content_dup = @content.clone
+				element = @content.element
+				content_name = @content.name
 				@notice = t("Successfully deleted content", :content => content_name)
-				content.destroy
+				@content.destroy
 			end
   
 		end

data/app/controllers/alchemy/base_controller.rb

@@ -46,7 +46,7 @@ module Alchemy
 
 		# Overriding +I18n+s default +t+ helper, so we can pass it through +Alchemy::I18n+
 		def t(key, *args)
-			Alchemy::I18n.t(key, *args)
+			::Alchemy::I18n.t(key, *args)
 		end
 
 	private

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

@@ -272,11 +272,6 @@ module Alchemy
 				['main_navi_entry', admin_mainnavi_active?(navigation) ? 'active' : nil].compact.join(" ")
 			end
 
-			# (internal) Checks if all options we need for the image cropper are provided
-			def necessary_options_for_cropping_provided?(options)
-				options[:crop].to_s == 'true' && !options[:image_size].blank?
-			end
-
 			# (internal) Renders translated Module Names for html title element.
 			def render_alchemy_title
 				if content_for?(:title)
@@ -330,6 +325,7 @@ module Alchemy
 			#   :overlay_options        [Hash]                # Overlay options. See link_to_overlay_window helper.
 			#   :if_permitted_to        [Array]               # Check permission for button. [:action, :controller]. Exactly how you defined the permission in your +authorization_rules.rb+. Defaults to controller and action from button url.
 			#   :skip_permission_check  [Boolean]             # Skip the permission check. Default false. NOT RECOMMENDED!
+			#   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Default false.
 			# 
 			def toolbar_button(options = {})
 				options.symbolize_keys!
@@ -338,7 +334,8 @@ module Alchemy
 					:skip_permission_check => false,
 					:active => false,
 					:link_options => {},
-					:overlay_options => {}
+					:overlay_options => {},
+					:loading_indicator => false
 				}
 				options = defaults.merge(options)
 				button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
@@ -353,7 +350,7 @@ module Alchemy
 							}
 						)
 					else
-						link_to options[:url], {:class => "icon_button#{options[:remote] ? nil : ' please_wait'}", :title => options[:title]}.merge(options[:link_options]) do
+						link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? nil : ' please_wait'}", :title => options[:title]}.merge(options[:link_options]) do
 							render_icon(options[:icon])
 						end
 					end

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

@@ -68,7 +68,7 @@ module Alchemy
 			# The elements are returned as an array to be used in alchemy_selectbox form builder.
 			def elements_for_select(elements)
 				return [] if elements.nil?
-				options = elements.collect{ |e| [t("element_names.#{e['name']}", :default => e['name'].capitalize), e["name"]] }
+				options = elements.collect{ |e| [t(e['name'], :scope => :element_names), e["name"]] }
 				return options_for_select(options)
 			end
 
@@ -106,7 +106,7 @@ module Alchemy
 					]
 				else
 					[
-						t("alchemy.element_names.#{e['name']}", :default => e['name'].capitalize),
+						t(e['name'], :scope => :element_names),
 						e[object_method] + (cell ? "##{cell['name']}" : "")
 					]
 				end

data/app/models/alchemy/attachment.rb

@@ -19,7 +19,7 @@ module Alchemy
 		end
 
 		def urlname
-			CGI.escape(read_attribute(:filename).split('.').first)
+			::CGI.escape(read_attribute(:filename).split('.').first)
 		end
 
 		def extension