alchemy_cms 2.3.2 → 2.4.beta2

data/config/alchemy/config.yml

@@ -9,6 +9,12 @@
 #
 #   rake alchemy:app_structure:create:config
 
+# === Require SSL for login form and all admin modules
+#
+# NOTE: You have to create a SSL certificate on your server to make this work
+#
+require_ssl: false
+
 # === Auto Log Out Time
 #
 # The amount of time of inactivity in minutes after which the user is kicked out of his current session.

data/config/alchemy/page_layouts.yml

@@ -7,6 +7,7 @@
 #     unique: Bool                  # Pass true and the user can only choose this layout once inside a language tree.
 #     hide: Bool                    # Pass true to hide this layout from the user.
 #     elements: Array               # A list of element names that can be placed on this layout i.e. [text, picture]. Elements are defined inside the elements.yml file.
+#     insert_elements_at: String    # Pass top to insert elements at top of the list. Default: bottom
 #     autogenerate: Array           # A list of element names that are autogenerated after creating the Page.
 #     searchresults: Bool           # Pass true to enable rendering the searchresults of the fulltext-search.
 #     layoutpage: Bool              # Layoutpages are outside the normal pagetree and can be used to place "global" language independent Elements.
@@ -46,6 +47,7 @@
 - name: news
   feed: true
   unique: true
+  insert_elements_at: top
   elements: [headline, news]
   autogenerate: [news]
   feed_elements: [news]

data/config/authorization_rules.rb

@@ -56,7 +56,7 @@ authorization do
 
   role :admin do
     includes :editor
-    has_permission_on :alchemy_admin_users, :to => [:manage]
+    has_permission_on :alchemy_admin_users, :to => [:manage, :update_role]
     has_permission_on :alchemy_admin_languages, :to => [:manage]
     has_permission_on :authorization_rules, :to => :read
   end

data/config/locales/alchemy.de.yml

@@ -278,6 +278,7 @@ de:
     "Successfully added content": "%{content} wurde hinzugefügt"
     "Successfully deleted content": "%{content} wurde gelöscht"
     "Successfully saved content position": "Die Position wurde gespeichert."
+    "Successfully signup admin user": "Admin Benutzer wurde erfolgreich eingerichtet."
     "Switch to Flash® Uploader": "Auf den Flash® Uploader wechseln"
     sitemap_editor_info: "Die Sitemap wird automatisch generiert"
     searchresults_editor_info: "Dieses Element stellt die Suchergebnisse dar. Es Bedarf keinerlei Anpassung."
@@ -462,6 +463,7 @@ de:
     "Page created": "Seite '%{name}' wurde erstellt."
     page_for_links:
       choose_page: "%{name} wählen"
+    page_layout_changed_notice: "Der Seitentyp wurde verändert. Nicht mehr verwendbare Elemente wurden in den Papierkorb verschoben."
     page_locked: "Die Seite ist gesperrt"
     page_properties: "Seiteneigenschaften"
     page_public: "öffentlich"
@@ -517,6 +519,7 @@ de:
     show_eq: "EQ anzeigen"
     show_navigation: "Navigation anzeigen"
     show_page_in_sitemap: "Seite in der Sitemap zeigen"
+    signup_mail_delivery_error: "Einrichtungs-E-Mail konnte nicht verschickt werden. Bitte überprüfen Sie die Mail Einstellungen."
     small_thumbnails: "kleine Miniaturbilder"
     subject: "Betreff"
     successfully_added_element: "Element wurde hinzugefügt."

data/config/locales/alchemy.en.yml

@@ -296,7 +296,9 @@ en:
     "No users found": "No users found."
     "not a valid image": "This is not an valid image."
     "Page created": "Page: '%{name}' created."
-    page_for_links.choose_page: "Choose %{name}"
+    page_for_links:
+      choose_page: "Choose %{name}"
+    page_layout_changed_notice: "Page type was changed. Elements not usable anymore have been moved into the trash."
     page_locked: "This page is locked by another user."
     page_properties: "Page properties"
     page_public: "published"
@@ -346,6 +348,7 @@ en:
     show_eq: "Show EQ"
     show_navigation: "Show in navigation"
     show_page_in_sitemap: "Show page in sitemap."
