alchemy_cms 2.0.7 → 2.1.beta1

data/app/controllers/pages_controller.rb

@@ -5,29 +5,26 @@ class PagesController < AlchemyController
 
   filter_access_to :show, :attribute_check => true
 
-	caches_action(
-		:show,
-		:cache_path => proc { url_for(:action => :show, :urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
-		:if => proc {
-			if Alchemy::Config.get(:cache_pages)
-				page = Page.find_by_urlname_and_language_id_and_public(
-					params[:urlname],
-					session[:language_id],
-					true,
-					:select => 'page_layout, language_id, urlname'
-				)
-				if page
-					pagelayout = PageLayout.get(page.page_layout)
-					pagelayout['cache'].nil? || pagelayout['cache']
-				end
-			else
-				false
-			end
-		},
-		:layout => false
-	)
-
-	layout :layout_for_page
+  caches_action(
+    :show,
+    :cache_path => proc { url_for(:action => :show, :urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
+    :if => proc do
+      if Alchemy::Config.get(:cache_pages)
+        page = Page.find_by_urlname_and_language_id_and_public(
+          params[:urlname],
+          session[:language_id],
+          true,
+          :select => 'page_layout, language_id, urlname'
+        )
+        if page
+          pagelayout = Alchemy::PageLayout.get(page.page_layout)
+          pagelayout['cache'].nil? || pagelayout['cache']
+        end
+      else
+        false
+      end
+    end
+  )
 
 	# Showing page from params[:urlname]
 	# @page is fetched via before filter
@@ -40,7 +37,7 @@ class PagesController < AlchemyController
 		end
 		respond_to do |format|
 			format.html {
-				render
+				render :layout => params[:layout].blank? ? 'pages' : params[:layout] == 'none' ? false : params[:layout]
 			}
 			format.rss {
 				if @page.contains_feed?

data/app/helpers/admin/elements_helper.rb

@@ -104,4 +104,9 @@ module Admin::ElementsHelper
 		end
 	end
 
+	def tinymce_tag(name, content = '', options = {})
+		append_class_name(options, 'tinymce')
+		text_area_tag(name, content, options)
+	end
+
 end

data/app/helpers/admin/pages_helper.rb

@@ -1,3 +1,38 @@
 module Admin::PagesHelper
 
-end
+	def tinymce_javascript_tags
+		init = Alchemy::Tinymce.init
+		if init.is_a?(Hash)
+			init = HashWithIndifferentAccess.new(init)
+			init = init.keys.sort.collect(&:to_s).sort.collect do |key|
+				[key, init[key]]
+			end
+		end
+		init = init.collect { |key, value| "#{key} : #{value.to_json}" }.join(', ')
+		
+		setup = "init.setup = #{Alchemy::Tinymce.setup};" if Alchemy::Tinymce.setup
+		return "
+<script src='/assets/tiny_mce/jquery.tinymce.js' type='text/javascript'></script>
+<script type='text/javascript'>
+	jQuery(function($){
+		if (typeof(Alchemy) !== 'object') { Alchemy = {}; };
+		Alchemy.Tinymce = {
+			init : function() {
+				var init = { #{init} };
+				init.script_url = '/assets/tiny_mce/tiny_mce.js';
+				init.plugins = '#{Alchemy::Tinymce.plugins.join(',')}';
+				init.language = '#{I18n.locale}';
+				#{setup}
+				$('textarea.tinymce').tinymce(init);
+			},
+			addEditor : function(dom_id) {
+				tinyMCE.execCommand('mceAddControl', true, dom_id);
+			}
+		};
+		console.log('hello', Alchemy.Tinymce);
+		Alchemy.Tinymce.init();
+	});
+</script>".html_safe
+	end
+
+end

data/app/helpers/alchemy_helper.rb

@@ -258,23 +258,36 @@ module AlchemyHelper
     end
   end
 
-  # Helper for including the nescessary javascripts and stylesheets for the different views.
-  # Together with the rails caching we achieve a good load time.
-  def alchemy_assets_set(setname = 'combined')
-    asset_sets = YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'config/asset_packages.yml'))
-    content_for(:javascript_includes) do 
-      js_set = asset_sets['javascripts'].detect { |js| js[setname.to_s] }[setname.to_s]
-      javascript_include_tag(js_set, :cache => 'alchemy/' + setname.to_s)
-    end
-    css_set = asset_sets['stylesheets'].detect { |css| css[setname.to_s] }[setname.to_s]
-    content_for(:stylesheets) do
-      stylesheet_link_tag(css_set, :cache => 'alchemy/' + setname.to_s, :media => 'screen')
-    end
-    content_for(:stylesheets) do
-      print_set = css_set.clone << 'alchemy/print'
-      stylesheet_link_tag(print_set, :cache => 'alchemy/' + setname.to_s + '-print', :media => 'print')
-    end
-  end
+	# Helper for including all nescessary javascripts and stylesheets.
+	# Under Rails 3.1 it uses the asset pipeline.
+	# Under Rails 3.0.x we use caching to combine the files into one big asset file.
+	def alchemy_assets_set
+		asset_sets = YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'config/asset_packages.yml'))
+		if Rails.version >= '3.1'
+			content_for(:javascript_includes) do
+				javascript_include_tag('alchemy/alchemy')
+			end
+			content_for(:stylesheets) do
+				stylesheet_link_tag('alchemy/alchemy', :media => 'screen')
+			end
+			content_for(:stylesheets) do
+				stylesheet_link_tag('alchemy/print', :media => 'print')
+			end
+		else
+			content_for(:javascript_includes) do 
+				js_set = asset_sets['javascripts'].detect { |js| js[setname.to_s] }[setname.to_s]
+				javascript_include_tag(js_set, :cache => 'alchemy/' + setname.to_s)
+			end
+			css_set = asset_sets['stylesheets'].detect { |css| css[setname.to_s] }[setname.to_s]
+			content_for(:stylesheets) do
+				stylesheet_link_tag(css_set, :cache => 'alchemy/' + setname.to_s, :media => 'screen')
+			end
+			content_for(:stylesheets) do
+				print_set = css_set.clone << 'alchemy/print'
+				stylesheet_link_tag(print_set, :cache => 'alchemy/' + setname.to_s + '-print', :media => 'print')
+			end
+		end
+	end
 
   def parse_sitemap_name(page)
     if multi_language?
@@ -354,4 +367,13 @@ module AlchemyHelper
     )
   end
 
+	# Taken from tinymce_hammer plugin
+	def append_class_name options, class_name #:nodoc:
+		key = options.has_key?('class') ? 'class' : :class 
+		unless options[key].to_s =~ /(^|\s+)#{class_name}(\s+|$)/
+			options[key] = "#{options[key]} #{class_name}".strip
+		end
+		options
+	end
+
 end

data/app/models/attachment.rb

@@ -9,8 +9,8 @@ class Attachment < ActiveRecord::Base
   )
   validates_as_attachment
 
