alchemy_cms 2.1.beta5 → 2.1.beta6

data/app/views/alchemy/admin/partials/_language_tree_select.html.erb

@@ -0,0 +1,22 @@
+<div class="button_with_label">
+	<%= select_tag(
+		'language', 
+		options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
+		:id => 'language_tree_select',
+		:class => 'short'
+	) %>
+	<label><%= t("Language tree") %></label>
+</div>
+
+<% content_for :javascripts do %>
+<script type="text/javascript" charset="utf-8">
+	(function($) {
+		$('#language_tree_select').on('change', function() {
+			Alchemy.pleaseWaitOverlay();
+			$.get('<%= switch_language_admin_pages_path %>', {
+				language_id: this.value
+			});
+		});
+	})(jQuery);
+</script>
+<% end %>

data/app/views/alchemy/admin/partials/_pagination_links.html.erb

@@ -1,5 +1,7 @@
 <%= will_paginate(
 	items,
 	:previous_label => '&laquo; ' + t('pagination.previous_page'),
-	:next_label => t('pagination.next_page') + ' &raquo;'
+	:next_label => t('pagination.next_page') + ' &raquo;',
+	:renderer => 'Alchemy::ScopedPaginationLinkRenderer',
+	:params => defined?(scope) ? {:scope => scope} : nil
 ) %>

data/app/views/alchemy/admin/pictures/update.js.erb

@@ -1 +1,3 @@
 Alchemy.growl('<%= @message %>');
+$('.inplace-edit').remove();
+$("#picture_#{@picture.id}").replaceWith('<%= escape_javascript(render("picture", :picture => @picture)) %>');

data/app/views/alchemy/admin/trash/index.html.erb

@@ -6,7 +6,7 @@
 	<%- else -%>
 	<div class="info">
 		<%= render_icon('info') %>
-		<%= t('Drag an element over to the element window to restore it.') %>
+		<%= t('Drag an element over to the element window to restore it') %>
 	</div>
 	<div id="trash_items">
 		<%- @elements.each do |element| -%>

data/app/views/alchemy/admin/users/_user.html.erb

@@ -8,7 +8,7 @@
 	<td><%= user.lastname -%></td>
 	<td class="email"><%= user.email %></td>
 	<td><%= t(user.language, :scope => 'translations') %></td>