+    signup_mail_delivery_error: 'Signup mail could not be delivered. Please check your mail settings.'
     sitemap_editor_notice: "The sitemap is autogenerated."
     searchresults_editor_info: "This element displays the search and the searchresults."
     small_thumbnails: "Small thumbnails"

data/db/migrate/20121026100815_alchemy_two_point_three.rb

@@ -0,0 +1,312 @@
+# This is a compressed migration for creating all Alchemy 2.3 tables at once.
+#
+# === Notice
+#
+# In order to upgrade from an old version of Alchemy, you have to run all migrations from
+# each version you missed up to the version you want to upgrade to, before running this migration.
+#
+class AlchemyTwoPointThree < ActiveRecord::Migration
+  def up
+    # Do not run if Alchemy tables are already present
+    return if table_exists?(:alchemy_pages)
+
+    create_table "alchemy_attachments", :force => true do |t|
+      t.string   "name"
+      t.string   "filename"
+      t.string   "content_type"
+      t.integer  "size"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",   :null => false
+      t.datetime "updated_at",   :null => false
+    end
+
+    create_table "alchemy_cells", :force => true do |t|
+      t.integer  "page_id"
+      t.string   "name"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "alchemy_contents", :force => true do |t|
+      t.string   "name"
+      t.string   "essence_type"
+      t.integer  "essence_id"
+      t.integer  "element_id"
+      t.integer  "position"
+      t.datetime "created_at",   :null => false
+      t.datetime "updated_at",   :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_contents", ["element_id", "position"], :name => "index_contents_on_element_id_and_position"
+
+    create_table "alchemy_elements", :force => true do |t|
+      t.string   "name"
+      t.integer  "position"
+      t.integer  "page_id"
+      t.boolean  "public",     :default => true
+      t.boolean  "folded",     :default => false
+      t.boolean  "unique",     :default => false
+      t.datetime "created_at",                    :null => false
+      t.datetime "updated_at",                    :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.integer  "cell_id"
+    end
+
+    add_index "alchemy_elements", ["page_id", "position"], :name => "index_elements_on_page_id_and_position"
+
+    create_table "alchemy_elements_alchemy_pages", :id => false, :force => true do |t|
+      t.integer "element_id"
+      t.integer "page_id"
+    end
+
+    create_table "alchemy_essence_audios", :force => true do |t|
+      t.integer  "attachment_id"
+      t.integer  "width",           :default => 400
+      t.integer  "height",          :default => 300
+      t.boolean  "show_eq",         :default => true
+      t.boolean  "show_navigation", :default => true
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                        :null => false
+      t.datetime "updated_at",                        :null => false
+    end
+
+    create_table "alchemy_essence_booleans", :force => true do |t|
+      t.boolean  "value"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_essence_booleans", ["value"], :name => "index_alchemy_essence_booleans_on_value"
+
+    create_table "alchemy_essence_dates", :force => true do |t|
+      t.datetime "date"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "alchemy_essence_files", :force => true do |t|
+      t.integer  "attachment_id"
+      t.string   "title"
+      t.string   "css_class"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",    :null => false
+      t.datetime "updated_at",    :null => false
+    end
+
+    create_table "alchemy_essence_flashes", :force => true do |t|
+      t.integer  "attachment_id"
+      t.integer  "width",          :default => 400
+      t.integer  "height",         :default => 300
+      t.string   "player_version", :default => "9.0.28"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                           :null => false
+      t.datetime "updated_at",                           :null => false
+    end
+
+    create_table "alchemy_essence_htmls", :force => true do |t|
+      t.text     "source"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "alchemy_essence_pictures", :force => true do |t|
+      t.integer  "picture_id"
+      t.string   "caption"
+      t.string   "title"
+      t.string   "alt_tag"
+      t.string   "link"
+      t.string   "link_class_name"
+      t.string   "link_title"
+      t.string   "css_class"
+      t.string   "link_target"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.string   "crop_from"
+      t.string   "crop_size"
+      t.string   "render_size"
+    end
+
+    create_table "alchemy_essence_richtexts", :force => true do |t|
+      t.text     "body"
+      t.text     "stripped_body"
+      t.boolean  "do_not_index",  :default => false
+      t.boolean  "public"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                       :null => false
+      t.datetime "updated_at",                       :null => false
+    end
+
+    create_table "alchemy_essence_selects", :force => true do |t|
+      t.string   "value"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_essence_selects", ["value"], :name => "index_alchemy_essence_selects_on_value"
+
+    create_table "alchemy_essence_texts", :force => true do |t|
+      t.text     "body"
+      t.string   "link"
+      t.string   "link_title"
+      t.string   "link_class_name"
+      t.boolean  "public",          :default => false
+      t.boolean  "do_not_index",    :default => false
+      t.string   "link_target"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                         :null => false
+      t.datetime "updated_at",                         :null => false
+    end
+
+    create_table "alchemy_essence_videos", :force => true do |t|
+      t.integer  "attachment_id"
+      t.integer  "width"
+      t.integer  "height"
+      t.boolean  "allow_fullscreen", :default => true
+      t.boolean  "auto_play",        :default => false
+      t.boolean  "show_navigation",  :default => true
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                          :null => false
+      t.datetime "updated_at",                          :null => false
+    end
+
+    create_table "alchemy_folded_pages", :force => true do |t|
+      t.integer "page_id"
+      t.integer "user_id"
+      t.boolean "folded",  :default => false
+    end
+
+    create_table "alchemy_languages", :force => true do |t|
+      t.string   "name"
+      t.string   "language_code"
+      t.string   "frontpage_name"
+      t.string   "page_layout",    :default => "intro"
+      t.boolean  "public",         :default => false
+      t.datetime "created_at",                          :null => false
+      t.datetime "updated_at",                          :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.boolean  "default",        :default => false
+      t.string   "country_code",   :default => "",      :null => false
+    end
+
+    add_index "alchemy_languages", ["language_code", "country_code"], :name => "index_alchemy_languages_on_language_code_and_country_code"
+    add_index "alchemy_languages", ["language_code"], :name => "index_alchemy_languages_on_language_code"
+
+    create_table "alchemy_pages", :force => true do |t|
+      t.string   "name"
+      t.string   "urlname"
+      t.string   "title"
+      t.string   "language_code"
+      t.boolean  "language_root"
+      t.string   "page_layout"
+      t.text     "meta_keywords"
+      t.text     "meta_description"
+      t.integer  "lft"
+      t.integer  "rgt"
+      t.integer  "parent_id"
+      t.integer  "depth"
+      t.boolean  "visible",          :default => false
+      t.boolean  "public",           :default => false
+      t.boolean  "locked",           :default => false
+      t.integer  "locked_by"
+      t.boolean  "restricted",       :default => false
+      t.boolean  "robot_index",      :default => true
+      t.boolean  "robot_follow",     :default => true
+      t.boolean  "sitemap",          :default => true
+      t.boolean  "layoutpage",       :default => false
+      t.datetime "created_at",                          :null => false
+      t.datetime "updated_at",                          :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.integer  "language_id"
+    end
+
+    add_index "alchemy_pages", ["language_id"], :name => "index_pages_on_language_id"
+    add_index "alchemy_pages", ["parent_id", "lft"], :name => "index_pages_on_parent_id_and_lft"
+    add_index "alchemy_pages", ["urlname"], :name => "index_pages_on_urlname"
+
+    create_table "alchemy_pictures", :force => true do |t|
+      t.string   "name"
+      t.string   "image_filename"
+      t.integer  "image_width"
+      t.integer  "image_height"
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.string   "upload_hash"
+      t.string   "cached_tag_list"
+    end
+
+    create_table "alchemy_users", :force => true do |t|
+      t.string   "firstname"
+      t.string   "lastname"
+      t.string   "login"
+      t.string   "email"
+      t.string   "gender"
+      t.string   "role",                               :default => "registered"
+      t.string   "language"
+      t.string   "crypted_password",    :limit => 128, :default => "",           :null => false
+      t.string   "password_salt",       :limit => 128, :default => "",           :null => false
+      t.integer  "login_count",                        :default => 0,            :null => false
+      t.integer  "failed_login_count",                 :default => 0,            :null => false
+      t.datetime "last_request_at"
+      t.datetime "current_login_at"
+      t.datetime "last_login_at"
+      t.string   "current_login_ip"
+      t.string   "last_login_ip"
+      t.string   "persistence_token",                                            :null => false
+      t.string   "single_access_token",                                          :null => false
+      t.string   "perishable_token",                                             :null => false
+      t.datetime "created_at",                                                   :null => false
+      t.datetime "updated_at",                                                   :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
+
+    # Skip migrations for acts-as-taggable-on, if the tables are already present
+    unless table_exists?(:taggings)
+      create_table "taggings", :force => true do |t|
+        t.integer  "tag_id"
+        t.integer  "taggable_id"
+        t.string   "taggable_type"
+        t.integer  "tagger_id"
+        t.string   "tagger_type"
+        t.string   "context"
+        t.datetime "created_at"
+      end
+
+      add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+      add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+    end
+
+    unless table_exists?(:tags)
+      create_table "tags", :force => true do |t|
+        t.string "name"
+      end
+    end
+
+  end
+end

