alchemy_cms 2.0.2 → 2.0.3

data/README.md

@@ -6,7 +6,7 @@ Alchemy CMS
 About
 -----
 
-Alchemy is a powerfull Content Management System (CMS) with an extremly flexible content storing architecture.
+Alchemy is a powerful Content Management System (CMS) with an extremly flexible content storing architecture.
 
 Features
 --------
@@ -108,7 +108,7 @@ Resources
 ---------
 
 * Homepage: <http://alchemy-cms.com>
-* Live-Demo: <http://demo.alchemy-cms.com>
+* Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo)
 * Wiki: <http://wiki.alchemy-cms.com>
 * API Documentation: <http://api.alchemy-cms.com>
 * Issue-Tracker: <http://issues.alchemy-cms.com>

data/app/controllers/admin/elements_controller.rb

@@ -71,28 +71,12 @@ class Admin::ElementsController < AlchemyController
       @element.public = !params[:public].nil?
       @element.save
     else
-      render :update do |page|
-        page.call('Alchemy.growl', _("Validation failed."), :warn)
-        error_message = "<h2>#{_('Validation failed.')}</h2><p>#{_('Please check contents below.')}</p>"
-        page << "jQuery('#element_#{@element.id}_errors').html('#{error_message}<ul><li>#{@element.essence_error_messages.join('</li><li>')}</li></ul>')"
-        page.show("element_#{@element.id}_errors")
-        selector = @element.contents_with_errors.map { |content| '#' + content_dom_id(content) }.join(', ')
-        page << "jQuery('div.content_editor').removeClass('validation_failed')"
-        page << "jQuery('#{selector}').addClass('validation_failed')"
-        page << "Alchemy.enableButton('#element_#{@element.id} button.button')"
-      end
+			@element_validated = false
+			@notice = _('Validation failed.')
+			@error_message = "<h2>#{@notice}</h2><p>#{_('Please check contents below.')}</p>".html_safe
     end
   rescue Exception => e
-    exception_logger(e)
-    if e.class == Ferret::FileNotFoundError
-      EssenceText.rebuild_index
-      EssenceRichtext.rebuild_index
-      render :update do |page|
-        page << "Alchemy.growl('#{_("Index Error after saving Element. Please try again!")}', 'error')"
-      end
-    else
-      show_error_notice(e)
-    end
+    exception_handler(e)
   end
   
   # Trashes the Element instead of deleting it.

data/app/helpers/contents_helper.rb

@@ -23,9 +23,9 @@ module ContentsHelper
     if content.description.blank?
       warning("Content #{content.name} is missing its description")
       title = _("Warning: Content '%{contentname}' is missing its description.") % {:contentname => content.name}
-      content_name = %(<span class="warning icon" title="#{title}"></span>&nbsp;) + content_name
+      content_name = %(<span class="warning icon" title="#{title}"></span>&nbsp;) + content_name.html_safe
     end
-    content.has_validations? ? "#{content_name}<span class='validation_indicator'>*</span>" : content_name
+    content.has_validations? ? "#{content_name}<span class='validation_indicator'>*</span>".html_safe : content_name
   end
 
   # Renders a link to show the new content overlay

data/app/models/page.rb

@@ -37,7 +37,7 @@ class Page < ActiveRecord::Base
   scope :all_locked, where(:locked => true)
   scope :not_locked, where(:locked => false)
   scope :visible, where(:visible => true)
