alchemy_cms 2.1.beta6 → 2.1.rc2

data/config/alchemy/config.yml

@@ -39,6 +39,16 @@
   :show_root: true
   :show_flag: false
 
+# === URL nesting
+# By default Alchemy does not nest page urls respectivley to their page tree position.
+# Enable +url_nesting+ to get nested urls.
+# ==== Example of a nested url:
+# +http://homepage.com/company/history/the-early-years+
+# Alchemy supports url nesting up to three levels deep. We think that's more then enough,
+# because URLs like this are possible:
+# +http://homepage.com/en/2011/12/08/my-post
+url_nesting: false
+
 # === Picture rendering settings
 # Alchemy uses Fleximage and RMagick to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
 # See https://github.com/Squeegy/fleximage for further infos.

data/config/alchemy/elements.yml

@@ -191,6 +191,11 @@
   - name: subheadline
     type: EssenceText
 
+- name: download
+  contents:
+  - name: file
+    type: EssenceFile
+
 - name: news
   contents:
   - name: date

data/config/alchemy/page_layouts.yml

@@ -34,7 +34,7 @@
   autogenerate: [header, intro_image_text]
 
 - name: standard
-  elements: [article, claim, header, bild, bild_text, text, intro, headline, image_mosaic]
+  elements: [article, claim, header, bild, bild_text, text, intro, headline, image_mosaic, download]
   autogenerate: [header, claim, article]
 
 - name: contact

data/config/locales/alchemy.de.yml

@@ -70,6 +70,7 @@ de:
       news_headline: "News Überschrift"
       image_mosaic:
         caption: "Mosaik Bildunterschrift"
+      file: Datei
     
     content_validations:
       errors:
@@ -83,10 +84,13 @@ de:
         no_float: 'Über dem Text'
     
     # == Translations for the build in full text search.
-    search:
+    search_result_page:
       no_results: 'Ihre Suche ergab kein Ergebnis.'
       result_heading: "Ihre Suche nach '%{query}'"
-      result_count: "Ergab %{result_count} Ergebnisse"
+      result_count:
+        zero: "Ergab keine Ergebnisse"
+        one: "Ergab ein Ergebnis"
+        other: "Ergab %{count} Ergebnisse"
     
     # == Contactform translations
     contactform:
@@ -195,7 +199,6 @@ de:
     "Element trashed": "Das Element wurde in den Papierkorb gelegt"
     "Error with the Flash® Uploader!": "Fehler mit dem Flash® Uploader!"
     "Excerpt": "Auszug"
-    "Explain|Sitemap|Dragndrop sorting": "Tip: Halten Sie zum Sortieren der Seiten das Seitensymbol mit der Maus fest und bewegen Sie sie an ihre neue Position."
     "File %{name} uploaded succesfully": "Datei %{name} wurde hochgeladen"
     "File renamed successfully from: '%{from}' to '%{to}'": "Datei wurde erfolgreich von: '%{from}' nach '%{to}' umbenannt."
     "File upload error: %{error}": "Datei konnte nicht hochgeladen werden: %{error}"
@@ -222,6 +225,7 @@ de:
     "New page": "Neue Seite"
     "No": "Nein"
     "No EssenceType given": ""
+    "No image found. Did you saved the element?": "Es wurde kein Bild gefunden. Haben Sie das Element auch gespeichert?"
     "No items in your clipboard": "Ihre Zwischenablage ist leer"
     "None": ""
     "Open Link in": "Link öffnen in"
@@ -283,7 +287,7 @@ de:
     "User deleted": "%{name} wurde gelöscht"
     "User updated": "%{name} wurde aktualisiert"
     "Username": "Benutzername"
-    "Validation failed.": "Pflichtfelder wurden nicht ausgefüllt."
+    "Validation failed": "Pflichtfelder wurden nicht ausgefüllt."
     "Version": "Version"
     "View File": "Datei anzeigen"
     "Visit page": "zur Seite gehen"