-	<td class="role"><%= t("user_roles.#{user.role}") %></td>
+	<td class="role"><%= user.human_role_name %></td>
 	<td class="tools">
 		<%- permitted_to?(:destroy, :alchemy_admin_users) do -%>
 		<%= link_to_confirmation_window(

data/config/locales/alchemy.de.yml

@@ -2,9 +2,6 @@
 
 de:
   
-  yes: "Ja"
-  no: "Nein"
-  
   # = Alchemy Translations
   # All translations used in Alchemy CMS are inside this alchemy namespace.
   alchemy:
@@ -193,7 +190,7 @@ de:
     "Do you really want to clear the clipboard?": "Wollen Sie die Zwischenablage wirklich leeren?"
     "Do you really want to clear the trash?": "Wollen Sie den Papierkorb wirklich leeren?"
     "Do you really want to delete this content?": "Wollen Sie diesen Inhalt wirklich löschen?"
-    "Drag an element over to the element window to restore it.": "Ziehen Sie ein Element mit der Maus in das Elemente Fenster, um es wieder herzustellen."
+    "Drag an element over to the element window to restore it": "Ziehen Sie ein Element mit der Maus in das Elemente Fenster, um es wieder herzustellen."
     "Edit Picturemask": "Bildmaske bearbeiten"
     "Element trashed": "Das Element wurde in den Papierkorb gelegt"
     "Error with the Flash® Uploader!": "Fehler mit dem Flash® Uploader!"
@@ -210,6 +207,7 @@ de:
     "If you have any problems using the Flash uploader you can switch to": "Sollten Sie Probleme mit dem Flash® Uploader haben, wechseln Sie einfach zur %{link}"
     "Image missing": "Bild fehlt"
     "Image size": "Bildgröße"
+    "Image updated successfully": "Bild wurde gespeichert"
     "Index Error after saving Element. Please try again!": "Indizierungsfehler beim Speichern des Elements. Bitte erneut versuchen!"
     "Language successfully created.": "Sprache wurde erfolgreich erstellt."
     "Language successfully destroyed.": "Sprache wurde erfolgreich gelöscht."
@@ -231,12 +229,12 @@ de:
     "Page saved": "%{name} wurde gespeichert"
     "Page Preview": "Seitenvorschau"
     "Page cache flushed": "Seitencache wurde geleert"
-    "Page not public": "Seite nicht öffentlich"
-    "Page not restricted": "Seite nicht geschützt"
-    "Page not visible": "Seite nicht in der Navigation sichtbar"
-    "Page public": "Seite öffentlich"
-    "Page restricted": "Seite geschützt"
-    "Page visible": "Seite in der Navigation sichtbar"
+    "Page not public": "Seite ist nicht veröffentlicht"
+    "Page not restricted": "Seite ist nicht Passwort geschützt"
+    "Page not visible": "Seite ist nicht in der Navigation sichtbar"
+    "Page public": "Seite ist veröffentlicht"
+    "Page restricted": "Seite ist Passwort geschützt"
+    "Page visible": "Seite ist in der Navigation sichtbar"
     "Pages order saved": "Seitensortierung wurde gespeichert"
     "Password": "Passwort"
     "Paste from clipboard": "Aus Zwischenablage"
@@ -434,7 +432,7 @@ de:
     no_search_results: "Keine Suchergebnisse."
     "not a valid image": "Keine valide Bilddatei."
     "other Elements": "sonst. Elemente"
-    "Page created.": "Seite '%{name}' wurde erstellt."
+    "Page created": "Seite '%{name}' wurde erstellt."
     page_for_links:
       choose_page: "%{name} wählen"
     page_locked: "Die Seite ist gesperrt"
@@ -682,6 +680,20 @@ de:
         name: "Name"
         public: "sichtbar"
       
+      alchemy/essence_picture:
+        caption: "Untertitel"
+        title: "Titel"
+        alt_tag: "Alternativ-Text"
+        link: Link
+        link_class_name: "Link CSS-Klasse"
+        link_title: Link-Titel
+        css_class: CSS-Klasse
+        link_target: Link-Ziel
+        render_size: Darstellungsgröße
+        crop_from: Bildmaskenursprung
+        crop_size: Bildmaskenausmaß
+        picture_id: Bild
+      
       alchemy/language:
         code: "Sprachkürzel"
         default: "Standardsprache"
@@ -695,19 +707,19 @@ de:
         language: "Sprache"
         locked: "Die Seite ist gesperrt"
         locked_by: "Gesperrt durch"
-        meta_description: "Meta Beschreibung"
-        meta_keywords: "Meta Schlagwörter"
+        meta_description: "Seitenbeschreibung"
+        meta_keywords: "Suchbegriffe"
         name: "Name"
         page_layout: "Seitentyp"
-        public: "Seite veröffentlichen"
-        resctricted: "Seite schützen"
+        public: "veröffentlicht"
+        restricted: "Passwort geschützt"
         robot_follow: "den Robot Links folgen lassen"
         robot_index: "durch Robot indizieren"
-        sitemap: "in der Seitemap anzeigen"
+        sitemap: "in der Seitenübersicht sichtbar"
         title: "Seitentitel"
         updated_at: "Aktualisiert am"
         urlname: "URL-Name"
-        visible: "in der Navigation anzeigen"
+        visible: "in der Navigation sichtbar"
       
       alchemy/picture:
         image_filename: "Dateiname"

data/config/locales/alchemy.en.yml

@@ -208,6 +208,7 @@ en:
     document: "File"
     documents: "Files"
     download_file: "Download file '%{filename}'"
+    "Drag an element over to the element window to restore it": "Drag an element over to the element window to restore it."
     drag_to_sort: "Drag'n'Drop to sort images"
     edit_file_properties: "Edit Fileproperties"
     edit_image_properties: "Edit image properties."
@@ -278,7 +279,7 @@ en:
     no_more_elements_to_add: "No more elements available."
     no_search_results: "Your search did not return any results."
     "not a valid image": "This is not an valid image."
-    "Page created.": "Page: '%{name}' created."
+    "Page created": "Page: '%{name}' created."
     page_for_links.choose_page: "Choose %{name}"
     page_locked: "This page is locked by another user."
     page_properties: "page properties"
@@ -503,14 +504,14 @@ en:
         name: "Name"
         page_layout: "Pagetype"
         public: "public"
-        resctricted: "restricted"
+        restricted: "restricted"
         robot_follow: "robot may follow links"
         robot_index: "allow robot to index"
-        sitemap: "show in sitemap"
+        sitemap: "visible in sitemap"
         title: "Title"
         updated_at: "Updated at"
         urlname: "Urlname"
-        visible: "show in navigation"
+        visible: "visible in navigation"
       
       alchemy/picture:
         image_filename: "Filename"

data/lib/alchemy/capistrano.rb

@@ -49,6 +49,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     end
 
+		desc "Upgrades production database to current Alchemy CMS version"
+		task :upgrade do
+			run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:upgrade"
+		end
+
   	namespace :database_yml do
 
   		desc "Creates the database.yml file"

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.humanize
+			options[:default] = options[:default] ? options[:default] : msg.to_s.humanize
 			scope = ['alchemy']
 			case options[:scope].class.name
 				when "Array"

data/lib/alchemy/page_layout.rb

@@ -61,7 +61,7 @@ module Alchemy
 		def self.get_layouts_for_select(language_id, layoutpage = false)
 			layouts_for_select = [ [ Alchemy::I18n.t("Please choose"), "" ] ]
 			selectable_layouts(language_id, layoutpage).each do |layout|
-				display_name = Alchemy::I18n.t("alchemy.page_layout_names.#{layout['name']}", :default => layout['name'].camelize)
+				display_name = Alchemy::I18n.t("page_layout_names.#{layout['name']}", :default => layout['name'].camelize)
 				layouts_for_select << [display_name, layout["name"]]
 			end
 			layouts_for_select

data/lib/alchemy/scoped_pagination_link_renderer.rb

@@ -0,0 +1,27 @@
+# A custom WillPaginate LinkRenderer Class for scoping the urls.
+require 'will_paginate/view_helpers/action_view'
+
+module Alchemy
+	class ScopedPaginationLinkRenderer < WillPaginate::ActionView::LinkRenderer
+
+		def url(page)
+			@base_url_params ||= begin
+				url_params = merge_get_params(default_url_params)
+				merge_optional_params(url_params)
+			end
+
+			url_params = @base_url_params.dup
+			add_current_page_param(url_params, page)
+
+			if url_params[:scope]
+				scope = url_params[:scope]
+				url_params.delete(:scope)
+				url_params.delete(:controller)
+				scope.url_for(url_params)
+			else
+				@template.url_for(url_params)
+			end
+		end
+
+	end
+end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.beta5"
+	VERSION = "2.1.beta6"
 
 end

data/lib/alchemy_cms.rb

@@ -17,7 +17,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
 	require 'alchemy/version'
 	require 'alchemy/auth_engine'
 	require 'alchemy/engine'
-	%w(config essence page_layout modules remote_pagination_link_renderer tinymce i18n).each do |class_name|
+	%w(config essence page_layout modules scoped_pagination_link_renderer remote_pagination_link_renderer tinymce i18n).each do |class_name|
 		require File.join(File.dirname(__FILE__), "alchemy", class_name)
 	end
 	require File.join(File.dirname(__FILE__), "alchemy", "seeder")

data/spec/controllers/admin/contents_controller_spec.rb

@@ -13,4 +13,23 @@ describe Alchemy::Admin::ContentsController do
 		@element.ingredient('intro').should == "Peters Petshop"
 	end
 
+	describe "#order" do
+
+		context "with content_ids in params" do
+
+			before(:each) do
+				@element = Factory(:element)
+			end
+
+			it "should reorder the contents" do
+				content_ids = @element.contents.essence_texts.collect(&:id)
+				post :order, {:content_ids => content_ids.reverse, :format => :js}
+				response.status.should == 200
+				@element.contents.essence_texts.collect(&:id).should == content_ids.reverse
+			end
+
+		end
+
+	end
+
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Alchemy::Admin::PagesController do
+
+	before(:each) do
+		activate_authlogic
+		Alchemy::UserSession.create Factory(:admin_user)
+	end
+
+	describe "#flush", :focus => true do
+
+		it "should remove the cache of all pages" do
+			post :flush, {:format => :js}
+			response.status.should == 200
+		end
+
+	end
+
+end

data/spec/controllers/base_controller_spec.rb

@@ -17,7 +17,7 @@ describe Alchemy::BaseController do
 			controller.session[:language_code].should == @language.code
 		end
 
-		it "should set the language from id as string", :focus => true do
+		it "should set the language from id as string" do
 			@language = Factory(:language)
 			controller.send :set_language_from, @language.id.to_s
 			controller.session[:language_id].should == @language.id

data/spec/controllers/pages_controller_spec.rb

@@ -37,4 +37,66 @@ describe Alchemy::PagesController do
 
 	end
 
+	describe "Layout rendering" do
+
+		context "with param layout set to none" do
+
+			it "should not render a layout" do
+				get :show, :urlname => :home, :layout => false
+				response.body.should_not have_content('<head>')
+			end
+
+		end
+
+		context "with param layout set to a custom layout" do
+
+			before do
+				@custom_layout = Rails.root.join('app/views/layouts', 'custom.html.erb')
+				File.open(@custom_layout, 'w') do |custom_layout|
+					custom_layout.puts "<html>I am a custom layout</html>"
+				end
+			end
+
+			it "should render the custom layout" do
+				get :show, :urlname => :home, :layout => 'custom'
+				response.body.should have_content('I am a custom layout')
+			end
+
+			after do
+				FileUtils.rm(@custom_layout)
+			end
+
+		end
+
+		context "with application layout absent" do
+
+			it "should render pages layout" do
+				get :show, :urlname => :home
+				response.body.should_not have_content('I am the application layout')
+			end
+
+		end
+
+		context "with application layout present" do
+
+			before do
+				@app_layout = Rails.root.join('app/views/layouts', 'application.html.erb')
+				File.open(@app_layout, 'w') do |app_layout|
+					app_layout.puts "<html>I am the application layout</html>"
+				end
+			end
+
+			it "should render application layout" do
+				get :show, :urlname => :home
+				response.body.should have_content('I am the application layout')
+			end
+
+			after do
+				FileUtils.rm(@app_layout)
+			end
+
+		end
+
+	end
+
 end

data/spec/integration/admin/pages_controller_spec.rb

@@ -1,46 +1,73 @@
+# Skipping on Travis-CI, because capybara-webkit does not install on travis.
+unless ENV["CI"]
+
 require 'spec_helper'
 
-describe Alchemy::Admin::PagesController do
+describe Alchemy::Admin::PagesController, :js => true do
 
-	describe "language tree switching", :js => true do
+	describe "language tree switching" do
 
 		context "in a multilangual environment" do
 
-			before(:each) do
+			before(:all) do
 				Factory.build(:admin_user).save_without_session_maintenance
-				Factory(:language)
-				Factory(:language_root_page, :language => Alchemy::Language.get_default, :name => 'Deutsch')
-				Factory(:language_root_page, :name => 'Klingonian')
+				@language = Factory(:language)
+				@german_root = Factory(:language_root_page, :language => Alchemy::Language.get_default, :name => 'Deutsch')
+				@klingonian_root = Factory(:language_root_page, :name => 'Klingonian')
 			end
 
 			it "one should be able to switch the language tree" do
-				pending "This driver does not execute javascript as it should"
 				login_to_alchemy
 				visit('/alchemy/admin/pages')
 				page.select 'Klingonian', :from => 'language'
 				within('#sitemap') { page.should have_content('Klingonian') }
 			end
 
+			after(:all) {
+				@language.destroy
+				@klingonian_root.destroy
+				@german_root.destroy
+			}
+
 		end
 
 		context "with no language root page" do
 
-			before(:each) do
+			before(:all) do
 				Factory.build(:admin_user).save_without_session_maintenance
+				@language = Factory(:language)
 			end
 
-			it "it should display the form for creating or copy language root" do
-				pending "This driver does not work."
+			it "it should display the form for creating language root" do
 				login_to_alchemy
 				visit('/alchemy/admin/pages')
-				save_and_open_page
+				page.select 'Klingonian', :from => 'language'
 				within('#archive_all') do
 					page.should have_content('This language tree does not exist')
-					page.should have_content('Do you want to copy')
-					page.should have_content('do you want to create a new empty language tree')
 				end
 			end
 
+			after(:all) {
+				@language.destroy
+			}
+
+		end
+
+	end
+
+	describe "flush complete page cache" do
+
+		before(:all) do
+			Factory.build(:admin_user).save_without_session_maintenance
+		end
+
+		it "should remove the cache of all pages" do
+			login_to_alchemy
+			visit '/alchemy/admin/pages'
+			click_link 'Flush page cache'
+			within('#flash_notices') do
+				page.should have_content('Page cache flushed')
+			end
 		end
 
 	end
@@ -54,3 +81,5 @@ def login_to_alchemy
 	fill_in('alchemy_user_session_password', :with => 's3cr3t')
 	click_on('Login')
 end
+
+end