data/lib/alchemy/mount_point.rb

@@ -1,10 +1,16 @@
 module Alchemy
 
   # Returns alchemys mount point in current rails app.
-  def self.mount_point
+  # Pass false to not return a leading slash on empty mount point.
+  def self.mount_point(remove_leading_slash_if_blank = true)
     alchemy_routes = Rails.application.routes.named_routes[:alchemy]
     raise "Alchemy not mounted! Please mount Alchemy::Engine in your config/routes.rb file." if alchemy_routes.nil?
-    alchemy_routes.path.spec.to_s.gsub(/^\/$/, '')
+    mount_point = alchemy_routes.path.spec.to_s
+    if remove_leading_slash_if_blank && mount_point == "/"
+      mount_point.gsub(/^\/$/, '')
+    else
+      mount_point
+    end
   end
 
-end
+end

data/lib/alchemy/page_layout.rb

@@ -1,96 +1,112 @@
 module Alchemy
   class PageLayout
+    class << self
 
-    def self.included(base)
-      get_layouts
-    end
-
-    def self.element_names_for(page_layout)
-      layout_description = get(page_layout)
-      if layout_description.blank?
-        puts "\n+++ Warning: No Layout Description for #{page_layout} found! in page_layouts.yml\n"
-        return []
-      else
-        layout_description["elements"]
+      def element_names_for(page_layout)
+        layout_description = get(page_layout)
+        if layout_description.blank?
+          puts "\n+++ Warning: No Layout Description for #{page_layout} found! in page_layouts.yml\n"
+          return []
+        else
+          layout_description["elements"]
+        end
       end