-  def urlname
-    CGI.escape(read_attribute(:filename).split('.').first)
+  def name
+    read_attribute(:name).split('.').first
   end
 
   def extension

data/app/models/essence_file.rb

@@ -10,7 +10,7 @@ class EssenceFile < ActiveRecord::Base
   # Saves the ingredient
   def save_ingredient(params, options = {})
     return true if params.blank?
-    self.attachment_id = params["attachment"].to_s
+    self.attachment_id = params["attachment_id"].to_s
     self.save
   end
 

data/app/models/page.rb

@@ -181,7 +181,7 @@ class Page < ActiveRecord::Base
   def lock(user)
     self.locked = true
     self.locked_by = user.id
-    self.save(false)
+    self.save(:validate => false)
   end
 
   def unlock

data/app/sweepers/pages_sweeper.rb

@@ -34,4 +34,14 @@ private
     end
   end
 
+  def expire_page(page)
+    return if page.do_not_sweep
+    expire_action(
+      :controller => '/pages',
+      :action => :show,
+      :urlname => page.urlname_was,
+      :lang => multi_language? ? page.language_code : nil
+    )
+  end
+
 end

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

@@ -0,0 +1,4 @@
+window.location.replace('<%= admin_attachments_url(
+	:per_page => params[:per_page],
+	:page => params[:page],
+	:query => params[:query]) %>');

data/app/views/admin/clipboard/insert.js.erb

