alchemy_cms 2.1.3 → 2.1.4

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

@@ -10,7 +10,8 @@ if (typeof(Alchemy) === 'undefined') {
 	Alchemy.PageSorter = {
 
 		init : function () {
-			$('ul#sitemap').nestedSortable({
+			var $sortables = $('ul#sitemap').find('ul.level_1_children');
+			$sortables.nestedSortable({
 				disableNesting: 'no-nest',
 				forcePlaceholderSize: true,
 				handle: 'span.handle',
@@ -26,7 +27,7 @@ if (typeof(Alchemy) === 'undefined') {
 				Alchemy.pleaseWaitOverlay();
 				e.preventDefault();
 				var params = {
-					set: JSON.stringify($('ul#sitemap').nestedSortable('toHierarchy'))
+					set: JSON.stringify($sortables.nestedSortable('toHierarchy'))
 				};
 				$.post(Alchemy.routes.order_admin_pages_path, params);
 				return false;

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

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

@@ -9,13 +9,6 @@ a.button.small.disabled img {
 	top: -1px;
 }
 
-a.button.disabled,
-a.button.disabled:hover,
-a.button.disabled:active {
-	padding: 2px !important;
-	text-align: center;
-}
-
 a.button {
 	padding: 5px 8px;
 	text-decoration: none;
@@ -60,14 +53,13 @@ input.button {
 }
 
 button.button {
-	line-height: 21px;
-	padding: 0px 8px;
+	padding: 4px 8px;
 }
 
 .button img {
 	margin: 2px 0 0 0;
-	width: 20px;
-	height: 20px;
+	width: 16px;
+	height: 16px;
 }
 
 #new_page_form tbody tr td.second_row .button {
@@ -106,6 +98,15 @@ button.button.disabled:active {
 	background-image: none;
 	background-color: #f5f5f5;
 	padding: 1px 0 0;
+	line-height: 15px;
+}
+
+a.button.disabled,
+a.button.disabled:hover,
+a.button.disabled:active {
+	padding: 2px 0 !important;
+	line-height: 13px !important;
+	text-align: center;
 }
 
 a.button.disabled img {

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

@@ -253,8 +253,13 @@ div.picture_gallery_images {
 	padding: 1px;
 }
 
-div.picture_thumbnail div.picture_image img.img_paddingtop {
-	@include disable-user-select;
+div.picture_thumbnail div.picture_image {
+	height: 93px;
+	overflow: hidden;
+
+	img.img_paddingtop {
+		@include disable-user-select;
+	}
 }
 
 /* @group add moclecule */
@@ -568,7 +573,7 @@ div.file_name {
 	overflow: hidden;
 	float: left;
 	width: 293px;
-	line-height: 24px;
+	line-height: 25px;
 	font-size: 10px;
 }
 

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

@@ -4,6 +4,22 @@ html {
 	height: 100%;
 }
 
+noscript {
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 1000;
+	width: 100%;
+	text-align:center;
+	line-height: 1em;
+	border-bottom: 1px solid #c4c19c;
+	color: #726d23;
+	background-color: #f3f0c1;
+	h1, p {
+		margin: 16px 0;
+	}
+}
+
 body#alchemy {
 	margin: 0;
 	padding: 0;

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

@@ -33,6 +33,10 @@ div.login_signup_box {
 	}
 }
 
+html.no-js {
+	div.login_signup_box, div#alchemy_greeting h1 { display: none;}
+}
+
 #login_box {
 	height: 310px;
 	width: 394px;

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

@@ -19,9 +19,7 @@ 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
-				@options = params[:options]
+				@options = params[:options] || {}
 			end
 
 		end

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

@@ -203,7 +203,7 @@ module Alchemy
 				prev_item = nil
 				neworder.each do |item|
 					dbitem = Page.find(item['id'])
-					prev_item.nil? ? dbitem.move_to_child_of(Page.root) : dbitem.move_to_right_of(prev_item)
+					prev_item.nil? ? dbitem.move_to_child_of(@page_root) : dbitem.move_to_right_of(prev_item)
 					sort_children(item, dbitem) unless item['children'].nil?
 					prev_item = dbitem.reload
 				end

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

@@ -75,11 +75,7 @@ module Alchemy
 			end
 
 			def flush
-				Picture.all.each do |picture|
-					FileUtils.rm_rf("#{Rails.root}/public/pictures/show/#{picture.id}")
-					FileUtils.rm_rf("#{Rails.root}/public/pictures/thumbnails/#{picture.id}")
-					expire_page(:controller => '/pictures', :action => 'zoom', :id => picture.id)
-				end
+				FileUtils.rm_rf Rails.root.join('public', Alchemy.mount_point, 'pictures')
 				@notice = t('Picture cache flushed')
 			end
 

data/app/controllers/alchemy/elements_controller.rb

@@ -1,12 +1,11 @@
 module Alchemy
 	class ElementsController < Alchemy::BaseController
-  
-		filter_access_to [:show], :attribute_check => true
+
+		filter_access_to :show, :attribute_check => true, :model => Alchemy::Element, :load_method => :load_element
 		layout false
 
 		# Returns the element partial as HTML or as JavaScript that tries to replace a given +container_id+ with the partial content via jQuery.
 		def show
-			@element = Element.find(params[:id])
 			@page = @element.page
 			respond_to do |format|
 				format.html
@@ -14,5 +13,11 @@ module Alchemy
 			end
 		end
 
+	private
+
+		def load_element
+			@element = Element.find(params[:id])
+		end
+
 	end
 end

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

@@ -7,7 +7,7 @@
     </tr>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
-      <td class="select"><%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]], {}, :class => 'long' %></td>
+      <td class="select"><%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]] %></td>
     </tr>
     <tr>
       <td colspan="2" class="submit">

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

@@ -2,7 +2,7 @@
 	<div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
 		<div class="sitemap_left_images">
 			<%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
-			<span class="site_status <%= @sorting ? 'handle' : nil %> tooltip"></span>
+			<span class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %> tooltip"></span>
 			<div class="tooltip_content" style="display: none;">
 				<h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
 				<p>
@@ -107,7 +107,7 @@
 		</div>
 	</div>
 	<%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
-	<ul id="page_<%= page.id %>_children">
+	<ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
 		<%= render :partial => 'page', :collection => page.children %>
 	</ul>
 	<%- end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="no-js">
 	<head>
 		<meta charset="UTF-8">
 		<title><%= render_alchemy_title %></title>
@@ -17,6 +17,10 @@
 		<%= yield :javascript_includes %>
 	</head>
 	<body id="alchemy">
+		<noscript>
+			<h1><%= t(:javascript_disabled_headline) %></h1>
+			<p><%= t(:javascript_disabled_text) %></p>
+		</noscript>
 		<div id="overlay">
 			<div id="overlay_text_box">
 				<%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
@@ -57,6 +61,7 @@
 		<%= yield(:javascripts) %>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
+				$('html').removeClass('no-js');
 				Alchemy.locale = '<%= ::I18n.locale %>';
 				Alchemy.resizeFrame();
 				Alchemy.Tooltips();

data/app/views/layouts/alchemy/login.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="no-js">
 	<head>
 		<meta charset="UTF-8">
 		<title><%= render_alchemy_title %></title>
@@ -9,6 +9,10 @@
 		<%= javascript_include_tag('alchemy/alchemy') %>
 	</head>
 	<body id="alchemy" class="login">
+		<noscript>
+			<h1><%= t(:javascript_disabled_headline) %></h1>
+			<p><%= t(:javascript_disabled_text) %></p>
+		</noscript>
 		<div id="left_menu">
 			<div id="main_navi">
 				<div id="logout">
@@ -26,6 +30,7 @@
 		<%= yield(:javascripts) %>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(document).ready(function($) {
+				$('html').removeClass('no-js');
 				Alchemy.SelectBox('body#alchemy select');
 				Alchemy.ButtonObserver('.button');
 			});

data/config/locales/alchemy.de.yml

@@ -395,6 +395,8 @@ de:
     "item copied to clipboard": "%{name} wurde in die Zwischenablage kopiert."
     "item moved to clipboard": "%{name} wurde in die Zwischenablage bewegt."
     "item removed from clipboard": "%{name} wurde aus der Zwischenablage entfernt."
+    javascript_disabled_headline: "Javascript ist deaktiviert!"
+    javascript_disabled_text: "Alchemy funktioniert nur einwandfrei mit aktiviertem Javascript. Bitte aktivieren Sie es in Ihrem Browser."
     language_does_not_exist: "Dieser Sprachbaum existiert noch nicht"
     language_pages_copied: "Der Sprachbaum wurde kopiert"
     left: "links"

data/config/locales/alchemy.en.yml

@@ -253,6 +253,8 @@ en:
     "item copied to clipboard": "Copied %{name} to clipboard"
     "item moved to clipboard": "Moved %{name} to clipboard"
     "item removed from clipboard": "Removed %{name} from clipboard"
+    javascript_disabled_headline: "Javascript is disabled!"
+    javascript_disabled_text: "Alchemy needs Javascript to run smoothly. Please enable it in your browser settings."
     language_does_not_exist: "This language tree does not exist"
     language_pages_copied: "Language tree succesfully copied."
     link_image: "Link this image."

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.3"
+	VERSION = "2.1.4"
 
 end

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,9 +1,3 @@
-<%- unless @contents.blank? -%>
-	<%- @contents.each do |content| -%>
-		<%- unless content["type"] == "Alchemy::EssencePicture" || content["type"] == "EssencePicture" -%>
+<%- @contents.each do |content| -%>
 <%%= render_essence_editor_by_name(element, '<%= content["name"] %>') %>
-		<%- else -%>
-<%%= render_picture_editor(element) %>
-		<%- end -%>
-	<%- end -%>
 <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70207620493240 !ruby/object:Gem::Requirement
+  requirement: &70096236707100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70207620493240
+  version_requirements: *70096236707100
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70207620490880 !ruby/object:Gem::Requirement
+  requirement: &70096236879620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207620490880
+  version_requirements: *70096236879620
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70207620535420 !ruby/object:Gem::Requirement
+  requirement: &70096236875620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207620535420
+  version_requirements: *70096236875620
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70207620534680 !ruby/object:Gem::Requirement
+  requirement: &70096236911760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70207620534680
+  version_requirements: *70096236911760
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70207620533640 !ruby/object:Gem::Requirement
+  requirement: &70096236908560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70207620533640
+  version_requirements: *70096236908560
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70207620532420 !ruby/object:Gem::Requirement
+  requirement: &70096236904540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207620532420
+  version_requirements: *70096236904540
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70207620531360 !ruby/object:Gem::Requirement
+  requirement: &70096236778220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70207620531360
+  version_requirements: *70096236778220
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70207620530160 !ruby/object:Gem::Requirement
+  requirement: &70096236775320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70207620530160
+  version_requirements: *70096236775320
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70207620529000 !ruby/object:Gem::Requirement
+  requirement: &70096236772540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70207620529000
+  version_requirements: *70096236772540
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70207620558540 !ruby/object:Gem::Requirement
+  requirement: &70096236510540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70207620558540
+  version_requirements: *70096236510540
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70207620553520 !ruby/object:Gem::Requirement
+  requirement: &70096236965880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70207620553520
+  version_requirements: *70096236965880
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70207620580400 !ruby/object:Gem::Requirement
+  requirement: &70096236964340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70207620580400
+  version_requirements: *70096236964340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70207620578660 !ruby/object:Gem::Requirement
+  requirement: &70096236963760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70207620578660
+  version_requirements: *70096236963760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70207620577380 !ruby/object:Gem::Requirement
+  requirement: &70096236962720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207620577380
+  version_requirements: *70096236962720
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -809,7 +809,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1495060895852714083
+      hash: -2683034050984755578
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -818,7 +818,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1495060895852714083
+      hash: -2683034050984755578
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: