alchemy_cms 2.2.rc14 → 2.2.rc15

data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee

@@ -0,0 +1,11 @@
+if typeof window.Alchemy == 'undefined'
+  window.Alchemy = {}
+
+Alchemy.GUI =
+
+  initElement: ($el) ->
+    Alchemy.ElementDirtyObserver($el)
+    Alchemy.SelectBox('select', $el)
+    Alchemy.ButtonObserver('button.button', $el)
+    Alchemy.Datepicker('input[type="date"]', $el)
+    Alchemy.overlayObserver($el)

data/app/assets/javascripts/alchemy/alchemy.js

@@ -14,11 +14,12 @@
 //= require alchemy/alchemy.dragndrop
 //= require alchemy/alchemy.element_editor_selector
 //= require alchemy/alchemy.growler
+//= require alchemy/alchemy.gui
 //= require alchemy/alchemy.image_cropper
 //= require alchemy/alchemy.js_extensions
 //= require alchemy/alchemy.link_overlay
 //= require alchemy/alchemy.page_sorter
-//= require alchemy/alchemy.uploader.js
+//= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.file_progress
 //= require alchemy/alchemy.swf_upload
 //= require alchemy/alchemy.windows

data/app/assets/javascripts/alchemy/alchemy.routes.js.erb

@@ -1,6 +1,6 @@
 // This object provides dynamically generated Rails routes in Javascript.
 // A little bit hacky, but the best solution so far. ^_^
