alchemy_cms 2.0.7 → 2.1.beta1

data/app/views/admin/languages/destroy.js.erb

@@ -0,0 +1 @@
+window.location.replace('<%= admin_languages_url %>');

data/app/views/admin/pages/_page.html.erb

@@ -31,7 +31,7 @@
         configure_admin_page_path(page),
         {
           :title => _('edit_page_properties'),
-          :size => page.redirects_to_external? ? '390x270' : '380x600'
+          :size => page.redirects_to_external? ? '390x270' : '390x580'
         },
         :class => '',
         :title => _('edit_page_properties')

data/app/views/admin/pages/_sitemap.html.erb

@@ -31,7 +31,7 @@
 					configure_admin_page_path(@page_root),
 					{
 						:title => _('edit_page_properties'),
-						:size => @page_root.redirects_to_external? ? '390x270' : '380x600'
+						:size => @page_root.redirects_to_external? ? '390x270' : '390x580'
 					},
 					:class => '',
 					:title => _('edit_page_properties')

data/app/views/admin/pages/edit.html.erb

@@ -1,7 +1,7 @@
 <%- alchemy_combined_assets -%>
 
 <%- content_for(:javascript_includes) do -%>
-	<%= tinymce_hammer_javascript_tags %>
+<%= tinymce_javascript_tags %>
 <%- end -%>
 <%- content_for(:subnav_additions) do -%>
     <%- Page.all_locked_by(current_user).each do |page| -%>
@@ -59,7 +59,7 @@
 				configure_admin_page_path(@page),
 				{
 					:title => _('edit_page_properties'),
-					:size => @page.layoutpage? ? '340x150' : '380x600'
+					:size => @page.layoutpage? ? '340x150' : '390x580'
 				},
 				:class => 'icon_button',
 				:title => _('edit_page_properties')

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

@@ -2,7 +2,7 @@
 	
 	Alchemy.closeCurrentWindow();
 
-	<%- if request.referer.include?('edit') -%>
+	<%- if @while_page_edit -%>
 	
 		Alchemy.reloadPreview();
 		$('#<%= dom_id(@page) -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');

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

@@ -70,21 +70,21 @@
 <script type='text/javascript'>
 	try {
 		var settings = {
-			flash_url : "/javascripts/alchemy/swfupload/swfupload.swf",
-			flash9_url : "/javascripts/alchemy/swfupload/swfupload.swf",
+			flash_url: "<%= asset_path("swfupload/swfupload.swf") %>",
+			flash9_url: "<%= asset_path("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] || 100 -%> MB",
-			file_types : '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
-			file_types_description : "<%= file_types_description %>",
-			file_upload_limit : <%= configuration(:uploader)[:upload_limit] || 50 -%>,
-			file_queue_limit : 0,
-			custom_settings : {
-				progressTarget : "uploadProgressContainer",
-				cancelButtonId : "btnCancel"
+			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] || 50 -%>,
+			file_queue_limit: 0,
+			custom_settings: {
+				progressTarget: "uploadProgressContainer",
+				cancelButtonId: "btnCancel"
 			},
 			debug: false,
-			button_image_url: "/images/alchemy/swfupload/browse_button.png",
+			button_image_url: "<%= image_path("alchemy/swfupload/browse_button.png") %>",
 			button_width: "120",
 			button_height: "25",
 			button_placeholder_id: "spanButtonPlaceHolder",

data/app/views/admin/pictures/archive_overlay.js.erb

@@ -0,0 +1 @@
+jQuery('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) %>');

data/app/views/admin/pictures/flush.js.erb

@@ -0,0 +1,2 @@
+Alchemy.growl('<%= @notice %>');
+Alchemy.pleaseWaitOverlay(false);

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

@@ -0,0 +1 @@
+Alchemy.growl('<%= @message %>');

data/app/views/admin/trash/clear.js.erb

@@ -0,0 +1,3 @@
+Alchemy.growl('<%= _("Cleared trash") %>');
+Alchemy.refreshTrashWindow(<%= @page.id %>);
+jQuery('#element_trash_button .icon').removeClass('full');

data/app/views/alchemy/error_notice.js.erb

@@ -0,0 +1 @@
+Alchemy.growl('<%= escape_javascript(@notice) %>', 'error')

data/app/views/alchemy/permission_denied.js.erb

@@ -0,0 +1,2 @@
+Alchemy.closeCurrentWindow();
+window.location.replace('<%= login_path %>');

data/app/views/alchemy/redirect.js.erb

@@ -0,0 +1 @@
+window.location.replace('<%= url_for(@redirect_url) %>');

data/app/views/alchemy/remote_errors.js.erb

@@ -0,0 +1,3 @@
+jQuery('#errors').html('<%= escape_javascript(@errors) %>');
+jQuery('#errors').show();
+Alchemy.enableButton('<%= @button || "form button.button" %>');

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

@@ -0,0 +1,5 @@
+Alchemy.closeCurrentWindow();
+<%- unless flash[:notice].blank? -%>
+	Alchemy.growl('<%= flash[:notice] -%>');
+<%- end -%>
+Alchemy.reloadPreview();

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

@@ -28,7 +28,6 @@
 			<%= content.ingredient.name rescue ("&#x2190;" + _('assign_file_from_archive')).html_safe %>
 		</div>
 		<%- unless content.ingredient.nil? -%>
-		<%= hidden_field_tag content.form_field_name, content.ingredient.id %>
 		<div class="essence_file_tools">
 			<%= link_to_overlay_window("",
 				admin_attachments_path(

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

@@ -1,10 +1,6 @@
 <%= link_to(
 	h(content.essence.attachment.name),
-	download_attachment_path(
-		:id => content.essence.attachment.id,
-		:name => content.essence.attachment.urlname,
-		:format => content.essence.attachment.suffix
-	),
+	download_attachment_path(:id => content.essence.attachment.id, :name => content.essence.attachment.filename),
 	:class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
 	:title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
 ) if content.essence.attachment %>

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

@@ -6,7 +6,7 @@
     :title => _('Edit Picturemask')
   },
   {
-    :class => necessary_options_for_cropping_provided?(options) ? nil : 'disabled',
+    :class => necessary_options_for_cropping_provided?(options) && content.ingredient ? nil : 'disabled',
     :title => _('Edit Picturemask')
   }
 ) %>

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

@@ -5,27 +5,22 @@
 		<meta http-equiv="content-language" content="<%= current_user.language.blank? ? 'de' : current_user.language rescue 'de' %>">
 		<title><%= render_alchemy_title %></title>
 		<%= csrf_meta_tag %>
-		<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/plugin_assets/stylesheets/ie6.css" /><![endif]-->
 		<%= yield :stylesheets %>
 		<%= yield :javascript_includes %>
 		<script type="text/javascript" charset="utf-8">
-		// <![CDATA[
-		if(typeof(jQuery)=='function') {
-			jQuery.noConflict();
-		}
-		// ]]>
+			if (typeof(jQuery) === 'function') {
+				jQuery.noConflict();
+			}
 		</script>
 	</head>
-	
+
 	<body id="alchemy">
-		<%#= overlay for indication of loading %>
 		<div id="overlay">
 			<div id="overlay_text_box">
 				<%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
 				<span id="overlay_text"><%= _("please_wait") %></span>
 			</div>
 		</div>
-		<%#= overlay end %>
 		<div id="main_menu">
 			<div id="main_navi">
 				<%= yield(:navigation) %>
@@ -55,5 +50,23 @@
 			<%= yield %>
 		</div>
 		<%= yield(:javascripts) %>
+		<script type="text/javascript" charset="utf-8">
+			jQuery(document).ready(function ($) {
+				Alchemy.resizeFrame();
+				Alchemy.Tooltips();
+				if (typeof(jQuery().sb) === 'function') {
+					Alchemy.SelectBox('body#alchemy select');
+				}
+				if ($('#flash_notices').length > 0) {
+					Alchemy.Growler.fade();
+				}
+				$('#alchemy a.icon_button.please_wait_overlay').click(function() {
+					Alchemy.pleaseWaitOverlay();
+				});
+			});
+			jQuery(window).resize(function() {
+				Alchemy.resizeFrame();
+			});
+		</script>
 	</body>
 </html>

data/app/views/pages/show.rss.builder

@@ -11,7 +11,7 @@ xml.rss :version => "2.0" do
 			xml.item do
 				xml.title element.content_for_rss_title.ingredient
 				xml.description element.content_for_rss_description.ingredient
-				xml.pubDate render_essence_view_by_name(element, 'date', :date_format => :rfc822)
+				xml.pubDate element.ingredient('date').to_s(:rfc822) if element.has_ingredient?('date')
 				xml.link show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
 				xml.guid show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
 			end

data/config/alchemy/elements.yml

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

data/config/alchemy/page_layouts.yml

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

data/config/asset_packages.yml

@@ -1,32 +1,30 @@
 --- 
 javascripts:
-- combined:
-  - alchemy/jquery
-  - alchemy/jquery-ui
-  - alchemy/jquery.rails
-  - alchemy/jquery.dialogextend.min
-  - alchemy/jquery.in-place-edit.js
-  - alchemy/jquery.Jcrop.min
-  - alchemy/jquery.sb.min
-  - alchemy/jquery.scrollTo-1.4.2-min
-  - alchemy/jquery.ui.nestedSortable
-  - alchemy/jquery.ui.tabspaging
-  - alchemy/alchemy
+  - jquery-1.6.2.min
+  - jquery-ui-custom-1.8.16.min
+  - jquery_ujs
+  - jquery_plugins/jquery.dialogextend.min.js
+  - jquery_plugins/jquery.in-place-edit.js
+  - jquery_plugins/jquery.Jcrop.min.js
+  - jquery_plugins/jquery.sb.min.js
+  - jquery_plugins/jquery.scrollTo-1.4.2-min.js
+  - jquery_plugins/jquery.ui.nestedSortable.js
+  - jquery_plugins/jquery.ui.tabspaging.js
+  - alchemy/alchemy.base
   - alchemy/alchemy.element_editor_selector
   - alchemy/alchemy.image_cropper
   - alchemy/alchemy.link_overlay
   - alchemy/alchemy.page_sorter
   - alchemy/alchemy.growler
-  - alchemy/swfupload/swfupload
-  - alchemy/swfupload/queue
-  - alchemy/swfupload/handlers
-  - alchemy/swfupload/fileprogress
+  - swfupload/swfupload
+  - swfupload/queue
+  - swfupload/handlers
+  - swfupload/fileprogress
 
 stylesheets:
-- combined:
-  - alchemy/alchemy
+  - alchemy/base
   - alchemy/elements
   - alchemy/flags
-  - alchemy/jquery-ui-1.8.7.alchemy.css
+  - alchemy/jquery-ui.alchemy
   - alchemy/jquery.Jcrop
   - alchemy/jquery.sb

data/config/authorization_rules.rb

@@ -1,6 +1,7 @@
 authorization do
   
   role :guest do
+    has_permission_on :admin_manual_chapters, :to => [:publish]
     has_permission_on :pages, :to => [:show] do
       if_attribute :public => true, :restricted => false
     end

data/config/locales/de.yml

@@ -70,7 +70,6 @@ de:
       news_headline: "News Überschrift"
       image_mosaic:
         caption: "Mosaik Bildunterschrift"
-      file: Datei
     
     content_validations:
       errors:

data/config/routes.rb

@@ -14,7 +14,7 @@ Rails.application.routes.draw do
     :as => :leave_admin
   match '/admin/logout' => 'admin#logout',
     :as => :logout
-  match '/attachment/:id/download(/:name)(.:format)' => 'attachments#download',
+  match '/attachment/:id/download(/:name)(.:suffix)' => 'attachments#download',
     :as => :download_attachment
   match '/attachment/:id/show' => 'attachments#show',
     :as => :show_attachment

data/lib/alchemy/tinymce.rb

@@ -0,0 +1,51 @@
+module Alchemy
+	module Tinymce
+
+		mattr_accessor :languages, :themes, :plugins, :setup
+
+		@@setup = nil
+
+		@@plugins = %w(autoresize paste fullscreen inlinepopups alchemy_link)
+
+		@@languages = ['en', 'de']
+
+		@@themes = ['advanced']
+
+		@@init = {
+			:paste_convert_headers_to_strong => true,
+			:paste_convert_middot_lists => true,
+			:paste_remove_spans => true,
+			:paste_remove_styles => true,
+			:paste_strip_class_attributes => true,
+			:theme => 'advanced',
+			:skin => 'o2k7',
+			:skin_variant => 'silver',
+			:inlinepopups_skin => 'alchemy',
+			:popup_css => "/assets/alchemy/tinymce_dialog.css",
+			:content_css => "/assets/alchemy/tinymce_content.css",
+			:dialog_type => "modal",
+			:width => "100%",
+			:theme_advanced_resizing => true,
+			:theme_advanced_resize_horizontal => false,
+			:theme_advanced_resizing_min_height => '135',
+			:theme_advanced_toolbar_align => 'left',
+			:theme_advanced_toolbar_location => 'top',
+			:theme_advanced_statusbar_location => 'bottom',
+			:theme_advanced_buttons1 => 'bold,italic,underline,strikethrough,sub,sup,|,numlist,bullist,indent,outdent,|,alchemy_link,unlink,|,removeformat,cleanup,|,fullscreen',
+			:theme_advanced_buttons2 => 'pastetext,pasteword,charmap,code,help',
+			:theme_advanced_buttons3 => '',
+			:fix_list_elements => true,
+			:convert_urls => false,
+			:entity_encoding => "raw"
+		}
+
+		def self.init= js
+		  @@init = js
+		end
+
+		def self.init
+			@@init
+		end
+
+	end
+end

data/lib/alchemy/version.rb

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

data/lib/alchemy_cms.rb

@@ -6,7 +6,9 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'dynamic_form'
   require 'fleximage'
   require 'gettext_i18n_rails'
-  require 'tinymce_hammer'
+	if Rails.version >= '3.1'
+		require 'jquery-rails'
+	end
   require 'userstamp'
   require 'will_paginate'
   require 'yaml'
@@ -15,7 +17,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'extensions/action_view'
   require 'alchemy/version'
   require 'alchemy/engine'
-  %w(config essence page_layout controller remote_pagination_link_renderer).each do |class_name|
+  %w(config essence page_layout controller remote_pagination_link_renderer tinymce).each do |class_name|
     require File.join(File.dirname(__FILE__), "alchemy", class_name)
   end
   require File.join(File.dirname(__FILE__), "alchemy", "seeder")

data/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../spec/dummy/script/rails',  __FILE__)

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -4,41 +4,43 @@ describe Admin::ClipboardController do
 
 	before(:each) do
 		activate_authlogic
-		UserSession.create FactoryGirl.create(:admin_user)
+    user = Factory(:admin_user)
+    user.save_without_session_maintenance
+		UserSession.create user
 	end
 
   context "clipboard" do
 
     it "should hold element ids" do
-			@page = FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
-		  @element = FactoryGirl.create(:element, :page => @page)
-		  @another_element = FactoryGirl.create(:element, :page => @page)
+			@page = Factory(:page, :parent_id => Page.rootpage.id)
+		  @element = Factory(:element, :page => @page)
+		  @another_element = Factory(:element, :page => @page)
 			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}] }
 			post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}]