@@ -1,21 +1,14 @@
 (function($) {
-
-<% if params[:remove] %>
-
-	$(".element_editor[data-element-id='<%= @item.id -%>']").remove();
-
-	<% if @item.class.to_s == 'Element' %>
-		$('#element_area').sortable('refresh');
-	<% end %>
-
-	Alchemy.growl('<%= escape_javascript(_("item %{name} moved to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name}) -%>');
-
-<% else %>
-
-	Alchemy.growl('<%= escape_javascript(_("item %{name} copied to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name}) -%>')
-
-<% end %>
-
-	$('#clipboard_button .icon.clipboard').addClass('full');
-
+  
+<%- if params[:remove] -%>
+  $("#<%= @item.class.to_s.downcase -%>_<%= @item.id -%>").remove();
+  <%- if @item.class.to_s == 'Element' -%>
+  $('#element_area').sortable('refresh');
+  <%- end -%>
+  Alchemy.growl('<%= _("item %{name} moved to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name} -%>');
+<%- else -%>
+  Alchemy.growl('<%= _("item %{name} copied to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name} -%>')
+<%- end -%>
+  $('#clipboard_button .icon.clipboard').addClass('full');
+  
 })(jQuery);

data/app/views/admin/contents/create.js.erb

@@ -81,7 +81,7 @@
 
   <%- end -%>
 
-  TinymceHammer.addEditor('contents_content_<%= @content.id -%>_body');
+  Alchemy.Tinymce.addEditor('contents_content_<%= @content.id -%>_body');
 
 <%- else -%>
 

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

@@ -0,0 +1,7 @@
+(function($) {
+	
+	$('<%= @content_dom_id %>').remove();
+	Alchemy.growl('<%= escape_javascript(@notice) %>');
+	Alchemy.reloadPreview();
+	
+})(jQuery);

data/app/views/admin/contents/order.js.erb

@@ -0,0 +1,6 @@
+Alchemy.growl('<%= escape_javascript(@notice) %>');
+Alchemy.SortableContents(
+	'#element_area .picture_gallery_images',
+	'<%= form_authenticity_token %>'
+);
+Alchemy.reloadPreview();

data/app/views/admin/elements/_element.html.erb

@@ -4,8 +4,10 @@
     <%= form_for(
       [:admin, element],
       :remote => true,
-      :onsubmit => "Alchemy.saveElement(this)",
-      :id => "element_#{element.id}_form"
+      :html => {
+				:onsubmit => "Alchemy.saveElement(this)",
+      	:id => "element_#{element.id}_form"
+			}
     ) do %>
       <div id="element_<%= element.id %>_errors" class="element_errors" style="display: none"></div>
       <div id="element_<%= element.id %>_content" class="element_content">

data/app/views/admin/elements/create.js.erb

