alchemy_cms 2.1.rc6 → 2.1

data/app/helpers/alchemy/pages_helper.rb

@@ -14,61 +14,6 @@ module Alchemy
 			content.essence.caption
 		end
 
-		def alchemy_form_select(name, select_options, options={})
-			select "mail_data", name, select_options, :selected => (session[:mail_data][name.to_sym] rescue "")
-		end
-
-		def alchemy_form_input_field(name, options = {})
-			if options[:value].blank? && session[:mail_data].blank?
-				value = nil
-			elsif options[:value].blank? && !session[:mail_data].blank?
-				value = session[:mail_data][name.to_sym]
-			else
-				value = options[:value]
-			end
-			text_field("mail_data", name, {:value => value}.merge(options))
-		end
-
-		def alchemy_form_text_area(name, options={})
-			text_area "mail_data", name, :class => options[:class], :value => (session[:mail_data][name.to_sym] rescue "")
-		end
-
-		def alchemy_form_check_box(name, options={})
-			box = hidden_field_tag "mail_data[#{name}]", 0, :id => nil
-			box += check_box_tag("mail_data[#{name}]", 1, (session[:mail_data] && session[:mail_data][name.to_sym] == "1"))
-			box
-		end
-
-		def alchemy_form_label(element, name, options={})
-			label_tag "mail_data_#{name}", render_essence_view_by_name(element, name), options
-		end
-
-		def alchemy_form_reset_button(name, options={})
-			button_to_function(
-				name,
-				remote_function(
-					:url => {
-						:controller => "contact_form",
-						:action => "clear_session"
-					},
-					:before => %(
-						this.form.reset();
-						this.form.descendants().each(
-							function(d){
-								if ((d.type!='button') && (d.type!='submit') && (d.type!='hidden') && !d.disabled) {
-									d.value = '';
-									if (d.type == 'checkbox') {
-										d.checked = false;
-									}
-								}
-							}
-						)
-					)
-				),
-				options
-			)
-		end
-
 		# == Helper for rendering language switches
 		# 
 		# Renders links to all public language root pages

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -17,7 +17,7 @@
 	<td class="file_name"><%= attachment.filename %></td>
 	<td class="file_type"><%= mime_to_human(attachment.content_type) %></td>
 	<td class="file_size"><%= number_to_human_size(attachment.size) %></td>
-	<td class="date"><%= l(attachment.created_at) %></td>
+	<td class="date"><%= l(attachment.created_at, :format => :short) %></td>
 	<td class="tools long">
 		<%- permitted_to?(:download, :attachments) do -%>
 		<%= link_to(

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

@@ -1,6 +1,9 @@
 <div class="with_padding">
 	<%- if @clipboard_items.blank? -%>
-	<p><%= t('No items in your clipboard') %></p>
+	<div class="info">
+		<%= render_icon('info') %>
+		<%= t('No items in your clipboard') %>
+	</div>
 	<%- else -%>
 	<div id="clipboard_items">
 		<ul>

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

@@ -1,11 +1,16 @@
 <div id="dashboard">
-	<h1><%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %></h1>
-	<h2><%= t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></h2>
-	
+	<div class="with_padding">
+		<h1>
+			<%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+		</h1>
+		<p>
+			<small><%= t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></small>
+		</p>
+	</div>
 	<div class="widget">
 		<h2><%= t('Your last updated pages') %>:</h2>
 		<%- if @last_edited_pages.blank? -%>
-		<p><%= t('no pages') %></p>
+		<ul><li class="even"><%= t('no pages') %></li></ul>
 		<%- else -%>
 		<ul>
 			<%- @last_edited_pages.each do |page| -%>
@@ -18,17 +23,17 @@
 	<div class="widget">
 		<h2><%= t('Currently locked pages') %>:</h2>
 		<%- if @locked_pages.blank? -%>
-		<p><%= t('no pages') %></p>
+		<ul><li class="even"><%= t('no pages') %></li></ul>
 		<%- else -%>
 		<ul>
 			<%- @locked_pages.each do |page| -%>
 			<li class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
 				<%- if current_user.id == page.locked_by -%>
 				<%= link_to(page.name, alchemy.edit_admin_page_path(page)) %> <small>(<%= page.locker.name %>)</small>
-				<%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => request.path)) do %>
-			  	  <button class="icon_button small" title="<%= t('explain_unlocking') %>">
-			  		    <%= render_icon('close small') %>
-			  	  </button>
+				<%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
+					<button class="icon_button small" title="<%= t('explain_unlocking') %>">
+						<%= render_icon('close small') %>
+					</button>
 			  <% end %>
 				<%- else -%>
 				<%= page.name %> <small>(<%= page.locker_name %>)</small>