+			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id.to_s, :action => 'copy'}]
     end
 
     it "should not have the same element twice" do
-			@page = FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
-		  @element = FactoryGirl.create(:element, :page => @page)
+			@page = Factory(:page, :parent_id => Page.rootpage.id)
+		  @element = Factory(:element, :page => @page)
 			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}] }
 			post(:insert, {:remarkable_type => 'element', :remarkable_id => @element.id, :format => :js})
 			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}]
     end
 
     it "should remove element ids" do
-			@page = FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
-		  @element = FactoryGirl.create(:element, :page => @page)
-		  @another_element = FactoryGirl.create(:element, :page => @page)
+			@page = Factory(:page, :parent_id => Page.rootpage.id)
+		  @element = Factory(:element, :page => @page)
+		  @another_element = Factory(:element, :page => @page)
 			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}] }
 			delete(:remove, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
 			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}]
     end
 
     it "should be clearable" do
-			@page = FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
-		  @element = FactoryGirl.create(:element, :page => @page)
-		  @another_element = FactoryGirl.create(:element, :page => @page)
+			@page = Factory(:page, :parent_id => Page.rootpage.id)
+		  @element = Factory(:element, :page => @page)
+		  @another_element = Factory(:element, :page => @page)
 			session[:clipboard] = { :elements => [@element.id, @another_element.id] }
 			delete(:clear, :format => :js)
 			session[:clipboard].should == {}