@@ -1,31 +1,24 @@
 (function($) {
+  
+  <%- if @page.can_have_cells? -%>
+  Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? _("other Elements") : @cell.name_for_label -%>');
+  <%- end -%>
+  $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
+  $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
+  Alchemy.growl('<%= _("successfully_added_element") -%>');
+  Alchemy.closeCurrentWindow();
+  <%- @element.rtf_contents.each do |content| -%>
+  Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
+  <%- end -%>
+  Alchemy.PreviewWindow.refresh();
+  Alchemy.ElementEditorSelector.init();
+  $('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
+  Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
+  Alchemy.SelectBox('#element_<%= @element.id -%> select');
+  Alchemy.ButtonObserver('#element_<%= @element.id -%> button.button');
 
-	<% if @cutted_element_id %>
-		$('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
-	<% end %>
-
-	<%- if @page.can_have_cells? -%>
-		Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? _("other Elements") : @cell.name_for_label -%>');
-	<%- end -%>
-
-	$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
-	$('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
-	Alchemy.growl('<%= _("successfully_added_element") -%>');
-	Alchemy.closeCurrentWindow();
-
-	<%- @element.rtf_contents.each do |content| -%>
-		TinymceHammer.addEditor('<%= content.form_field_id -%>');
-	<%- end -%>
-
-	Alchemy.PreviewWindow.refresh();
-	Alchemy.ElementEditorSelector.init();
-	$('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
-	Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
-	Alchemy.SelectBox('#element_<%= @element.id -%> select');
-	Alchemy.ButtonObserver('#element_<%= @element.id -%> button.button');
-
-	<%- if @clipboard.blank? -%>
-		$('#clipboard_button .icon.clipboard').removeClass('full');
+  <%- if @clipboard.blank? -%>
+	$('#clipboard_button .icon.clipboard').removeClass('full');
 	<%- end -%>
 
 })(jQuery);

data/app/views/admin/elements/fold.js.erb

@@ -28,7 +28,7 @@
     Alchemy.SelectBox('#element_<%= @element.id -%> select');
     
     <%- @element.rtf_contents.each do |content| -%>
-    TinymceHammer.addEditor('<%= content.form_field_id -%>');
+    Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');
     <%- end -%>
     
     Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');

data/app/views/admin/elements/index.html.erb

@@ -26,7 +26,7 @@
   Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
   Alchemy.ElementEditorSelector.init();
   Alchemy.SelectBox('.element_editor select');
-  TinymceHammer.init();
+  Alchemy.Tinymce.init();
   Alchemy.ElementDirtyObserver('#element_area');
   jQuery('#cells').tabs();
   jQuery('#cells').tabs('paging', { follow: true, followOnSelect: true } );

data/app/views/admin/essence_files/assign.js.erb

@@ -0,0 +1,8 @@
+(function($) {
+	
+	$('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "essences/essence_file_editor.html.erb", :locals => {:content => @content, :options => @options})) %>');
+	Alchemy.closeCurrentWindow();
+	Alchemy.reloadPreview();
+	Alchemy.setElementDirty('#element_<%= @content.element.id %>');
+	
+})(jQuery);

data/app/views/admin/essence_pictures/save_link.js.erb

@@ -0,0 +1,3 @@
+Alchemy.closeCurrentWindow();
+Alchemy.reloadPreview();
+Alchemy.growl('<%= @notice %>');

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

@@ -61,32 +61,42 @@
 	<div id="sideboard">
 		<%= image_tag("alchemy/alchemy-logo.png") %>
 		<p><%= _("Version") %>: <%= @alchemy_version %></p>
-		<p><%= _('Alchemy is open software and itself uses open software and free resources:') %></p>
-		<ul>
-			<li>
-				<a href="http://rubyonrails.org" target="_blank">RubyOnRails</a>
-			</li>
-			<li>
-				<a href="http://jquery.com" target="_blank">jQuery Javascript Library</a>
-			</li>
-			<li>
-				<a href="http://jqueryui.com" target="_blank">jQuery UI Javascript GUI Library</a>
-			</li>
-			<li>
-				<a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE - Javascript WYSIWYG Editor</a>
-			</li>
-			<li>
-				<a href="http://swfupload.org" target="_blank">SWFUpload</a>
-			</li>
-			<li>
-				<a href="http://p.yusukekamiyamane.com" target="_blank">Fugue Icons by Yusuke Kamiyamane</a>
-			</li>
-		</ul>
-		<h2>
-			<%= link_to_function(
-				_('Read the License'),
-				"Alchemy.openLicencseWindow()"
-			) %>
-		</h2>
+		<div class="sideboard_body" style="display: none">
+			<p><%= _('Alchemy is open software and itself uses open software and free resources:') %></p>
+			<ul>
+				<li>
+					<a href="http://rubyonrails.org" target="_blank">RubyOnRails</a>
+				</li>
+				<li>
+					<a href="http://jquery.com" target="_blank">jQuery Javascript Library</a>
+				</li>
+				<li>
+					<a href="http://jqueryui.com" target="_blank">jQuery UI Javascript GUI Library</a>
+				</li>
+				<li>
+					<a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE - Javascript WYSIWYG Editor</a>
+				</li>
+				<li>
+					<a href="http://swfupload.org" target="_blank">SWFUpload</a>
+				</li>
+				<li>
+					<a href="http://p.yusukekamiyamane.com" target="_blank">Fugue Icons by Yusuke Kamiyamane</a>
+				</li>
+			</ul>
+		</div>
 	</div>
 </div>
+<%= content_for :javascripts do %>
+<script type="text/javascript" charset="utf-8">
+	(function($) {
+		
+		$('#sideboard img:first-child').click(function(e) {
+			e.preventDefault();
+			$('#sideboard .sideboard_body').toggle();
+		}).bind('mouseover', function() {
+			$(this).css({cursor: 'pointer'});
+		});
+		
+	})(jQuery);
+</script>
+<% end %>