@@ -42,7 +47,7 @@
 	<div class="widget">
 		<h2><%= t('Who else is online') %>:</h2>
 		<%- if @online_users.blank? -%>
-		<p><%= t('no users') %></p>
+		<ul><li class="even"><%= t('no users') %></li></ul>
 		<%- else -%>
 		<ul>
 			<%- @online_users.each do |user| -%>
@@ -53,7 +58,7 @@
 	</div>
 </div>
 <div id="sideboard">
-	<%= image_tag("alchemy/alchemy-logo.png") %>
+	<%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
 	<p><%= t("Version") %>: <%= @alchemy_version %></p>
 	<div class="sideboard_body" style="display: none">
 		<p><%= t('Alchemy is open software and itself uses open software and free resources:') %></p>

data/app/views/alchemy/admin/elements/_new_element_form.html.erb

@@ -1,6 +1,9 @@
 <div class="new_alchemy_element">
 <%- if @elements.blank? -%>
-	<p class="with_padding"><%= t('no_more_elements_to_add') %></p>
+	<div class="info with_margin">
+		<%= render_icon('info') %>
+		<%= t('no_more_elements_to_add') %>
+	</div>
 <%- else -%>
 	<%= form_for [:admin, @element], :remote => true, :class => "add_element_content" do |form| %>
 		<div id="errors" style="display: none"></div>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -1,26 +1,7 @@
 <li class="page_level_<%= layoutpage.level %>" id="page_<%= layoutpage.id %>">
   <div class="sitemap_page">
     <div class="sitemap_left_images">
-      <span class="site_status <%= layoutpage.level > 1 ? 'handle' : nil %> tooltip html_tooltip_<%= layoutpage.id %><%= layoutpage.locked ? ' locked' : '' %>" ></span>
-      <div id="tooltip_<%= layoutpage.id %>" style="display: none;">
-        <h1><%= t("page_type") %>: <%= layoutpage.layout_display_name %></h1>
-        <p>
-          <%= layoutpage.humanized_status %>
-        </p>
-        <p>
-          <strong><%= t("created_at") %>:</strong>
-          <%= l(layoutpage.created_at) %> von <%= layoutpage.creator %>
-        </p>
-        <p>
-          <strong><%= t("updated_at") %>:</strong>
-          <%= l(layoutpage.updated_at) %> durch <%= layoutpage.updater %>
-        </p>
-        <%- if layoutpage.locked? -%>
-        <p>
-          <%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= layoutpage.current_editor %></span>
-        </p>
-        <%- end -%>
-      </div>
+      <span class="site_status <%= layoutpage.locked ? ' locked' : '' %>" ></span>
     </div>
     <div class="sitemap_right_tools">
       <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>

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

@@ -8,7 +8,7 @@
 		<%= truncate page.name, :length => 15 %>
 	</span>
 	<% end %>
-	<%= form_for(alchemy.unlock_admin_page_path(page), :remote => true) do %>
+	<%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
 		<button class="icon_button small" title="<%= t('explain_unlocking') %>">
 			<%= render_icon('close small') %>
 		</button>

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

@@ -9,9 +9,9 @@
 	</span>
 	<% end %>
 	<%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
-	<button class="icon_button small" title="<%= t('explain_unlocking') %>">
-		<%= render_icon('close small') %>
-	</button>
+		<button class="icon_button small" title="<%= t('explain_unlocking') %>">
+			<%= render_icon('close small') %>
+		</button>
 	<% end %>
 </div>
 <%- end -%>

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

@@ -1,4 +1,10 @@
-<%- url ||= url_for(:action => 'index') -%>
+<%- url_scope =
+        begin
+          resource_url_scope
+        rescue NameError
+          self
+        end -%>
+<%- url ||= url_scope.url_for(:action => 'index') -%>
 <%= form_tag(url, :method => :get) do %>
 	<div class="search_field">
 		<%= render_icon('search') %>

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for [:admin, resource_instance_variable], :remote => true do |f| %>
+<%= form_for [resource_url_scope, :admin, resource_instance_variable], :remote => true do |f| %>
 	<div id="errors" style="display: none"></div>
 	<table>
 		<%- resource_attributes.each do |attribute| -%>

data/app/views/alchemy/admin/resources/_resource.html.erb

@@ -1,7 +1,10 @@
 <tr class="<%= cycle('even', 'odd') %>">
 	<%- resource_attributes.each do |attribute| -%>
 	<%- if attribute[:type] == :boolean -%>
-	<td class="center"><%= render_icon(resource.send(attribute[:name])) -%></td>
+	<td class="center">
+		<% attr_value = resource.send(attribute[:name]) %>
+		<%= attr_value.blank? ? '' : render_icon(attr_value) -%>
+	</td>
 	<%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
 	<td class="right"><%= resource.send(attribute[:name]) -%></td>
 	<%- else -%>
