alchemy_cms 2.6.3 → 2.7.0

data/app/views/alchemy/essences/_essence_text_editor.html.erb

@@ -22,7 +22,7 @@
         <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
         <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
         <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
-        <%= render 'alchemy/essences/linkable_essence_tools', :content => content %>
+        <%= render 'alchemy/essences/shared/linkable_essence_tools', :content => content %>
 
       <% end %>
 

data/app/views/alchemy/essences/{_essence_picture_tools.html.erb → shared/_essence_picture_tools.html.erb}

@@ -1,7 +1,7 @@
-<% if options[:crop].to_s == 'true' && content.ingredient %>
+<% if options[:crop] && content.ingredient %>
 <%= link_to_overlay_window(
   render_icon('crop'),
-  alchemy.crop_admin_essence_picture_path(content.essence, :options => options),
+  alchemy.crop_admin_essence_picture_path(content.essence, :options => options.to_json),
   {
     :size => "816x754",
     :title => _t('Edit Picturemask'),
@@ -19,9 +19,9 @@
   render_icon('swap_picture'),
   alchemy.admin_pictures_path(
     :element_id => content.element,
-    :content_id => content,
+    :content_id => content.id,
     :swap => true,
-    :options => options
+    :options => options.to_json
   ),
   {
     :title => (content.ingredient ? _t(:swap_image) : _t(:insert_image)),
@@ -50,7 +50,7 @@
   alchemy.edit_admin_essence_picture_path(
     :id => content.essence.id,
     :content_id => content.id,
-    :options => options
+    :options => options.to_json
   ),
   {
     :title => _t(:edit_image_properties),

data/app/views/alchemy/messages/contact_form_mail.de.text.erb

@@ -0,0 +1,12 @@
+<%= @message.message %>
+
+--
+
+Absender:
+
+<%= Alchemy::I18n.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
+<%= @message.address %>
+<%= @message.zip %> <%= @message.city %>
+
+Telefon: <%= @message.phone %>
+E-Mail: <%= @message.email %>

data/app/views/alchemy/messages/contact_form_mail.en.text.erb

@@ -0,0 +1,12 @@
+<%= @message.message %>
+
+--
+
+Sender:
+
+<%= Alchemy::I18n.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
+<%= @message.address %>
+<%= @message.zip %> <%= @message.city %>
+
+Phone: <%= @message.phone %>
+Email: <%= @message.email %>

data/app/views/alchemy/notifications/reset_password_instructions.de.text.erb

@@ -2,7 +2,7 @@ Hallo <%= @user.fullname %>.
 
 Sie haben angefordert Ihr Passwort zurückzusetzen. Dies kann durch anklicken des nachfolgenden Links bestätigt werden.
 
-<%= alchemy.edit_password_url(@user, :reset_password_token => @user.reset_password_token) %>
+<%= alchemy.edit_password_url(@user, reset_password_token: @user.reset_password_token) %>
 
 Wenn Sie diese Zurücksetzung nicht angefragt haben, dann können Sie diese E-Mail einfach ignorieren.
 Ihr Passwort wird erst dann zurückgesetzt, wenn Sie den Link anklicken.

data/app/views/alchemy/notifications/reset_password_instructions.en.text.erb

@@ -1,8 +1,8 @@
-Hello <%= @user.fullname %>.
+Hello <%= @user.name %>.
 
 You has requested to change your password. Please confirm this by clicking the link below.
 
-<%= alchemy.edit_password_url(@user, :reset_password_token => @user.reset_password_token) %>
+<%= alchemy.edit_password_url(@user, reset_password_token: @user.reset_password_token) %>
 
 If you didn't request this, please ignore this email.
 Your password won't change until you access the link above and create a new one.

data/app/views/alchemy/pages/sitemap.xml.erb

@@ -1,8 +1,6 @@
 <%- @pages.each do |page| -%>
 <url>
-  <loc><%= multi_language? ? show_page_url(:urlname => page.urlname, :lang => page.language) : show_page_url(page.urlname) %></loc>
-  <lastmod><%= page.updated_at %></lastmod>
-  <changefreq>weekly</changefreq>
-  <priority>1</priority>
+  <loc><%= show_alchemy_page_url(page) %></loc>
+  <lastmod><%= page.updated_at.utc.iso8601 %></lastmod>
 </url>
-<%- end -%>
+<%- end -%>

data/app/views/alchemy/user_sessions/leave.html.erb

@@ -6,6 +6,6 @@
   </p>
   <%= form_tag alchemy.logout_path, :method => :delete, :class => 'buttons' do %>
     <label><%= _t('or to completly') %></label>
-    <%= button _t(:logout) %>
+    <%= button _t(:logout), autofocus: true %>
   <% end %>
 </div>

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

@@ -37,7 +37,9 @@
     </div>
     <div id="left_menu">
       <div id="main_navi">
-        <%= admin_main_navigation %>
+        <% alchemy_modules.each do |alchemy_module| %>
+          <%= alchemy_main_navigation_entry(alchemy_module) %>
+        <% end %>
         <%= yield(:alchemy_main_navigation) %>
       </div>
       <div id="logout">
@@ -47,7 +49,7 @@
             alchemy.leave_admin_path, {
               :size => "300x105",
               :title => _t("Leave Alchemy")
-          }) %>
+          }, {'data-alchemy-hotkey' => 'alt-q'}) %>
         <% else %>
           <%= link_to(alchemy.root_path) do %>
             <span class="module icon exit"></span>

data/app/views/layouts/alchemy/sitemap.xml.erb

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <%= yield %>
-</urlset>
+</urlset>

data/bin/alchemy

@@ -1,16 +1,10 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
+gem 'rails', '~> 3.2.14'
 
-begin
-  require "rubygems"
-  require 'rails/version'
-  RAILS_VERSION = Rails::VERSION::STRING
-  if RAILS_VERSION < "3.2"
-    raise LoadError, "Wrong rails version installed. Please run gem install rails -v'~>3.2.11'"
-  end
-  require "thor"
-  require File.join(File.dirname(__FILE__), '..', 'lib/alchemy/version')
-end
+require 'rails/version'
+require "thor"
+require File.expand_path('../../lib/alchemy/version', __FILE__)
 
 class AlchemyInstaller < Thor
   include Thor::Actions
@@ -19,16 +13,16 @@ class AlchemyInstaller < Thor
   map "--version" => :version
   desc "version", "Prints current Alchemy CMS version", :hide => true
   def version
-    puts Alchemy::VERSION
+    puts Alchemy.version
   end
 
   desc "new PROJECT", "Creates a new Alchemy CMS project."
   method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
   def new(project)
     @application = project.downcase.strip.gsub(/ /, '_')
-    if system("rails new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
+    if system("rails _#{Rails::VERSION::STRING}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
       create_database_yml if options[:database] == 'mysql'
-      system("cd ./#{@application} && rake alchemy:install")
+      system("cd ./#{@application} && bundle exec rake alchemy:install")
       gitignore = <<-GIT
 log/*
 tmp/*

data/config/alchemy/config.yml

@@ -128,6 +128,7 @@ mailer:
   mail_success_page: thanks
   mail_from: your.mail@your-domain.com
   mail_to: your.mail@your-domain.com
+  subject: A new contact form message
   fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
   validate_fields: [lastname, email]
 

data/config/authorization_rules.rb

@@ -25,7 +25,6 @@ authorization do
     end
     has_permission_on :alchemy_pages, :to => [:show] do
       if_attribute :public => true, :restricted => true
-      if_attribute :public => true, :restricted => false
     end
     has_permission_on :alchemy_elements, :to => [:show] do
       if_attribute :public => true
@@ -41,7 +40,7 @@ authorization do
     includes :registered
     has_permission_on :alchemy_admin_dashboard, :to => [:index]
     has_permission_on :alchemy_pictures, :to => [:thumbnail]
-    has_permission_on :alchemy_admin_pages, :to => [:index, :fold, :edit_page_content, :link]
+    has_permission_on :alchemy_admin_pages, :to => [:index, :info, :fold, :edit_page_content, :link]
     has_permission_on :alchemy_admin_elements, :to => [:manage_elements]
     has_permission_on :alchemy_admin_pictures, :to => [:read, :archive_overlay, :info]
     has_permission_on :alchemy_admin_attachments, :to => [:index, :archive_overlay, :show, :download]
@@ -97,7 +96,7 @@ privileges do
   end
 
   privilege :manage_picture_essences, :alchemy_admin_essence_pictures do
-    includes :manage, :save_link, :assign, :crop
+    includes :manage, :assign, :crop
   end
 
   privilege :manage_file_essences, :alchemy_admin_essence_files do

data/config/initializers/dragonfly.rb

@@ -1,3 +1,5 @@
+require 'dragonfly'
+
 # Alchemy CMS Dragonfly configuration.
 
 # Pictures

data/config/locales/alchemy.de.yml

@@ -241,7 +241,6 @@ de:
     "New Tag Created": "Neues Tag wurde erstellt"
     "No": "Nein"
     "No EssenceType given": ""
-    "No image found. Did you saved the element?": "Es wurde kein Bild gefunden. Haben Sie das Element auch gespeichert?"
     "No items in your clipboard": "Ihre Zwischenablage ist leer"
     "No Tags found": "Keine Tags gefunden"
     "None": "keine"
@@ -296,9 +295,8 @@ de:
     "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."
-    element_dirty_notice: "Dieses Element hat nicht gespeicherte Änderungen. Möchten Sie es wirklich einklappen?"
     "Tags": "Tags"
-    "These pictures could not be deleted, because they where in use": "Diese Bilder konnten nicht gelöscht werden, da sie in Benutzung sind: %{names}"
+    "These pictures could not be deleted, because they were in use": "Diese Bilder konnten nicht gelöscht werden, da sie in Benutzung sind: %{names}"
     "This page is locked by %{name}": "Diese Seite wird gerade von %{name} blockiert"
     "Title": "Titel"
     "Trash": "Papierkorb"
@@ -375,9 +373,7 @@ de:
     create_language_tree_heading: "Einen leeren Sprachbaum erstellen"
     create_page: "Eine Unterseite anlegen"
     create_user: "Einen Benutzer anlegen"
-    created_at: "Erstellt am"
-    created_by: "Erstellt von"
-    currently_edited_by: "Wird momentan bearbeitet von"
+    currently_edited_by: "Wird bearbeitet von"
     cut_element: "Element ausschneiden"
     delete_file: "Datei vom Server löschen"
     delete_image: "Bild löschen."
@@ -399,7 +395,6 @@ de:
     edit_tag: 'Tag bearbeiten'
     edit_user: "Benutzer bearbeiten"
     edit_selected_pictures: "Selektierte Bilder:"
-    element_dirty_page_leave_warning: "Sie haben ungesicherte Elemente auf der Seite. Möchten Sie wirklich fortfahren?"
     element_editor_not_found: "Bei diesem Element ist ein Fehler aufgetreten"
     element_of_type: "Element"
     element_saved: "Element wurde gespeichert."
@@ -421,6 +416,7 @@ de:
     file: "Datei"
     file_rename_error: "Datei konnte nicht umbenannt werden."
     files: "Dateien"
+    from_at: "von %{by} am %{at}"
     height: "Höhe"
     hide_element_content: "Element einklappen"
     dashboard: "Dashboard"
@@ -472,6 +468,7 @@ de:
     name: "Name"
     names: "Namen"
     navigation_name: "Navigationsname"
+    no_image_for_cropper_found: "Es wurde kein Bild gefunden. Bitte speichern Sie zuerst das Element."
     no: "Nein"
     "no pages": "Keine Seiten"
     "no users": "Keine Benutzer"
@@ -487,6 +484,7 @@ de:
     "Page created": "Seite '%{name}' wurde erstellt."
     page_for_links:
       choose_page: "%{name} wählen"
+    page_infos: 'Seiteninformationen'
     page_layout_changed_notice: "Der Seitentyp wurde verändert. Nicht mehr verwendbare Elemente wurden in den Papierkorb verschoben."
     page_properties: "Seiteneigenschaften"
     page_public: "öffentlich"
@@ -509,6 +507,8 @@ de:
     page_title: "Titel"
     page_type: "Typ"
     page_visible_in_navigation: "in der Navigation sichtbar"
+    page_was_created: "Wurde erstellt"
+    page_was_updated: "Wurde bearbeitet"
     pages:
       update:
         comma_seperated: "Durch Kommata getrennt eingeben"
@@ -579,8 +579,6 @@ de:
     unlink: "Link entfernen"
     unlock_page: "Seite verlassen"
     unlocked_page: "Seite %{name} wurde freigegeben."
-    updated_at: "Bearbeitet am"
-    updated_by: "Bearbeitet von"
     upload: "Datei hochladen"
     upload_file: "Datei(en) hochladen"
     upload_image: "Bild(er) hochladen"
@@ -645,6 +643,7 @@ de:
       default: "%d. %b. %Y, %H:%M Uhr"
       short: "%d. %B, %H:%Mh"
       long: "%A, %d. %B %Y um %H:%M Uhr"
+      page_status: "%d.%m.%Y um %H:%M Uhr"
       date: "%d.%m.%Y"
       datepicker: "%d.%m.%Y"
       time: "%H:%M"

data/config/locales/alchemy.en.yml

@@ -211,7 +211,7 @@ en:
     create_page: "Create a new subpage"
     create_user: "Create a new user"
     created_at: "Created at"
-    currently_edited_by: "This page is currently locked by"
+    currently_edited_by: "This page is locked by"
     cut_element: "Cut this element."
     delete_file: "Delete this file from server."
     delete_image: "Remove this image"
@@ -232,9 +232,7 @@ en:
     edit_selected_pictures: "Edit selected pictures"
     edit_user: "Edit the user´s properties."
     element_description_missing: "WARNING! Missing description. Please check your elements.yml file."
-    element_dirty_notice: "This element has unsaved changes. Do you really want to fold it?"
     element_dirty_close_window_notice: "You have unsaved elements. Do you really want to close the elements window?"
-    element_dirty_page_leave_warning: "You have unsaved elements on this page. Do you really want to continue?"
     element_editor_not_found: "Error within this Element"
     element_of_type: "Element"
     element_saved: "Saved element."
@@ -254,6 +252,7 @@ en:
     female: "Female"
     file: "File"
     file_rename_error: "Error renaming file."
+    from_at: "from %{by} at %{at}"
     height: "Height"
     hide_element_content: "Hide this elements content."
     dashboard: "Dashboard"
@@ -302,6 +301,7 @@ en:
     no_default_language_found: "No default language found."
     no_element_given: "No element given."
     no_files_in_archive: "You do not have any files in your archive."
+    no_image_for_cropper_found: "No image found. Please save the element first."
     no_images_in_archive: "You don't have any images in your archive."
     no_more_elements_to_add: "No more elements available."
     no_search_results: "Your search did not return any results."
@@ -332,6 +332,8 @@ en:
     page_title: "Title"
     page_type: "Type"
     page_visible_in_navigation: "visible in the navigation"
+    page_was_created: "Was created"
+    page_was_updated: "Was updated"
     pages:
       update:
         comma_seperated: "Separate by comma"
@@ -382,7 +384,7 @@ en:
     successfully_added_element: "Succesfully added new element."
     successfully_saved_element_position: "Element position updated succesfully."
     swap_image: "Change image"
-    "These pictures could not be deleted, because they where in use": "These pictures could not be deleted, because they where in use: %{names}"
+    "These pictures could not be deleted, because they were in use": "These pictures could not be deleted, because they were in use: %{names}"
     insert_image: "Insert image"
     swfupload:
       cancel_uploads: "Cancel uploads"
@@ -435,6 +437,7 @@ en:
     formats:
       default: "%a, %d %b %Y %H:%M:%S %z"
       short: "%d %b %H:%M"
+      page_status: "%m.%d.%Y %H:%M"
       long: "%B %d, %Y %H:%M"
       date: "%Y-%m-%d"
       datepicker: "%Y-%m-%d"

data/config/routes.rb

@@ -2,6 +2,8 @@ Alchemy::Engine.routes.draw do
 
   root :to => 'pages#show'
 
+  get '/sitemap.xml' => 'pages#sitemap', format: 'xml'
+
   get '/admin' => redirect(
     "#{Alchemy::MountPoint.get}/admin/dashboard"
   )
@@ -86,6 +88,7 @@ Alchemy::Engine.routes.draw do
         post :visit
         get :configure
         get :preview
+        get :info
       end
     end
 

data/db/migrate/{20130214233001_alchemy_two_point_five.rb → 20130827094554_alchemy_two_point_six.rb}

@@ -1,27 +1,30 @@
-# This is a compressed migration for creating all Alchemy 2.5 tables at once.
+# This is a compressed migration for creating all Alchemy 2.6 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 AlchemyTwoPointFive < ActiveRecord::Migration
+class AlchemyTwoPointSix < 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.string   "file_name"
+      t.string   "file_mime_type"
+      t.integer  "file_size"
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.datetime "created_at",      :null => false
       t.datetime "updated_at",      :null => false
       t.text     "cached_tag_list"
+      t.string   "file_uid"
     end
 
+    add_index "alchemy_attachments", ["file_uid"], :name => "index_alchemy_attachments_on_file_uid"
+
     create_table "alchemy_cells", :force => true do |t|
       t.integer  "page_id"
       t.string   "name"
@@ -268,7 +271,7 @@ class AlchemyTwoPointFive < ActiveRecord::Migration
       t.string   "login"
       t.string   "email"
       t.string   "gender"
-      t.string   "role",                                  :default => "registered"
+      t.string   "roles",                                 :default => "registered"
       t.string   "language"
       t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
       t.string   "password_salt",          :limit => 128, :default => "",           :null => false
@@ -291,6 +294,26 @@ class AlchemyTwoPointFive < ActiveRecord::Migration
     add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
     add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
     add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
+    add_index "alchemy_users", ["roles"], :name => "index_alchemy_users_on_roles"
+
+    create_table "events", :force => true do |t|
+      t.string   "name"
+      t.string   "hidden_name"
+      t.datetime "starts_at"
+      t.datetime "ends_at"
+      t.text     "description"
+      t.decimal  "entrance_fee", :precision => 6, :scale => 2
+      t.boolean  "published"
+      t.integer  "location_id"
+      t.datetime "created_at",                                 :null => false
+      t.datetime "updated_at",                                 :null => false
+    end
+
+    create_table "locations", :force => true do |t|
+      t.string   "name"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
 
     create_table "taggings", :force => true do |t|
       t.integer  "tag_id"