@@ -366,6 +370,7 @@ de:
     enter_external_link: "Geben Sie hier die Adresse der Seite ein zu der Sie einen Link setzen wollen."
     explain cropping: "Sie können den Rahmen verschieben und in der Größe verändern um den Bildausschnitt festzulegen. Wenn Sie zufrieden sind, dann klicken Sie bitte auf speichern."
     explain_publishing: "Die gecachte Version vom Server löschen und die aktuellen Änderungen veröffentlichen"
+    explain_sitemap_dragndrop_sorting: "Tip: Halten Sie zum Sortieren der Seiten das Seitensymbol mit der Maus fest und bewegen Sie sie an ihre neue Position."
     explain_unlocking: "Die Seite verlassen und für andere Benutzer zum Bearbeiten freigeben."
     explain_upload:
       footnote: "TIP! Halten Sie die Strg-Taste (cmd-Taste auf einem Mac) während Sie die %{name} mit der Maus anklicken, um mehrere %{name} gleichzeitig hochzuladen."
@@ -524,9 +529,9 @@ de:
     "Succesfully created": "Erfolgreich erstellt"
     "Succesfully updated": "Erfolgreich aktualisiert"
     "Succesfully removed": "Erfolgreich gelöscht"
-    "You are already logged in.": "Sie sind bereits angemeldet."
-    "No users found.": "Keine Benutzer gefunden."
-    "Nothing found.": "Keine Einträge gefunden."
+    "You are already logged in": "Sie sind bereits angemeldet."
+    "No users found": "Keine Benutzer gefunden."
+    "Nothing found": "Keine Einträge gefunden."
   
   # END of Alchemy translation
   
@@ -554,6 +559,7 @@ de:
       default: "%d. %b. %Y, %H:%M Uhr"
       short: "%d. %B, %H:%Mh"
       long: "%A, %d. %B %Y um %H:%M Uhr"
+      date: "%d.%m.%Y"
       time: "%H:%M"
     am: "vormittags"
     pm: "nachmittags"
@@ -680,6 +686,9 @@ de:
         name: "Name"
         public: "sichtbar"
       
+      alchemy/essence_file:
+        css_class: Textanordnung
+      
       alchemy/essence_picture:
         caption: "Untertitel"
         title: "Titel"
@@ -687,7 +696,7 @@ de:
         link: Link
         link_class_name: "Link CSS-Klasse"
         link_title: Link-Titel
-        css_class: CSS-Klasse
+        css_class: Textanordnung
         link_target: Link-Ziel
         render_size: Darstellungsgröße
         crop_from: Bildmaskenursprung
@@ -768,6 +777,10 @@ de:
         even: "%{attribute} muss gerade sein"
       
       models:
+        alchemy/content:
+          attributes:
+            essence:
+              validation_failed: 'Validierung fehlgeschlagen.'
         alchemy/language:
           attributes:
             code:

data/config/locales/alchemy.en.yml

@@ -70,10 +70,13 @@ en:
         caption: "Mosaic Caption"
     
     # == Translations for the build in full text search.
-    search:
+    search_result_page:
       no_results: 'No results found'
       result_heading: "Your search for '%{query}'"
-      result_count: 'Offers %{result_count} results'
+      result_count:
+        zero: 'Offers no results'
+        one: 'Offers one result'
+        other: 'Offers %{count} results'
     
     # == Contactform translations
     contactform:
@@ -213,7 +216,7 @@ en:
     edit_file_properties: "Edit Fileproperties"
     edit_image_properties: "Edit image properties."
     edit_language: "Edit language"
-    edit_page: "Edit this page."
+    edit_page: "Edit this page"
     edit_page_properties: "Edit the page properties."
     edit_user: "Edit this users properties."
     element_editor_not_found: "Error within this Element"
@@ -221,6 +224,7 @@ en:
     element_saved: "Saved element."
     enter_external_link: "Please enter the URL you want to link with"
     explain_publishing: "Publish the page and remove the cached version from the server."
+    explain_sitemap_dragndrop_sorting: "Tip: Drag the pages at the icon in order to sort them."
     explain_unlocking: "Leave page and unlock it for other users."
     explain_upload:
       footnote: "HINT! Hold the CTRL button (CMD on a Mac) while clicking the %{name} with the mouse to upload multiple %{name} at once."
@@ -278,6 +282,7 @@ en:
     no_images_in_archive: "You don't have any images in your archive."
     no_more_elements_to_add: "No more elements available."
     no_search_results: "Your search did not return any results."
+    "No users found": "No users found."
     "not a valid image": "This is not an valid image."
     "Page created": "Page: '%{name}' created."
     page_for_links.choose_page: "Choose %{name}"
@@ -343,9 +348,12 @@ en:
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
     welcome_please_identify_notice: "Welcome! Please identify."
     width: "Width"
+    "You are already logged in": "You are already logged in."
     "You may upload files with following extensions": "You may upload %{file_types_description} with following extensions: %{file_types}"
     zoom_image: "Zoom this image."
-    
+    "Nothing found": "Nothing found."
+    "Validation failed": "Validation failed."
+  
   # END of Alchemy translation
   
   will_paginate:
@@ -376,6 +384,7 @@ en:
       default: "%a, %d %b %Y %H:%M:%S %z" 
       short: "%d %b %H:%M" 
       long: "%B %d, %Y %H:%M" 
+      date: "%Y-%m-%d"
     am: "am" 
     pm: "pm" 
   support:
@@ -486,6 +495,9 @@ en:
         name: "Name"
         public: "visible"
       
+      alchemy/essence_file:
+        css_class: CSS Class
+      
       alchemy/language:
         code: "Languagecode"
         default: "Default"
@@ -557,6 +569,10 @@ en:
         odd: "must be odd" 
         even: "must be even" 
       models:
+        alchemy/content:
+          attributes:
+            essence:
+              validation_failed: 'Validation failed.'
         alchemy/language:
           attributes:
             code:

data/config/routes.rb

@@ -2,7 +2,9 @@ Alchemy::Engine.routes.draw do
 
 	root :to => 'pages#show'
 
-	match '/admin' => redirect("/admin/dashboard")
+	match '/admin' => redirect(
+		"#{Alchemy.mount_point}/admin/dashboard"
+	)
 	match '/admin/login' => 'user_sessions#login',
 		:as => :login
 	match '/admin/signup' => 'user_sessions#signup',
@@ -13,30 +15,24 @@ Alchemy::Engine.routes.draw do
 		:as => :logout
 	match '/admin/dashboard' => 'admin/dashboard#index',
 		:as => :admin_dashboard
-	match '/attachment/:id/download(/:name)(.:suffix)' => 'attachments#download',
+
+	match '/attachment/:id/download(/:name)(.:format)' => 'attachments#download',
 		:as => :download_attachment
-	match '/attachment/:id/show' => 'attachments#show',
-		:as => :show_attachment
-	match '/pictures/show/:id/:size/:crop_from/:crop_size/:name.:format' => 'pictures#show',
-		:as => :show_cropped_picture
-	match '/pictures/show/:id/:size/:crop/:name.:format' => 'pictures#show',
-		:as => :show_picture_with_crop
-	match '/pictures/show/:id/:size/:name.:format' => 'pictures#show',
-		:as => :show_picture
-	match '/pictures/zoom/:id/picture.:format' => 'pictures#zoom',
-		:as => :zoom_picture
-	match  '/pictures/thumbnails/:id/:size(/:crop_from)(/:crop_size)/thumbnail.png' => 'pictures#thumbnail',
-		:as => :thumbnail, :defaults => { :format => 'png' }
-	match '/:lang' => 'pages#show',
-		:constraints => {:lang => /[a-z]{2}/},
-		:as => :show_language_root
-	match '(/:lang)/:urlname(.:format)' => 'pages#show',
-		:constraints => {:lang => /[a-z]{2}/},
-		:as => :show_page
+
 	# catching legacy download urls
 	match '/wa_files/download/:id' => 'attachments#download'
 	match '/uploads/files/0000/:id/:name(.:suffix)' => 'attachments#download'
 
+	match '/attachment/:id/show' => 'attachments#show',
+		:as => :show_attachment
+
+	match "/pictures/:id/show/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#show',
+		:as => :show_picture, :defaults => { :format => Alchemy::Config.get(:image_output_format) }
+	match '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
+		:as => :zoom_picture, :defaults => { :format => Alchemy::Config.get(:image_store_format) }
+	match  "/pictures/:id/thumbnails/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
+		:as => :thumbnail, :defaults => { :format => 'png', :name => "thumbnail" }
+
 	resources :messages, :only => [:index, :new, :create]
 
 	resources :user_sessions
@@ -142,4 +138,13 @@ Alchemy::Engine.routes.draw do
 
 	end
 
+	match '/:lang' => 'pages#show',
+		:constraints => {:lang => /[a-z]{2}/},
+		:as => :show_language_root
+
+	# The page show action has to be last route
+	match '(/:lang)(/:level1(/:level2(/:level3)))/:urlname(.:format)' => 'pages#show',
+		:constraints => {:lang => /[a-z]{2}/},
+		:as => :show_page
+
 end

data/db/migrate/{20111116125112_namespace_models.rb → 20111116125112_namespace_alchemy_models.rb}

@@ -1,4 +1,4 @@
-class NamespaceModels < ActiveRecord::Migration
+class NamespaceAlchemyModels < ActiveRecord::Migration
 	def change
 		rename_table :attachments,					:alchemy_attachments
 		rename_table :cells,								:alchemy_cells

data/lib/alchemy/capistrano.rb

@@ -1,15 +1,13 @@
 # This recipe contains Capistrano recipes for handling the uploads, ferret index and picture cache files while deploying your application.
 # It also contains a ferret:rebuild_index task to rebuild the index after deploying your application.
 require "rails"
+require "alchemy/mount_point"
 
 Capistrano::Configuration.instance(:must_exist).load do
   
   after "deploy:setup", "alchemy:shared_folders:create"
   after "deploy:symlink", "alchemy:shared_folders:symlink"
-  
-	if Rails.version < '3.1'
-		before "deploy:restart", "alchemy:files:copy"
-	end
+	before "deploy:start", "alchemy:seed"
   
   namespace :alchemy do
 
@@ -22,7 +20,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "mkdir -p #{shared_path}/index"
         run "mkdir -p #{shared_path}/uploads/pictures"
         run "mkdir -p #{shared_path}/uploads/attachments"
-        run "mkdir -p #{shared_path}/cache/pictures"
+        run "mkdir -p #{File.join(shared_path, 'cache', Capistrano::CLI.ui.ask("Where is Alchemy CMS mounted at? (/)"), 'pictures')}"
       end
 
       # This task sets the symlinks for uploads, picture cache and ferret index folder.
@@ -31,22 +29,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :symlink, :roles => :app do
         run "rm -rf #{current_path}/uploads"
         run "ln -nfs #{shared_path}/uploads #{current_path}/"
-        run "rm -rf #{current_path}/public/pictures"
-        run "ln -nfs #{shared_path}/cache/pictures #{current_path}/public/"
+				run "ln -nfs #{shared_path}/cache/* #{current_path}/public/"
         run "rm -rf #{current_path}/index"
         run "ln -nfs #{shared_path}/index #{current_path}/"
       end
 
-    end
-
-    namespace :files do
-
-      desc "Copies all assets and migration files from Alchemy to project"
-      task :copy do
-        run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:assets:copy:all"
-        run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:migrations:sync"
-      end
-
     end
 
 		desc "Upgrades production database to current Alchemy CMS version"

data/lib/alchemy/engine.rb

@@ -15,6 +15,8 @@ module Alchemy
 				"alchemy/alchemy.js",
 				"alchemy/preview.js",
 				"alchemy/alchemy.css",
+				"alchemy/menubar.css",
+				"alchemy/menubar.js",
 				"alchemy/print.css",
 				"alchemy/tinymce_content.css",
 				"alchemy/tinymce_dialog.css",

data/lib/alchemy/essence.rb

@@ -29,6 +29,7 @@ module Alchemy #:nodoc:
           include Alchemy::Essence::InstanceMethods
           stampable
           validate :essence_validations, :on => :update
+					has_many :contents, :as => :essence
           
           def acts_as_essence_class
             #{self.name}
@@ -92,47 +93,34 @@ module Alchemy #:nodoc:
       #       validate: [format]
       #       validate_format_with: '^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$'
       # 
-      def essence_validations
-        return true if description.blank? || description['validate'].blank?
-        description['validate'].each do |validation|
-          if validation == 'presence' && ingredient.blank?
-            add_essence_error "blank"
-          elsif validation == 'format'
-            if description['validate_format_as'].blank? && !description['validate_format_with'].blank?
-              matcher = Regexp.new(description['validate_format_with'])
-            elsif !description['validate_format_as'].blank? && description['validate_format_with'].blank?
-              case description['validate_format_as']
-              when 'email'
-                then matcher = Authlogic::Regex.email
-              when 'url'
-                then matcher = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
-              else
-                raise "No validation format matcher found for #{description['validate_format_as']}"
-              end
-            else
-              raise 'No validation format matcher given'
-            end
-            if ingredient.match(matcher).nil?
-              add_essence_error "wrong_format"
-            end
-          elsif validation == 'uniqueness' && !acts_as_essence_class.send("find_by_#{ingredient_column}", ingredient).blank?
-            add_essence_error "taken"
-          end
-        end
-      end
-      
-      def essence_errors
-        @essence_errors ||= []
-      end
-      
-      def essence_errors=(errors)
-        @essence_errors ||= errors
-      end
-      
-      def add_essence_error(error)
-        essence_errors << error
-        errors.add(:base, :essence_validation_failed)
-      end
+			def essence_validations
+				return true if description.blank? || description['validate'].blank?
+				description['validate'].each do |validation|
+					if validation == 'presence' && ingredient.blank?
+						errors.add(ingredient_column.to_sym, :blank)
+					elsif validation == 'format'
+						if description['validate_format_as'].blank? && !description['validate_format_with'].blank?
+							matcher = Regexp.new(description['validate_format_with'])
+						elsif !description['validate_format_as'].blank? && description['validate_format_with'].blank?
+							case description['validate_format_as']
+							when 'email'
+								then matcher = Authlogic::Regex.email
+							when 'url'
+								then matcher = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+							else
+								raise "No validation format matcher found for #{description['validate_format_as']}"
+							end
+						else
+							raise 'No validation format matcher given'
+						end
+						if ingredient.match(matcher).nil?
+							errors.add(ingredient_column.to_sym, :invalid)
+						end
+					elsif validation == 'uniqueness' && !acts_as_essence_class.send("find_by_#{ingredient_column}", ingredient).blank?
+						errors.add(ingredient_column.to_sym, :taken)
+					end
+				end
+			end
       
       # Essence description from config/elements.yml
       def description

data/lib/alchemy/i18n.rb

@@ -22,7 +22,7 @@ module Alchemy
 		# 
 		def self.t(msg, *args)
 			options = args.extract_options!
-			options[:default] = options[:default] ? options[:default] : msg.to_s.humanize
+			options[:default] = options[:default] ? options[:default] : msg
 			scope = ['alchemy']
 			case options[:scope].class.name
 				when "Array"