-  scope :public, where(:public => true)
+  scope :published, where(:public => true)
   scope :accessable, where(:restricted => false)
   scope :restricted, where(:restricted => true)
   scope :public_language_roots, lambda {

data/app/views/admin/elements/update.js.erb

@@ -1,4 +1,6 @@
 (function($) {
+	<%- if @element_validated -%>
+	
   $('div#element_<%= @element.id -%> div.element_handle span.icon').removeClass('element_<%= @element.public? ? "draft" : "public" -%>').addClass('element_<%= @element.public? ? "public" : "draft" -%>');
   $('.element_editor[data-element-id="<%= @element.id -%>"] .element_heading .preview_text_element_name').text('<%= @element.display_name -%>');
   $('.element_editor[data-element-id="<%= @element.id -%>"] .element_heading .preview_text_quote').text('<%= escape_javascript(@element.preview_text) -%>');
@@ -7,4 +9,16 @@
   Alchemy.setElementSaved('#element_<%= @element.id -%>');
   Alchemy.growl('<%= _("element_saved") -%>');
   Alchemy.PreviewWindow.refresh();
+
+	<%- else -%>
+
+	Alchemy.growl('<%= escape_javascript(@notice) %>', 'warn');
+	$('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @element.essence_error_messages.join("</li><li>") %></li></ul>');
+  $("#element_<%= @element.id %>_errors").show();
+  $('div.content_editor').removeClass('validation_failed');
+  $('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
+  Alchemy.enableButton('#element_<%= @element.id %> button.button');
+
+	<%- end -%>
+
 })(jQuery);

data/app/views/admin/partials/_upload_form.html.erb

@@ -74,10 +74,10 @@
 			flash9_url : "/javascripts/alchemy/swfupload/swfupload.swf",
 			upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
 			post_params: <%= post_params.html_safe %>,
-			file_size_limit : "<%= configuration(:uploader)[:file_size_limit] -%> MB",
+			file_size_limit : "<%= configuration(:uploader)[:file_size_limit] || 100 -%> MB",
 			file_types : '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
 			file_types_description : "<%= file_types_description %>",
-			file_upload_limit : <%= configuration(:uploader)[:upload_limit] -%>,
+			file_upload_limit : <%= configuration(:uploader)[:upload_limit] || 50 -%>,
 			file_queue_limit : 0,
 			custom_settings : {
 				progressTarget : "uploadProgressContainer",

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

@@ -18,7 +18,7 @@
     <div class="missing_image">
       <p>
         <%= image_tag('alchemy/placeholder.png') %><br>
-        <%= _('Image missing') %><%= '<span class="validation_indicator">*</span>' if content.has_validations? %>
+        <%= _('Image missing') %><%= '<span class="validation_indicator">*</span>'.html_safe if content.has_validations? %>
       </p>
     </div>
     <%- else -%>

data/config/alchemy/config.yml

@@ -117,12 +117,12 @@ default_language:
 :user_roles: [registered, author, editor, admin]
 
 # === Uploader Settings
-# Set an upload limit in megabytes which counts for all uploads together.
-# Set a file size limit in megabytes for a per file limit.
+#   upload_limit: Integer       Set an amount of files upload limit of files which can be uploaded at once. Set 0 for unlimited.
+#   file_size_limit: Integer    Set a file size limit in megabytes for a per file limit.
 # Allow filetypes to upload.
 # Pass * to allow all kind of files.
 :uploader:
-  :upload_limit: 500
+  :upload_limit: 50
   :file_size_limit: 100
   :allowed_filetypes:
     :pictures: [jpg, jpeg, gif, png, psd, pdf]

data/config/alchemy/elements.yml

@@ -98,7 +98,8 @@
 #       contents:
 #       - name: intro
 #         type: EssenceText
-#         validate: [presence]
+#         validate:
+#           - presence
 #     
 # Now the user has to enter a value inside of the intro EssenceText textfield to save the element.
 # Currently supported validations are:
@@ -209,13 +210,17 @@
   contents:
   - name: mail_from
     type: EssenceText
-    validate: [presence]
+    validate:
+      - presence
   - name: mail_to
     type: EssenceText
-    validate: [presence]
+    validate:
+      - presence
   - name: subject
     type: EssenceText
-    validate: [presence]
+    validate:
+      - presence
   - name: success_page
     type: EssenceText
-    validate: [presence]
+    validate:
+      - presence

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
   
 end

data/spec/models/page_spec.rb

@@ -113,13 +113,13 @@ describe Page do
 		it "all pages except the rootpage must have a parent_id" do
 			page = Factory.build(:page, :page_layout => "anypage", :parent_id => nil, :language => @language)
 			page.valid?
-			page.errors.should have_key(:parent_id)
+			page.should have(1).error_on(:parent_id)
 		end
 		
 		it "must not be created if the page_layout is set to 'rootpage' and a page already exists with this page_layout and parent_id = nil" do
 		  page = Factory.build(:page, :name => "anypage", :page_layout => "rootpage", :parent_id => @language_root.id, :language => @language)
 			page.valid?
-			page.errors.should have_key(:page_layout)	
+			page.should have(1).error_on(:page_layout)
 		end
 		
 		it "should get a webfriendly urlname on create" do
@@ -165,7 +165,7 @@ describe Page do
 	  it "should return 2 pages that are public" do
 			Factory(:public_page, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
 			Factory(:public_page, :name => 'Second Public Child', :parent_id => @language_root.id, :language => @language)
-	    Page.public.should have(2).pages
+	    Page.published.should have(2).pages
 	  end
 	end
 		

metadata

@@ -2,7 +2,7 @@
 name: alchemy_cms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Thomas von Deyen
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-11-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails