alchemy_cms 2.1.rc6 → 2.1

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

@@ -0,0 +1,150 @@
+@import "alchemy/defaults";
+
+table {
+	border-style: none;
+	border-spacing: 0 $default-padding;
+	padding: 0;
+	font-size: inherit;
+	width: 100%;
+
+	td, th {
+		padding: $default-padding;
+	}
+
+	th {
+		text-align: left;
+		height: 22px;
+		vertical-align: top;
+	}
+}
+
+table tr td.tools {
+	width: 40px;
+	background-color: $light-gray;
+	white-space: nowrap;
+}
+
+td.input, td.label {
+	padding-top: 2px;
+	vertical-align: top;
+}
+
+td.input, td.submit, td.select {
+	text-align: right;
+	padding-right: 0;
+}
+
+td.value {
+	padding-left: 2*$default-padding;
+}
+
+td.label {
+	white-space: nowrap;
+	width: 80px;
+	padding: $default-padding 2*$default-padding 0 0;
+	line-height: 6*$default-padding;
+}
+
+td.label.mandatory:after {
+	content: '*';
+}
+
+td.heading {
+	padding: $default-padding 0;
+	font-weight: bold;
+	text-decoration: underline;
+}
+
+td.input input[type="checkbox"], td.input input[type="radio"] {
+	margin-top: 6px;
+}
+
+td.label.long {
+	width: 140px;
+}
+
+td.label.very_long {
+	width: 230px;
+}
+
+table tr td.tools a {
+	width: 19px;
+	height: 19px;
+	margin-right: 2px;
+}
+
+table tr td.tools.long {
+	width: 60px;
+}
+
+table tr td.icon {
+	background-color: $light-gray;
+	width: 20px;
+	text-align: center;
+}
+
+table.list tr:hover td {
+	background-color: #fffdef;
+}
+
+td.file_type {
+	width: 130px;
+	white-space: nowrap;
+}
+
+td.file_size {
+	width: 80px;
+}
+
+td.date {
+	width: 150px;
+}
+
+table td.right, table th.right {
+	text-align: right;
+}
+
+table td.center, table th.center {
+	text-align: center;
+}
+
+td.login {
+	width: 100px;
+}
+
+td.email {
+	width: 270px;
+}
+
+td.role {
+	width: 70px;
+	padding-right: 4px;
+}
+
+table td.rights {
+	width: 60px;
+}
+table.window_form {
+	width: 100%;
+}
+
+th.login_status {
+	width: 16px;
+}
+
+table tr.odd td {
+	background-color: #eaf3f9;
+}
+
+table tr.even td {
+	background-color: white;
+}
+
+td.label.middle {
+	padding-left: 2*$default-padding;
+}
+
+th.icon, td.icon {
+	background: none;
+	display: table-cell;
+}

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

@@ -0,0 +1,92 @@
+@import "alchemy/defaults";
+
+a#uploadswitcher, a.underline {
+	text-decoration: underline;
+}
+
+#uploadProgressContainer {
+	overflow-x: hidden;
+	overflow-y: auto;
+	height: 234px;
+}
+
+#uploadProgressContainer .progressWrapper {
+	padding: 2*$default-padding;
+	background-color: $medium-gray;
+	position: relative;
+	margin-bottom: 8px;
+	border: 1px solid #9e9e9e;
+	@include rounded-corner;
+}
+
+#uploadProgressContainer .progressName,
+#uploadProgressContainer .progressBarStatus {
+	margin-bottom: 4px;
+}
+
+#uploadProgressContainer .progressBarStatus {
+	font-size: 10px;
+}
+
+#uploadProgressContainer .progressName {
+	text-shadow: 0 1px 2px #FFFFFF;
+}
+
+#uploadProgressContainer .progressBarContainer {
+	background: #F9F9F9 image-url('alchemy/shading.png') repeat-x 0 0;
+	border:1px solid #9E9E9E;
+	@include rounded-corner;
+	height:16px;
+	overflow: hidden;
+	width:100%;
+}
+
+#uploadProgressContainer .progressBarInProgress {
+	background: #77AAD5 image-url('alchemy/shading.png') repeat-x 0 -75px;
+	height: 16px;
+	width: 0;
+}
+
+#uploadProgressContainer .progressBarComplete {
+	background: #00D827 image-url('alchemy/shading.png') repeat-x 0 -75px;
+	height: 16px;
+	width: 0;
+}
+
+#uploadProgressContainer .progressBarError {
+	background: #F00 image-url('alchemy/shading.png') repeat-x 0 -75px;
+	height: 16px;
+	width: 0;
+}
+
+#uploadProgressContainer .progressBarCanceled {
+	background: #E4E4E4 image-url('alchemy/shading.png') repeat-x 0 -75px;
+	height: 16px;
+	width: 0;
+}
+
+#uploadProgressContainer .progressCancel {
+	background: #f1f1f1 image-url('alchemy/icons.png') no-repeat -1px -72px;
+	border: 1px solid #9e9e9e;
+	@include rounded-corner;
+	width: 15px;
+	height: 16px;
+	position: absolute;
+	top: 8px;
+	right: 8px;
+}
+
+#swf_upload_container {
+	height: 60px;
+}
+
+#swf_upload_container .button {
+	float: right;
+	margin-top: 4*$default-margin;
+	font-size: 11px;
+}
+
+object.swfupload {
+	margin-top: 16px;
+	margin-bottom: 16px;
+}

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

@@ -7,7 +7,7 @@ module Alchemy
 				@clipboard_items = session[:clipboard]
 				@last_edited_pages = Page.all_last_edited_from(current_user)
 				@locked_pages = Page.all_locked
-				@online_users = User.all_online
+				@online_users = User.all_online.to_a.delete_if { |u| u == current_user }
 			end
 
 		end

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

@@ -27,7 +27,7 @@ module Alchemy
 				@root_page = Page.language_root_for(session[:language_id])
 				# Setting the locale to pages language. so the page content has its correct translation
 				::I18n.locale = @page.language_code
-				render :layout => params[:layout].blank? ? 'alchemy/pages' : params[:layout] == 'none' ? false : params[:layout]
+				render :layout => layout_for_page
 			end
 
 			def new

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

@@ -6,7 +6,20 @@ module Alchemy
 
 			before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
 
-			helper_method :resource_attributes, :resource_window_size, :resources_name, :resource_model, :resource_model_name, :resource_instance_variable, :resources_instance_variable, :namespaced_resources_name, :resource_namespaced?
+			helper_method(
+				:resource_attributes,
+				:resource_window_size,
+				:resources_name,
+				:resource_model,
+				:resource_model_name,
+				:resource_instance_variable,
+				:resources_instance_variable,
+				:namespaced_resources_name,
+				:resource_namespaced?,
+				:resources_permission,
+				:resource_url_scope,
+				:is_alchemy_module?
+			)
 
 			def index
 				if !params[:query].blank?
@@ -84,7 +97,7 @@ module Alchemy
 				if resource_namespaced?
 					@namespaced_resources_name ||= "#{resource_namespace}_#{resources_name}".underscore
 				else
-					@namespaced_resources_name ||= resource_model_name
+					@namespaced_resources_name ||= resources_name
 				end
 			end
 
@@ -129,6 +142,26 @@ module Alchemy
 				@resource_namespace ||= self.class.to_s.split("::").first
 			end
 
+			def resource_url_scope
+				if is_alchemy_module?
+					eval(alchemy_module['engine_name'])
+				else
+					main_app
+				end
+			end
+
+			def is_alchemy_module?
+				!alchemy_module.nil? && !alchemy_module['engine_name'].blank?
+			end
+
+			def alchemy_module
+				@alchemy_module ||= module_definition_for(:controller => params[:controller], :action => 'index')
+			end
+
+			def resources_permission
+				(resource_namespaced? ? "#{resource_namespace.underscore}_admin_#{resources_name}" : "admin_#{resources_name}").to_sym
+			end
+
 		end
 	end
 end

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,6 +1,8 @@
 module Alchemy
 	class UserSessionsController < Alchemy::BaseController
+
 		before_filter :check_user_count, :only => :login
+
 		layout 'alchemy/login'
 
 		helper 'Alchemy::Admin::Base'
@@ -49,6 +51,7 @@ module Alchemy
 		end
 
 		def leave
+			::I18n.locale = current_user.language.to_sym
 			render :layout => false
 		end
 

data/app/helpers/alchemy/admin/attachments_helper.rb

@@ -3,7 +3,7 @@ module Alchemy
 		module AttachmentsHelper
 
 			def mime_to_human mime
-				Alchemy::I18n.t("alchemy.mime_types.#{mime}", :default => t('document'))
+				Alchemy::I18n.t(mime, :scope => :mime_types, :default => t('document'))
 			end
 
 		end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -1,11 +1,22 @@
 module Alchemy
 	module Admin
+		
+		# This module contains helper methods for rendering overlay windows, toolbar buttons and confirmation windows.
+		# 
+		# The most important helpers for module developers are:
+		# 
+		# * toolbar
+		# * toolbar_button
+		# * link_to_overlay_window
+		# * link_to_confirmation_window
+		# 
 		module BaseHelper
 
 			# This helper renders the link for an overlay window.
+			# 
 			# We use this for our fancy modal overlay windows in the Alchemy cockpit.
 			# 
-			# Options:
+			# === Options:
 			# 
 			#   :size             [String]              # String with format of "WidthxHeight". I.E. ("420x280")
 			#   :title            [String]              # Text for the overlay title bar.
@@ -35,7 +46,7 @@ module Alchemy
 				)
 			end
 
-			# Used for rendering the folder link in Admin::Pages.index sitemap.
+			# (internal) Used for rendering the folder link in +Admin::Pages#index+ sitemap.
 			def sitemapFolderLink(page)
 				return '' if page.level == 1
 				if page.folded?(current_user.id)
@@ -94,6 +105,19 @@ module Alchemy
 				filter_field.html_safe
 			end
 
+			# Returns a link that opens a modal confirmation window.
+			# 
+			# === Parameters:
+			# 
+			# 1. The content inside the <a> tag
+			# 2. The message that is displayed in the overlay window
+			# 3. The url that gets opened after confirmation (Note: This is an Ajax request with a method of DELETE!)
+			# 4. html options get passed to the link
+			# 
+			# === Example:
+			# 
+			#   <%= link_to_confirmation_window('delete', 'Do you really want to delete this comment?', '/admin/comments/1') %>
+			# 
 			def link_to_confirmation_window(link_string = "", message = "", url = "", html_options = {})
 				title = t("please_confirm")
 				ok_lable = t("Yes")
@@ -107,9 +131,12 @@ module Alchemy
 
 			# Returns an Array build for passing it to the options_for_select helper inside an essence editor partial.
 			# Usefull for the select_values options from the render_essence_editor helpers.
-			# Options:
-			#   * :from_page (String, Page) - Return only elements from this page. You can either pass a Page instance, or a page_layout name
-			#   * :elements_with_name (Array, String) - Return only elements with this name(s).
+			# 
+			# == Options:
+			# 
+			#   :from_page            [String, Page]     # Return only elements from this page. You can either pass a Page instance, or a page_layout name
+			#   :elements_with_name   [Array, String]    # Return only elements with this name(s).
+			# 
 			def elements_for_essence_editor_select(options={})
 				defaults = {
 					:from_page => nil,
@@ -132,9 +159,13 @@ module Alchemy
 				select_options
 			end
 
-			# Returns all Pages found in the database as an array for the rails select_tag helper.
-			# You can pass a collection of pages to only returns these pages as array.
-			# Pass an Page.name or Page.id as second parameter to pass as selected for the options_for_select helper.
+			# Returns all public pages found in the database as an Array suitable or the Rails +select_tag+ helper.
+			# 
+			# * You can pass a collection of pages so it only returns these pages and does not query the database.
+			# * Pass a +Page#name+ or +Page#id+ as second parameter to be passed as selected item to the +options_for_select+ helper.
+			# * The trhird parameter is used as prompt message in the select tag
+			# * The last parameter is the method that is called on the page object to get the value that is passed with the params of the form.
+			# 
 			def pages_for_select(pages = nil, selected = nil, prompt = "", page_attribute = :id)
 				result = [[prompt.blank? ? t('Choose page') : prompt, ""]]
 				if pages.blank?
@@ -241,11 +272,12 @@ module Alchemy
 				['main_navi_entry', admin_mainnavi_active?(navigation) ? 'active' : nil].compact.join(" ")
 			end
 
+			# (internal) Checks if all options we need for the image cropper are provided
 			def necessary_options_for_cropping_provided?(options)
 				options[:crop].to_s == 'true' && !options[:image_size].blank?
 			end
 
-			# Renders translated Module Names for html title element.
+			# (internal) Renders translated Module Names for html title element.
 			def render_alchemy_title
 				if content_for?(:title)
 					title = content_for(:title)
@@ -255,7 +287,7 @@ module Alchemy
 				"Alchemy CMS - #{title}"
 			end
 
-			# Returns max image count as integer or nil. Used for the picture editor in element editor views.
+			# (internal) Returns max image count as integer or nil. Used for the picture editor in element editor views.
 			def max_image_count
 				return nil if !@options
 				if @options[:maximum_amount_of_images].blank?
@@ -270,6 +302,7 @@ module Alchemy
 				end
 			end
 
+			# (internal) Renders a select tag for all items in the clipboard
 			def clipboard_select_tag(items, html_options = {})
 				options = [[t('Please choose'), ""]]
 				items.each do |item|
@@ -287,7 +320,7 @@ module Alchemy
 
 			# Renders a toolbar button for the Alchemy toolbar
 			# 
-			# Options:
+			# == Options:
 			# 
 			#   :icon                   [String]              # Icon class. See base.css.sccs for available icons, or make your own.
 			#   :label                  [String]              # Text for button label.
@@ -304,7 +337,8 @@ module Alchemy
 					:overlay => true,
 					:skip_permission_check => false,
 					:active => false,
-					:link_options => {}
+					:link_options => {},
+					:overlay_options => {}
 				}
 				options = defaults.merge(options)
 				button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
@@ -340,12 +374,12 @@ module Alchemy
 				end
 			end
 
-			# Renders the alchemy backend toolbar
+			# Renders the Alchemy backend toolbar
 			# 
-			# Options are:
+			# == Options
 			# 
-			#   buttons [Array]         # Pass an Array with button options. They will be passed to toolbar_button helper. For options see +toolbar_button+
-			#   search [Boolean]        # Show searchfield. Default true.
+			#   :buttons  [Array]          # Pass an Array with button options. They will be passed to toolbar_button helper. For options see toolbar_button
+			#   :search   [Boolean]        # Show searchfield. Default true.
 			# 
 			def toolbar(options = {})
 				defaults = {
@@ -362,16 +396,31 @@ module Alchemy
 				end
 			end
 
-			# Renders the partial for a resource record in the resources table.
-			# This helper has a nice fallback. If your resource has a partial for a single record named like the resouce model name (i.e. language) then this partial will be rendered.
-			# Otherwise the resource parital from +resources/resource+
+			# Renders the row for a resource record in the resources table.
+			# 
+			# This helper has a nice fallback. If you create a partial for your record then this partial will be rendered.
+			# 
+			# Otherwise the default +app/views/alchemy/admin/resources/_resource.html.erb+ partial gets rendered.
+			# 
+			# == Example
+			# 
+			# For a resource named +Comment+ you can create a partial named +_comment.html.erb+
+			# 
+			#   # app/views/admin/comments/_comment.html.erb
+			#   <tr>
+			#     <td><%= comment.title %></td>
+			#     <td><%= comment.body %></td>
+			#   </tr>
+			# 
+			# NOTE: Alchemy gives you a local variable named like your resource
+			# 
 			def render_resources
 				render resources_instance_variable
 			rescue ActionView::MissingTemplate
 				render :partial => 'resource', :collection => resources_instance_variable
 			end
 
-			# Used by upload form
+			# (internal) Used by upload form
 			def new_asset_path_with_session_information(asset_type)
 				session_key = Rails.application.config.session_options[:key]
 				if asset_type == "picture"