alchemy_cms 2.1.beta6 → 2.1.rc2

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

@@ -422,7 +422,7 @@ a.icon_button.linked {
 }
 
 .edit_images_bottom a.disabled {
-	@include opacity(50);
+	@include opacity(30);
 	cursor: default;
 }
 
@@ -535,7 +535,7 @@ div.file_icon span.icon {
 div.file_icon a.assign_file {
 	display: block;
 	height: 16px;
-	background: image-url('alchemy/icons.png') no-repeat -240px -24px;
+	background: image-url('alchemy/icons.png') no-repeat -480px -40px;
 	width: 16px;
 	margin: $default-margin;
 }
@@ -565,11 +565,11 @@ div.essence_file_tools a{
 }
 
 div.essence_file_tools a.assign_file {
-	background: image-url('alchemy/icons.png') -256px -24px;
+	background: image-url('alchemy/icons.png') -512px -40px;
 }
 
 div.essence_file_tools a.edit_file {
-	background: image-url('alchemy/icons.png') -16px -24px;
+	background: image-url('alchemy/icons.png') -160px -167px;
 }
 
 td.content_editor_essence_type {

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

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

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

@@ -1,4 +1,4 @@
-@import "alchemy/defaults";
+@import "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 "alchemy/defaults";
+@import "defaults";
 
 /* always visible styles */
 
@@ -42,7 +42,7 @@
 	text-shadow: $button-text-shadow;
 }
 
-#alchemy .selectbox .display.long {
+#alchemy .selectbox .display {
 	width: 190px;
 }
 
@@ -54,6 +54,14 @@
 	width: 100px;
 }
 
+#alchemy .selectbox .display.long {
+	width: 220px;
+}
+
+#alchemy .selectbox .display.very_long {
+	width: 280px;
+}
+
 #alchemy .selectbox.disabled .display {
 	color: #999;
 }
@@ -71,7 +79,6 @@
 	background: $button-hover-bg-color image-url('alchemy/shading.png') repeat-x 50% -75px;
 }
 
-
 #alchemy .selectbox .display:active .arrow_btn {
 	background-color: #e5e5e5;
 }
@@ -149,10 +156,18 @@
 	width: 128px;
 }
 
-#alchemy .items.long {
+#alchemy .items {
 	width: 218px;
 }
 
+#alchemy .items.long {
+	width: 248px;
+}
+
+#alchemy .items.very_long {
+	width: 308px;
+}
+
 #alchemy .items.full_width {
 	width: 431px;
 }

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

@@ -0,0 +1,85 @@
+/*
+ *= require_self
+*/
+
+@import "defaults";
+
+@mixin transition {
+	-webkit-transition: left 0.15s ease;
+	-moz-transition: left 0.15s ease;
+	-ms-transition: left 0.15s ease;
+	-o-transition: left 0.15s ease;
+	transition: left 0.15s ease;
+}
+
+@mixin bottom-right-rounded-border {
+	$side: bottom-right;
+	$radius: 3px;
+	-webkit-border-#{$side}-radius: $radius;
+	-moz-border-radius-#{$side}: $radius;
+	-ms-border-#{$side}-radius: $radius;
+	-o-border-#{$side}-radius: $radius;
+	border-#{$side}-radius: $radius;
+}
+
+@mixin box-shadow {
+	$shadow: 0px 0px 4px $dark-gray;
+	-webkit-box-shadow: $shadow;
+	-moz-box-shadow: $shadow;
+	-ms-box-shadow: $shadow;
+	-o-box-shadow: $shadow;
+	box-shadow: $shadow;
+}
+
+#alchemy_menubar {
+	position: fixed;
+	top: 0;
+	left: -318px;
+	width: 312px;
+	z-index: 10000;
+	background: $light-gray;
+	@include transition;
+	@include bottom-right-rounded-border;
+	@include box-shadow;
+	border-right: $default-border;
+	border-bottom: $default-border;
+	line-height: 8*$default-padding;
+	height: 8*$default-padding;
+	padding: 4px 40px 4px 8px;
+	overflow: hidden;
+	&:hover {
+		left: 0;
+		@include transition;
+	};
+	&:after {
+		content: '';
+		width: 24px;
+		height: 24px;
+		position: absolute;
+		right: 10px;
+		top: 8px;
+		background: image-url('alchemy/icons.png') -240px 0;
+	};
+	ul {
+		padding: 6px 0;
+		margin: 0;
+		li {
+			line-height: normal;
+			margin-right: $default-padding;
+			display: inline;
+			display: inline-block;
+			list-style-type: none;
+			a {
+				display: block;
+				text-align: center;
+				padding: 2px 4px;
+				width: 90px;
+				text-decoration: none;
+				@include button-styles;
+				&:hover {
+					@include button-hover-styles;
+				};
+			}
+		}
+	}
+}

data/app/assets/stylesheets/alchemy/standard_set.css

@@ -1,5 +1,3 @@
-/* @override http://localhost:3000/stylesheets/alchemy/standard_set.css */
-
 body {
 	margin: 0;
 	padding: 0;
@@ -342,7 +340,7 @@ td.field {
 }
 
 input.field.short {
-	width: 105px;
+	width: 97px;
 }
 
 input.field.medium {
@@ -354,11 +352,11 @@ td.label {
 }
 
 textarea {
-	width: 310px;
+	width: 314px;
 	padding: 2px;
 	font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
 	border: 1px solid silver;
-	margin-left: 137px;
+	margin-left: 126px;
 	height: 10em;
 	margin-top: 2em;
 	margin-bottom: 1em;

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

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

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

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

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

@@ -8,15 +8,7 @@ module Alchemy
 				if in_overlay?
 					archive_overlay
 				else
-					cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
-					if params[:per_page] == 'all'
-						@attachments = Attachment.where(cond).order(:name)
-					else
-						@attachments = Attachment.where(cond).paginate(
-							:page => (params[:page] || 1),
-							:per_page => per_page_value_for_screen_size
-						).order(:name)
-					end
+					@attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
 				end
 			end
 
@@ -35,21 +27,13 @@ module Alchemy
 				@attachment = Attachment.new(:uploaded_data => params[:Filedata])
 				@attachment.name = @attachment.filename
 				@attachment.save
-				cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
-				if params[:per_page] == 'all'
-					@attachments = Attachment.where(cond).order(:name)
-				else
-					@attachments = Attachment.where(cond).paginate(
-						:page => (params[:page] || 1),
-						:per_page => (params[:per_page] || 20)
-					).order(:name)
-				end
 				if in_overlay?
 					@while_assigning = true
 					@content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
 					@swap = params[:swap]
 					@options = hashified_options
 				end
+				@attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
 				@message = t('File %{name} uploaded succesfully', :name => @attachment.name)
 				# Are we using the Flash uploader? Or the plain html file uploader?
 				if params[Rails.application.config.session_options[:key]].blank?

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) - 6
+				(screen_height / 30) - 12
 			end
 
 		end

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

@@ -69,7 +69,7 @@ module Alchemy
 					@element_validated = @element.save!
 				else
 					@element_validated = false
-					@notice = t('Validation failed.')
+					@notice = t('Validation failed')
 					@error_message = "<h2>#{@notice}</h2><p>#{t('Please check contents below.')}</p>".html_safe
 				end
 			end
@@ -77,7 +77,7 @@ module Alchemy
 			# Trashes the Element instead of deleting it.
 			def trash
 				@element = Element.find(params[:id])
-				@page_id = @element.page.id
+				@page_id = @element.page_id
 				@element.trash
 			end
 

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

@@ -2,6 +2,8 @@ module Alchemy
 	module Admin
 		class EssenceFilesController < Alchemy::Admin::BaseController
 
+			helper "Alchemy::Admin::Contents"
+
 			def edit
 				@content = Content.find(params[:id])
 				@essence_file = @content.essence
@@ -17,8 +19,8 @@ module Alchemy
 				@content = Content.find_by_id(params[:id])
 				@attachment = Attachment.find_by_id(params[:attachment_id])
 				@content.essence.attachment = @attachment
-				@content.essence.save
-				@content.save
+				# @content.essence.save
+				# @content.save
 				@options = params[:options]
 			end
 

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

@@ -9,14 +9,7 @@ module Alchemy
 
 			def index
 				@size = params[:size] || 'medium'
-				if params[:per_page] == 'all'
-					@pictures = Picture.where("name LIKE '%#{params[:query]}%'").order(:name)
-				else
-					@pictures = Picture.where("name LIKE '%#{params[:query]}%'").paginate(
-						:page => params[:page] || 1,
-						:per_page => pictures_per_page_for_size(@size)
-					).order(:name)
-				end
+				@pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
 				if in_overlay?
 					archive_overlay
 				else
@@ -41,7 +34,7 @@ module Alchemy
 
 			def create
 				@picture = Picture.new(:image_file => params[:Filedata])
-				@picture.name = @picture.image_filename
+				@picture.name = @picture.humanized_name
 				@picture.save
 				@size = params[:size] || 'medium'
 				if in_overlay?
@@ -52,14 +45,7 @@ module Alchemy
 					@page = params[:page] || 1
 					@per_page = pictures_per_page_for_size(@size)
 				end
-				if params[:per_page] == 'all'
-					@pictures = Picture.where("name LIKE '%#{params[:query]}%'").order(:name)
-				else
-					@pictures = Picture.where("name LIKE '%#{params[:query]}%'").paginate(
-						:page => (params[:page] || 1),
-						:per_page => pictures_per_page_for_size(@size)
-					).order(:name)
-				end
+				@pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
 				@message = t('Picture uploaded succesfully', :name => @picture.name)
 				# Are we using the Flash uploader? Or the plain html file uploader?
 				if params[Rails.application.config.session_options[:key]].blank?
@@ -107,11 +93,11 @@ module Alchemy
 			def pictures_per_page_for_size(size)
 				case size
 				when 'small'
-					per_page = in_overlay? ? 35 : (per_page_value_for_screen_size * 2.95).floor # 50
+					per_page = in_overlay? ? 35 : (per_page_value_for_screen_size * 2.9).floor # 50
 				when 'large'
-					per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 2.1).floor # 8
+					per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor # 8
 				else
-					per_page = in_overlay? ? 12 : (per_page_value_for_screen_size / 0.95).ceil # 18
+					per_page = in_overlay? ? 12 : (per_page_value_for_screen_size / 0.8).ceil # 18
 				end
 				return per_page
 			end

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

@@ -10,11 +10,9 @@ module Alchemy
 
 			def index
 				if !params[:query].blank?
-					items = resource_model.where(resource_attributes.map { |attribute|
-						if attribute[:type] == :string
-							"`#{resources_name}`.#{attribute[:name]} LIKE '%#{params[:query]}%'"
-						end
-					}.compact.join(" OR "))
+					items = resource_model.where(searchable_resource_attributes.map { |attribute|
+						"`#{namespaced_resources_name}`.`#{attribute[:name]}` LIKE '%#{params[:query]}%'"
+					}.join(" OR "))
 				else
 					items = resource_model
 				end
@@ -106,6 +104,10 @@ module Alchemy
 				end.compact
 			end
 
+			def searchable_resource_attributes
+				resource_attributes.select{ |a| a[:type] == :string }
+			end
+
 			def resource_window_size
 				@resource_window_size ||= "400x#{100 + resource_attributes.length * 35}"
 			end

data/app/controllers/alchemy/base_controller.rb

@@ -106,20 +106,30 @@ module Alchemy
 			end
 		end
 
+		def layout_for_page
+			if !params[:layout].blank? && params[:layout] != 'none'
+				params[:layout]
+			elsif File.exist?(Rails.root.join('app/views/layouts', 'application.html.erb'))
+				'application'
+			else
+				'alchemy/pages'
+			end
+		end
+
 	protected
 
 		def permission_denied
 			if current_user
 				if current_user.role == 'registered'
-					redirect_to root_path
+					redirect_to alchemy.root_path
 				else
-					if request.referer == login_url
+					if request.referer == alchemy.login_url
 						render :file => File.join(Rails.root.to_s, 'public', '422.html'), :status => 422, :layout => false
 					elsif request.xhr?
 						render :partial => 'alchemy/admin/partials/flash', :locals => {:message => t('You are not authorized'), :flash_type => 'warning'}
 					else
 						flash[:error] = t('You are not authorized')
-						redirect_to admin_dashboard_path
+						redirect_to alchemy.admin_dashboard_path
 					end
 				end
 			else
@@ -128,7 +138,7 @@ module Alchemy
 					render :action => :permission_denied
 				else
 					store_location
-					redirect_to login_path
+					redirect_to alchemy.login_path
 				end
 			end
 		end

data/app/controllers/alchemy/messages_controller.rb

@@ -53,7 +53,7 @@ module Alchemy
 
 		def new#:nodoc:
 			@message = Message.new
-			render :template => '/pages/show', :layout => 'pages'
+			render :template => 'alchemy/pages/show', :layout => layout_for_page
 		end
 
 		def create#:nodoc:
@@ -65,7 +65,7 @@ module Alchemy
 				Messages.contact_form_mail(@message, mail_to, mail_from, subject).deliver
 				redirect_to_success_page
 			else
-				render :template => '/pages/show', :layout => 'pages'
+				render :template => 'alchemy/pages/show', :layout => layout_for_page
 			end
 		end
 
@@ -106,9 +106,9 @@ module Alchemy
 		end
 
 		def get_page
-			@page = Page.find_by_page_layout(mailer_config[:form_layout_name])
-			@root_page = @page.get_language_root
+			@page = Page.find_by_page_layout_and_language_id(mailer_config[:page_layout_name], session[:language_id])
 			raise "Page for page_layout #{mailer_config[:page_layout_name]} not found" if @page.blank?
+			@root_page = @page.get_language_root
 		end
 
 	end