-<% self.class.send(:include, Alchemy::Engine.routes.url_helpers) %>
+<% self.class.instance_eval { include Alchemy::Engine.routes.url_helpers } %>
 
 if (typeof(Alchemy) === 'undefined') {
   var Alchemy = {};

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

@@ -627,10 +627,6 @@ a.new_content_link {
   margin-top: 4px;
 }
 
-div.content_rtf_editor {
-  min-height: 246px;
-}
-
 div.essence_richtext_loader {
   position: absolute;
   top: 0;

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

@@ -39,6 +39,12 @@
   box-shadow: $shadow;
 }
 
+@mixin box-sizing($box-sizing-type: content-box) {
+  -webkit-box-sizing: $box-sizing-type;
+  -moz-box-sizing: $box-sizing-type;
+  box-sizing: $box-sizing-type;
+}
+
 #alchemy_menubar {
   position: fixed;
   top: 0;
@@ -50,17 +56,23 @@
   @include bounce;
   @include bottom-right-rounded-border;
   @include box-shadow;
+  @include box-sizing;
   border-right: $default-border;
   border-bottom: $default-border;
-  line-height: 8*$default-padding;
-  height: 8*$default-padding;
+  line-height: 8 * $default-padding;
+  height: 8 * $default-padding;
   padding: 4px 40px 4px 8px;
   overflow: hidden;
+
+  * {
+    @include box-sizing;
+  }
+
   &:hover {
     left: 0;
     @include transition;
   }
-;
+
   &:after {
     content: '';
     width: 24px;
@@ -70,11 +82,12 @@
     top: 8px;
     background: image-url('alchemy/icons.png') -240px 0;
   }
-;
+
   ul {
     padding: 0;
     margin: 0;
     height: 32px;
+
     li {
       height: 32px;
       margin: 0 $default-padding 0 0;
@@ -82,6 +95,7 @@
       display: inline;
       display: inline-block;
       list-style-type: none;
+
       a {
         @include button-styles;
         display: block;
@@ -91,9 +105,12 @@
         width: 90px;
         text-decoration: none;
         outline: none;
+        white-space: nowrap;
+
         &:hover {
           @include button-hover-styles;
         }
+
         &:active {
           outline: none;
         }

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

@@ -14,19 +14,18 @@ module Alchemy
         @content = Content.create_from_scratch(@element, params[:content])
         @options = params[:options] || {}
         @html_options = params[:html_options] || {}
-        # If options params come from Flash uploader then we have to parse them as hash.
         if @options.is_a?(String)
-          @options = Rack::Utils.parse_query(@options)
+          @options = JSON.parse(@options)
         end
         if @content.essence_type == "Alchemy::EssencePicture"
-          @element_dom_id = "#add_content_#{@element.id}"
+          @content_dom_id = "#add_content_#{@element.id}"
           @content.essence.picture_id = params[:picture_id]
           @content.essence.save
           @contents_of_this_type = @element.contents.find_all_by_essence_type('Alchemy::EssencePicture')
           @dragable = @contents_of_this_type.length > 1
           @options = @options.merge(:dragable => @dragable)
         else
-          @element_dom_id = "#add_content_for_element_#{@element.id}"
+          @content_dom_id = "#add_content_for_element_#{@element.id}"
         end
         @locals = {
           :content => @content,

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

@@ -2,7 +2,7 @@ module Alchemy
   module Admin
     class ElementsController < Alchemy::Admin::BaseController
 
-      cache_sweeper Alchemy::ContentSweeper, :only => [:update]
+      cache_sweeper Alchemy::ContentSweeper, :only => [:create, :update, :destroy]
 
       def index
         @page = Page.find(params[:page_id], :include => {:elements => :contents})
@@ -20,7 +20,7 @@ module Alchemy
         if @page_id.blank? && !params[:page_urlname].blank?
           @page_id = Page.find_by_urlname_and_language_id(params[:page_urlname], session[:language_id]).id
         end
-        @elements = Element.find_all_by_page_id_and_public(@page_id, true)
+        @elements = Element.published.find_all_by_page_id(@page_id)
       end
 
       def new
@@ -77,7 +77,7 @@ module Alchemy
       # Trashes the Element instead of deleting it.
       def trash
         @element = Element.find(params[:id])
-        @page_id = @element.page_id
+        @page = @element.page
         @element.trash
       end
 
@@ -100,7 +100,7 @@ module Alchemy
         @element.save
       end
 
-      private
+    private
 
       def put_element_in_cell
         element_with_cell_name = @paste_from_clipboard ? params[:paste_from_clipboard] : params[:element][:name]

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

@@ -6,7 +6,7 @@ module Alchemy
 
       before_filter :set_translation, :except => [:show]
 
-      filter_access_to [:show, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold], :attribute_check => true, :load_method => :get_page_from_id, :model => Alchemy::Page
+      filter_access_to [:show, :unlock, :visit, :publish, :configure, :edit, :update, :destroy, :fold], :attribute_check => true, :load_method => :load_page, :model => Alchemy::Page
       filter_access_to [:index, :link, :layoutpages, :new, :switch_language, :create, :move, :flush], :attribute_check => false
 
       cache_sweeper Alchemy::PagesSweeper, :only => [:publish], :if => proc { Alchemy::Config.get(:cache_pages) }
@@ -225,43 +225,25 @@ module Alchemy
 
       def flush
         Page.with_language(session[:language_id]).flushables.each do |page|
-          expire_page(page)
+          expire_action(page.cache_key)
         end
         respond_to do |format|
           format.js
         end
       end
 
-      private
+    private
 
-      def get_page_from_id
-        @page ||= Page.find(params[:id])
+      def load_page
+        @page ||= Page.with_language(session[:language_id]).find_by_urlname(params[:id])
+        @page ||= Page.find_by_id(params[:id])
+        raise ActiveRecord::RecordNotFound if @page.nil?
       end
 
       def pages_from_raw_request
         request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
       end
 
-      def expire_page(page)
-        return if page.do_not_sweep
-        # TODO: We should change this back to expire_action after Rails 3.2 was released.
-        # expire_action(
-        #   alchemy.show_page_url(
-        #     :urlname => page.urlname_was,
-        #     :lang => multi_language? ? page.language_code : nil
-        #   )
-        # )
-        # Temporarily fix for Rails 3 bug
-        expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
-                          self,
-                          alchemy.show_page_url(
-                            :urlname => page.urlname_was,
-                            :lang => multi_language? ? page.language_code : nil
-                          ),
-                          false
-                        ).path) unless page.redirects_to_external?
-      end
-
       # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
       def sort_children(element, dbitem)
         prevchild = nil

data/app/controllers/alchemy/pages_controller.rb

@@ -14,27 +14,16 @@ module Alchemy
 
     filter_access_to :show, :attribute_check => true, :model => Alchemy::Page, :load_method => :load_page
 
-    caches_action(
-      :show,
-      :cache_path => proc { show_page_url(:urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
+    caches_action(:show,
+      :cache_path => proc { @page.cache_key(request) },
       :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
+           pagelayout = PageLayout.get(@page.page_layout)
+           pagelayout['cache'].nil? || pagelayout['cache']
         else
           false
         end
-      },
-      :layout => false
-    )
+      }, :layout => false)
 
     layout :layout_for_page
 

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

@@ -150,9 +150,9 @@ module Alchemy
           page = options[:from_page].is_a?(String) ? Page.find_by_page_layout(options[:from_page]) : options[:from_page]
         end
         if page
-          elements = options[:elements_with_name].blank? ? page.elements.find_all_by_public(true) : page.elements.find_all_by_public_and_name(true, options[:elements_with_name])
+          elements = options[:elements_with_name].blank? ? page.elements.published : page.elements.published.where(:name => options[:elements_with_name])
         else
-          elements = options[:elements_with_name].blank? ? Element.find_all_by_public(true) : Element.find_all_by_public_and_name(true, options[:elements_with_name])
+          elements = options[:elements_with_name].blank? ? Element.published : Element.published.where(:name => options[:elements_with_name])
         end
         select_options = [[options[:prompt], ""]]
         elements.each do |e|
@@ -171,7 +171,7 @@ module Alchemy
       def pages_for_select(pages = nil, selected = nil, prompt = "", page_attribute = :id)
         result = [[prompt.blank? ? t('Choose page') : prompt, ""]]
         if pages.blank?
-          pages = Page.find_all_by_language_id_and_public(session[:language_id], true)
+          pages = Page.with_language(session[:language_id]).published
         end
         pages.each do |p|
           result << [p.name, p.send(page_attribute).to_s]

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

@@ -75,7 +75,7 @@ module Alchemy
       #
       #   <%= render_create_content_link(element, 'file', :label => 'Add a file') %>
       #
-      def render_create_content_link(element, content_name, options = {})
+      def render_create_content_link(element, content_name, options = {}, options_for_content = {})
         defaults = {
           :label => t('Add %{name}', :name => t(content_name, :scope => :content_names))
         }
@@ -84,7 +84,8 @@ module Alchemy
             :content => {
               :name => content_name,
               :element_id => element.id
-            }
+            },
+            :options => options_for_content.to_json
           ),
           :method => :post,
           :remote => true,

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

@@ -112,6 +112,28 @@ module Alchemy
         end
       end
 
+      def update_elements_with_essence_selects(page, element)
+        elements = page.contents.essence_selects.collect(&:element).uniq.delete_if { |e| e == element }
+        if elements.any?
+          js = "var $ess_sel_el;"
+          elements.each do |element|
+            rtfs = element.contents.essence_richtexts
+            js += "\n$ess_sel_el = $('#element_#{element.id}');"
+            rtfs.each do |content|
+              js += "\ntinymce.get('contents_content_#{content.id}_body').remove();"
+            end
+            js += "\n$('div.element_content', $ess_sel_el).html('#{escape_javascript render_editor(element)}');"
+            js += "\nAlchemy.GUI.initElement($ess_sel_el);"
+            rtfs.each do |content|
+              js += "\nAlchemy.Tinymce.addEditor('#{content.form_field_id}');"
+            end
+          end
+          js
+        else
+          nil
+        end
+      end
+
     end
   end
 end

data/app/helpers/alchemy/elements_helper.rb

@@ -4,9 +4,9 @@ module Alchemy
     include Alchemy::EssencesHelper
 
     # Renders all elements from current page.
-    # 
+    #
     # === Options are:
-    # 
+    #
     #   :only => []                          # A list of element names to be rendered only. Very useful if you want to render a specific element type in a special html part (e.g.. <div>) of your page and all other elements in another part.
     #   :except => []                        # A list of element names to be rendered. The opposite of the only option.
     #   :from_page                           # The Alchemy::Page.page_layout string from which the elements are rendered from, or you even pass a Page object.
@@ -16,14 +16,14 @@ module Alchemy
     #     :for => 'ELEMENT_NAME',            # The name of the element the fallback is for
     #     :with => 'ELEMENT_NAME',           # (OPTIONAL) the name of element to fallback with
     #     :from => 'PAGE_LAYOUT'             # The page_layout name from the global page the fallback elements lie on. I.E 'left_column'
-    #   }                                    # 
+    #   }                                    #
     #   :sort_by => Content#name             # A Content name to sort the elements by
     #   :reverse => boolean                  # Reverse the rendering order
     #   :random => boolean                   # Randomize the output of elements
-    # 
+    #
     # === Note:
     # This helper also stores all pages where elements gets rendered on, so we can sweep them later if caching expires!
-    # 
+    #
     def render_elements(options = {})
       default_options = {
         :except => [],
@@ -116,13 +116,13 @@ module Alchemy
       }
       options = default_options.merge(options)
       if options[:from_page] == :all
-        elements = Element.find_all_by_name_and_public(name, true, :limit => options[:count] == :all ? nil : options[:count])
+        elements = Element.published.where(:name => name).limit(options[:count] == :all ? nil : options[:count])
       elsif options[:from_page].class == String
-        page = Page.find_by_page_layout_and_language_id(options[:from_page], session[:language_id])
+        page = Page.with_language(session[:language_id]).find_by_page_layout(options[:from_page])
         return [] if page.blank?
-        elements = page.elements.find_all_by_name_and_public(name, true, :limit => options[:count] == :all ? nil : options[:count])
+        elements = page.elements.published.where(:name => name).limit(options[:count] == :all ? nil : options[:count])
       else
-        elements = options[:from_page].elements.find_all_by_name_and_public(name, true, :limit => options[:count] == :all ? nil : options[:count])
+        elements = options[:from_page].elements.published.where(:name => name).limit(options[:count] == :all ? nil : options[:count])
       end
     end
 
@@ -135,12 +135,12 @@ module Alchemy
       }
       options = default_options.merge(options)
       if options[:page_id].blank?
-        page = Page.find_by_urlname_and_public(options[:page_urlname], true)
+        page = Page.published.find_by_urlname(options[:page_urlname])
       else
-        page = Page.find_by_id_and_public(options[:page_id], true)
+        page = Page.published.find_by_id(options[:page_id])
       end
       return "" if page.blank?
-      element = page.elements.find_by_name_and_public(options[:element_name], true)
+      element = page.elements.published.find_by_name(options[:element_name])
       return element
     end
 

data/app/helpers/alchemy/pages_helper.rb

@@ -17,11 +17,11 @@ module Alchemy
     end
 
     # == Helper for rendering language switches
-    # 
+    #
     # Renders links to all public language root pages
-    # 
+    #
     # === Options:
-    # 
+    #
     #   :linkname => :name,
     #   :spacer => "",
     #   :link_to_public_child => configuration(:redirect_to_public_child),
@@ -30,7 +30,7 @@ module Alchemy
     #   :reverse => false,
     #   :as_select_box => false,
     #   :show_flags => false
-    # 
+    #
     def language_switcher(options={})
       default_options = {
         :linkname => :name,
@@ -114,9 +114,9 @@ module Alchemy
     #
     # It produces a html <ul><li></li></ul> structure with all necessary classes so you can produce every navigation the web uses today.
     # I.E. dropdown-navigations, simple mainnavigations or even complex nested ones.
-    # 
+    #
     # === En detail:
-    # 
+    #
     #   <ul class="navigation level_1">
     #     <li class="first home"><a href="/home" class="active" title="Homepage" lang="en" data-page-id="1">Homepage</a></li>
     #     <li class="contact"><a href="/contact" title="Contact" lang="en" data-page-id="2">Contact</a></li>
@@ -142,15 +142,15 @@ module Alchemy
     #   :show_title => true                                   # Show a title on navigation links. Title attribute from page.
     #   :reverse => false                                     # Reverse the navigation
     #   :reverse_children => false                            # Reverse the nested children
-    # 
+    #
     # === Passing HTML classes and ids to the renderer
-    # 
+    #
     # A second hash will be passed as html_options to the navigation renderer partial.
-    # 
+    #
     # ==== Example:
-    # 
+    #
     #   <%= render_navigation({from_page => 'subnavi'}, {:class => 'navigation', :id => 'subnavigation'}) %>
-    # 
+    #
     def render_navigation(options = {}, html_options = {})
       default_options = {
         :submenu => false,
@@ -196,17 +196,17 @@ module Alchemy
     end
 
     # Renders navigation the children and all siblings of the given page (standard is the current page).
-    # 
+    #
     # Use this helper if you want to render the subnavigation independent from the mainnavigation. I.E. to place it in a different area on your website.
-    # 
+    #
     # This helper passes all its options to the the render_navigation helper.
-    # 
+    #
     # === Options:
-    # 
+    #
     #   :from_page => @page                              # The page to render the navigation from
     #   :submenu => true                                 # Shows the nested children
     #   :level => 2                                      # Normally there is no need to change the level parameter, just in a few special cases
-    # 
+    #
     def render_subnavigation(options = {})
       default_options = {
         :from_page => @page,
@@ -237,9 +237,9 @@ module Alchemy
     end
 
     # Returns page links in a breadcrumb beginning from root to current page.
-    # 
+    #
     # === Options:
-    # 
+    #
     #   :seperator => %(<span class="seperator">></span>)      # Maybe you don't want this seperator. Pass another one.
     #   :page => @page                                         # Pass a different Page instead of the default (@page).
     #   :without => nil                                        # Pass Pageobject or array of Pages that must not be displayed.
@@ -247,7 +247,7 @@ module Alchemy
     #   :visible_only => true                                  # Pass boolean for displaying (in navigation) visible pages only.
     #   :restricted_only => false                              # Pass boolean for displaying restricted pages only.
     #   :reverse => false                                      # Pass boolean for displaying reversed breadcrumb.
-    # 
+    #
     def render_breadcrumb(options={})
       default_options = {
         :seperator => %(<span class="seperator">&gt;</span>),
@@ -296,15 +296,15 @@ module Alchemy
     # Returns current page title
     #
     # === Options:
-    # 
+    #
     #   :prefix => ""                 # Prefix
     #   :seperator => ""              # Seperating prefix and title
     #
     # === Webdevelopers
-    # 
+    #
     # Please use the render_meta_data() helper instead. There all important meta information gets rendered in one helper.
     # So you dont have to worry about anything.
-    # 
+    #
     def render_page_title(options={})
       return "" if @page.title.blank?
       default_options = {
@@ -318,10 +318,10 @@ module Alchemy
     # Returns a complete html <title> tag for the <head> part of the html document.
     #
     # === Webdevelopers:
-    # 
+    #
     # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
     # So you dont have to worry about anything.
-    # 
+    #
     def render_title_tag(options={})
       default_options = {
         :prefix => "",
@@ -334,10 +334,10 @@ module Alchemy
     # Renders a html <meta> tag for :name => "" and :content => ""
     #
     # === Webdevelopers:
-    # 
+    #
     # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
     # So you dont have to worry about anything.
-    # 
+    #
     def render_meta_tag(options={})
       default_options = {
         :name => "",
@@ -350,17 +350,17 @@ module Alchemy
     end
 
     # This helper takes care of all important meta tags for your page.
-    # 
+    #
     # The meta data is been taken from the @page.title, @page.meta_description, @page.meta_keywords, @page.updated_at and @page.language database entries managed by the Alchemy user via the Alchemy cockpit.
-    # 
+    #
     # Assume that the user has entered following data into the Alchemy cockpit of the Page "home" and that the user wants that the searchengine (aka. google) robot should index the page and should follow all links on this page:
-    # 
+    #
     # Title = Homepage
     # Description = Your page description
     # Keywords: cms, ruby, rubyonrails, rails, software, development, html, javascript, ajax
-    # 
+    #
     # Then placing +render_meta_data(:title_prefix => "company", :title_seperator => "-")+ into the <head> part of the +pages.html.erb+ layout produces:
-    # 
+    #
     #   <meta charset="UTF-8">
     #   <title>Company - #{@page.title}</title>
     #   <meta name="description" content="Your page description">
@@ -368,7 +368,7 @@ module Alchemy
     #   <meta name="generator" content="Alchemy VERSION">
     #   <meta name="date" content="Tue Dec 16 10:21:26 +0100 2008">
     #   <meta name="robots" content="index, follow">
-    #  
+    #
     def render_meta_data options={}
       if @page.blank?
         warning("No Page found!")
@@ -382,13 +382,13 @@ module Alchemy
       options = default_options.merge(options)
       #render meta description of the root page from language if the current meta description is empty
       if @page.meta_description.blank?
-        description = Page.find_by_language_root_and_public_and_language_id(true, true, session[:language_id]).meta_description rescue ""
+        description = Page.published.with_language(session[:language_id]).find_by_language_root(true).try(:meta_description)
       else
         description = @page.meta_description
       end
       #render meta keywords of the root page from language if the current meta keywords is empty
       if @page.meta_keywords.blank?
-        keywords = Page.find_by_language_root_and_public_and_language_id(true, true, session[:language_id]).meta_keywords rescue ""
+        keywords = Page.published.with_language(session[:language_id]).find_by_language_root(true).try(:meta_keywords)
       else
         keywords = @page.meta_keywords
       end
@@ -410,14 +410,14 @@ module Alchemy
     end
 
     # This helper returns a path for use inside a link_to helper.
-    # 
+    #
     # You may pass a page_layout or an urlname.
     # Any additional options are passed to the url_helper, so you can add arguments to your url.
-    # 
+    #
     # Example:
-    # 
+    #
     #   <%= link_to '&raquo order now', page_path_for(:page_layout => 'orderform', :product_id => element.id) %>
-    # 
+    #
     def page_path_for(options={})
       return warning("No page_layout, or urlname given. I got #{options.inspect} ") if options[:page_layout].blank? && options[:urlname].blank?
       if options[:urlname].blank?
@@ -435,9 +435,9 @@ module Alchemy
 
     # Renders the partial for the cell with the given name of the current page.
     # Cell partials are located in +app/views/cells/+ of your project.
-    # 
+    #
     # === Options are:
-    # 
+    #
     #   :from_page => Alchemy::Page     # Alchemy::Page object from which the elements are rendered from.
     #   :locals => Hash                 # Hash of variables that will be available in the partial. Example: {:user => var1, :product => var2}
     #
@@ -521,12 +521,12 @@ module Alchemy
       return multi_language? ? url_params.update(:lang => page.language_code) : url_params
     end
 
-    # 
+    #
     def show_alchemy_page_path(page, optional_params={})
       alchemy.show_page_path(show_page_path_params(page, optional_params))
     end
 
-    # 
+    #
     def show_alchemy_page_url(page, optional_params={})
       alchemy.show_page_url(show_page_path_params(page, optional_params))
     end
@@ -542,7 +542,7 @@ module Alchemy
           <script type="text/javascript">
             try {
               Alchemy.loadAlchemyMenuBar({
-                page_id: #{@page.id},
+                page_id: '#{@page.urlname || @page.id}',
                 route: '#{Alchemy.mount_point}',
                 locale: '#{current_user.language}'
               });