@@ -9,19 +12,19 @@
 	<%- end -%>
 	<%- end -%>
 	<td class="tools">
-		<%- permitted_to?(:destroy, namespaced_resources_name.to_sym) do -%>
+		<%- permitted_to?(:destroy, resources_permission) do -%>
 		<%= link_to_confirmation_window(
 			'',
 			t("Are you sure?"),
-			send("admin_#{resource_model_name}_path", resource),
+			resource_url_scope.send("admin_#{resource_model_name}_path", resource),
 			:title => t("Delete"),
 			:class => "icon destroy"
 		) -%>
 		<%- end -%>
-		<%- permitted_to?(:edit, namespaced_resources_name.to_sym) do -%>
+		<%- permitted_to?(:edit, resources_permission) do -%>
 		<%= link_to_overlay_window(
 			'',
-			send("edit_admin_#{resource_model_name}_path", resource),
+			resource_url_scope.send("edit_admin_#{resource_model_name}_path", resource),
 			{
 				:title => t("Edit")
 			},

data/app/views/alchemy/admin/resources/_table.html.erb

@@ -20,4 +20,4 @@
 <p><%= t('Nothing found') %></p>
 <%- end -%>
 
-<%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable %>
+<%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable, :scope => resource_url_scope %>

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

@@ -5,15 +5,16 @@
 		{
 			:icon => 'create',
 			:label => label_title,
-			:url => send("new_admin_#{resource_model_name}_path"),
+			:url => resource_url_scope.send("new_admin_#{resource_model_name}_path"),
 			:title => label_title,
 			:overlay_options => {
 				:title => label_title
 			},
-			:if_permitted_to => [:new, namespaced_resources_name.to_sym]
+			:if_permitted_to => [:new, resources_permission]
 		}
 	],
-	:search => true
+	:search => true,
+	:search_url => resource_url_scope.send("admin_#{resources_name}_path")
 ) -%>
 
 <%= render 'table' %>

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

@@ -1,8 +1,9 @@
 <div class="with_padding">
 	<%- if @elements.blank? -%>
-	<p id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %>>
+	<div id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %> class="info">
+		<%= render_icon('info') %>
 		<%= t('Your trash is empty') %>
-	</p>
+	</div>
 	<%- else -%>
 	<div class="info">
 		<%= render_icon('info') %>

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

@@ -1,6 +1,6 @@
 <div id="login_box">
 	<div id="alchemy_greeting">
-		<%= image_tag("alchemy/alchemy-logo.png") %>
+		<%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
 		<h1><%= flash[:info] %></h1>
 	</div>
 	<div class="login_signup_box">
@@ -41,6 +41,7 @@
 		$('#user_screensize').val(function() {
 			return screen.width+'x'+screen.height;
 		});
+		Alchemy.ButtonObserver('#login .button');
 	});
 </script>
 <%- end -%>

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

@@ -23,14 +23,13 @@
 				<span id="overlay_text"><%= t("please_wait") %></span>
 			</div>
 		</div>
-		<div id="main_menu">
+		<div id="left_menu">
 			<div id="main_navi">
 				<%= admin_main_navigation %>
 				<%= yield(:alchemy_main_navigation) %>
 			</div>
-			<div id="main_menu_background"></div>
 			<div id="logout">
-				<%= link_to_overlay_window("<span class='module icon exit'></span><label>#{t('leave')}</label>".html_safe, alchemy.leave_admin_path, {:size => "300x140", :title => t("Leave Alchemy")}) %>
+				<%= link_to_overlay_window("<span class='module icon exit'></span><label>#{t('leave')}</label>".html_safe, alchemy.leave_admin_path, {:size => "300x105", :title => t("Leave Alchemy")}) %>
 			</div>
 		</div>
 		<div id="top_menu">
@@ -66,7 +65,7 @@
 				if ($('#flash_notices').length > 0) {
 					Alchemy.Growler.fade();
 				}
-				$('#toolbar a.please_wait, #toolbar form .button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a').click(function() {
+				$('#toolbar a.please_wait, #toolbar form .button, #toolbar form .icon_button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a, .pagination a').click(function() {
 					Alchemy.pleaseWaitOverlay();
 				});
 			});

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

@@ -9,15 +9,16 @@
 		<%= javascript_include_tag('alchemy/alchemy') %>
 	</head>
 	<body id="alchemy" class="login">
-		<div id="main_menu">
-			<div id="main_navi"></div>
-			<div id="main_menu_background"></div>
-			<div id="logout">
-				<%= link_to(alchemy.root_path) do %>
-					<span class="module icon exit"></span>
-					<label><%= t('leave') %></label>
-				<% end %>
+		<div id="left_menu">
+			<div id="main_navi">
+				<div id="logout">
+					<%= link_to(alchemy.root_path) do %>
+						<span class="module icon exit"></span>
+						<label><%= t('leave') %></label>
+					<% end %>
+				</div>
 			</div>
+			<div id="left_menu_background"></div>
 		</div>
 		<div id="main_content">
 			<%= yield %>

data/config/authorization_rules.rb

@@ -49,7 +49,6 @@ authorization do
     includes :editor
     has_permission_on :alchemy_admin_users, :to => [:manage]
     has_permission_on :alchemy_admin_languages, :to => [:manage]
-    has_permission_on :alchemy_languages, :to => [:manage]
     has_permission_on :authorization_rules, :to => :read
   end
   

data/config/locales/alchemy.de.yml

@@ -415,6 +415,7 @@ de:
     meta_keywords: "Meta Schlagwörter"
     missing_image: "Bild wird vermisst."
     modules:
+      user_sessions: "Anmeldung"
       attachments: "Dateien"
       dashboard: "Dashboard"
       pictures: "Bilder"

data/config/locales/alchemy.en.yml

@@ -265,6 +265,7 @@ en:
     meta_keywords: "Meta-Keywords"
     missing_image: "Missing image"
     modules:
+      user_sessions: "Login"
       attachments: "Files"
       dashboard: "Dashboard"
       pictures: "Images"

data/lib/alchemy/seeder.rb

@@ -47,7 +47,7 @@ module Alchemy
 				end
 				
 				if errors.blank?
-					log "Successfully seeded your database!" if notices.blank?
+					log "Successfully seeded your database!\n" if notices.blank?
 					notices.each do |note|
 						log(note, :skip)
 					end

data/lib/alchemy/version.rb

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

data/spec/integration/admin/pages_controller_spec.rb

@@ -1,85 +1,73 @@
 # Skipping on Travis-CI, because capybara-webkit does not install on travis.
 unless ENV["CI"]
 
-require 'spec_helper'
+	require 'spec_helper'
 
-describe Alchemy::Admin::PagesController, :js => true do
+	describe Alchemy::Admin::PagesController, :js => true do
 
-	describe "language tree switching" do
+		describe "language tree switching" do
 
-		context "in a multilangual environment" do
+			context "in a multilangual environment" do
 
-			before(:all) do
-				Factory.build(:admin_user).save_without_session_maintenance
-				@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
+				before(:all) do
+					Factory.build(:admin_user).save_without_session_maintenance
+					@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
-				login_to_alchemy
-				visit('/alchemy/admin/pages')
-				page.select 'Klingonian', :from => 'language'
-				within('#sitemap') { page.should have_content('Klingonian') }
-			end
+				it "one should be able to switch the language tree" do
+					login_into_alchemy
+					visit('/alchemy/admin/pages')
+					page.select 'Klingonian', :from => 'language'
+					page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
+				end
 
-			after(:all) {
-				@language.destroy
-				@klingonian_root.destroy
-				@german_root.destroy
-			}
+				after(:all) {
+					@language.destroy
+					@klingonian_root.delete
+					@german_root.delete
+				}
 
-		end
+			end
 
-		context "with no language root page" do
+			context "with no language root page" do
 
-			before(:all) do
-				Factory.build(:admin_user).save_without_session_maintenance
-				@language = Factory(:language)
-			end
+				before(:all) do
+					Factory.build(:admin_user).save_without_session_maintenance
+					@language = Factory(:language)
+				end
 
-			it "it should display the form for creating language root" do
-				login_to_alchemy
-				visit('/alchemy/admin/pages')
-				page.select 'Klingonian', :from => 'language'
-				within('#archive_all') do
+				it "it should display the form for creating language root" do
+					login_into_alchemy
+					visit('/alchemy/admin/pages')
+					page.select 'Klingonian', :from => 'language'
 					page.should have_content('This language tree does not exist')
 				end
-			end
 
-			after(:all) {
-				@language.destroy
-			}
+				after(:all) {
+					@language.destroy
+				}
 
-		end
+			end
 
-	end
+		end
 
-	describe "flush complete page cache" do
+		describe "flush complete page cache" do
 
-		before(:all) do
-			Factory.build(:admin_user).save_without_session_maintenance
-		end
+			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
+			it "should remove the cache of all pages" do
+				login_into_alchemy
+				visit '/alchemy/admin/pages'
+				click_link 'Flush page cache'
 				page.should have_content('Page cache flushed')
 			end
+
 		end
 
 	end
 
 end
-
-# We need this, because the before blocks losing its session under webkit-capybara (https://github.com/thoughtbot/capybara-webkit/issues/222)
-def login_to_alchemy
-	visit '/alchemy/admin/login'
-	fill_in('Username', :with => 'jdoe')
-	fill_in('Password', :with => 's3cr3t')
-	click_on('login')
-end
-
-end