-    end
 
-    # Returns the page_layout.yml file. Tries to first load from config/alchemy and if not found from vendor/plugins/alchemy/config/alchemy.
-    def self.get_layouts
-      @@definitions ||= read_layouts_file
-    end
+      # Returns all layouts defined in +config/alchemy/page_layout.yml+.
+      def all
+        @@definitions ||= read_layouts_file
+      end
 
-    # Add additional pagelayout definitions. I.E. from your module.
-    # Call +Alchemy::PageLayout.add(your_layout_definition)+ in your engine.rb file.
-    # You can pass a single layout definition as Hash, or a collection of pagelayouts as Array.
-    # Example Pagelayout definitions can be found in the +page_layouts.yml+ from the standard set.
-    def self.add(page_layout)
-      get_layouts
-      if page_layout.is_a?(Array)
-        @@definitions += page_layout
-      elsif page_layout.is_a?(Hash)
-        @@definitions << page_layout
-      else
-        raise TypeError
+      # Add additional pagelayout definitions. I.E. from your module.
+      # Call +Alchemy::PageLayout.add(your_layout_definition)+ in your engine.rb file.
+      # You can pass a single layout definition as Hash, or a collection of pagelayouts as Array.
+      # Example Pagelayout definitions can be found in the +page_layouts.yml+ from the standard set.
+      def add(page_layout)
+        all
+        if page_layout.is_a?(Array)
+          @@definitions += page_layout
+        elsif page_layout.is_a?(Hash)
+          @@definitions << page_layout
+        else
+          raise TypeError
+        end
       end
-    end
 
-    # Returns the page_layout description found by name in page_layouts.yml
-    def self.get(name)
-      return {} if name.blank?
-      get_layouts.detect { |a| a["name"].downcase == name.downcase }
-    end
+      # Returns the page_layout description found by name in page_layouts.yml
+      def get(name)
+        return {} if name.blank?
+        all.detect { |a| a["name"].downcase == name.downcase }
+      end
 
-    def self.get_all_by_attributes(attributes)
-      return [] if attributes.blank?
-      if attributes.class.name == 'Hash'
-        layouts = []
-        attributes.stringify_keys.each do |key, value|
-          result = get_layouts.select { |a| a[key].to_s.downcase == value.to_s.downcase if a.has_key?(key) }
-          layouts += result unless result.empty?
+      def get_all_by_attributes(attributes)
+        return [] if attributes.blank?
+        if attributes.class.name == 'Hash'
+          layouts = []
+          attributes.stringify_keys.each do |key, value|
+            result = all.select { |a| a[key].to_s.downcase == value.to_s.downcase if a.has_key?(key) }
+            layouts += result unless result.empty?
+          end
+          return layouts
+        else
+          return []
         end
-        return layouts
-      else
-        return []
       end
-    end
 
-    # Returns page layouts ready for Rails' select form helper.
-    def self.get_layouts_for_select(language_id, layoutpage = false)
-      layouts_for_select = [[Alchemy::I18n.t("Please choose"), ""]]
-      selectable_layouts(language_id, layoutpage).each do |layout|
-        display_name = Alchemy::I18n.t("page_layout_names.#{layout['name']}", :default => layout['name'].camelize)
-        layouts_for_select << [display_name, layout["name"]]
+      # Returns page layouts ready for Rails' select form helper.
+      def layouts_for_select(language_id, layoutpage = false)
+        map_layouts(selectable_layouts(language_id, layoutpage), [[I18n.t("Please choose"), ""]])
       end
-      layouts_for_select
-    end
 
-    def self.selectable_layouts(language_id, layoutpage = false)
-      get_layouts.select do |layout|
-        next if layout["hide"]
-        used = layout["unique"] && has_a_page_this_layout?(layout["name"], language_id)
-        if layoutpage
-          layout["layoutpage"] == true && !used
+      def layouts_with_own_for_select(own_layout, language_id, layoutpage)
+        layouts = selectable_layouts(language_id, layoutpage)
+        if layouts.detect { |l| l['name'] == own_layout } == nil
+          map_array = [[I18n.t(own_layout, :scope => 'page_layout_names'), own_layout]]
         else
-          layout["layoutpage"] != true && !used
+          map_array = []
         end
+        map_layouts(layouts, map_array)
       end
-    end
 
-    def self.has_a_page_this_layout?(layout, language_id)
-      Page.where({:page_layout => layout, :language_id => language_id}).any?
-    end
+      # Maps given layouts for Rails select form helper.
+      def map_layouts(layouts, map_array = [])
+        layouts.each do |layout|
+          map_array << [
+            I18n.t(layout['name'], :scope => 'page_layout_names'),
+            layout["name"]
+          ]
+        end
+        map_array
+      end
 
-    # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
-    def self.read_layouts_file
-      if File.exists? "#{Rails.root}/config/alchemy/page_layouts.yml"
-        layouts = YAML.load_file "#{Rails.root}/config/alchemy/page_layouts.yml"
-      else
-        raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
+      def selectable_layouts(language_id, layoutpage = false)
+        all.select do |layout|
+          next if layout["hide"]
+          used = layout["unique"] && has_a_page_this_layout?(layout["name"], language_id)
+          if layoutpage
+            layout["layoutpage"] == true && !used
+          else
+            layout["layoutpage"] != true && !used
+          end
+        end
       end
-      # Since YAML returns false for an empty file, we have to normalize it here.
-      layouts || []
-    end
 
+      def has_a_page_this_layout?(layout, language_id)
+        Page.where({:page_layout => layout, :language_id => language_id}).any?
+      end
+
+    private
+
+      # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
+      def read_layouts_file
+        if File.exists? "#{Rails.root}/config/alchemy/page_layouts.yml"
+          layouts = YAML.load_file "#{Rails.root}/config/alchemy/page_layouts.yml"
+        else
+          raise LoadError, "Could not find page_layouts.yml file! Please run: rails generate alchemy:scaffold"
+        end
+        # Since YAML returns false for an empty file, we have to normalize it here.
+        layouts || []
+      end
+
+    end
   end
 end