alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -1,6 +1,6 @@
 <% cache(content) do %>
   <div class="essence_text content_editor<%= options[:display_inline].to_s == 'true' ? ' display_inline' : '' %>" id="<%= content.dom_id %>">
-    <%= label_and_remove_link(content) %>
+    <%= content_label(content) %>
     <%= text_field_tag(
       content.form_field_name,
       content.ingredient,

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

@@ -2,7 +2,7 @@
 <%- options = local_assigns.fetch(:options, {}) -%>
 <%- html_options = local_assigns.fetch(:html_options, {}) -%>
 <%- if content.essence.link.blank? ||
-    content_settings_value(content, :disable_link, options) -%>
+    content.settings_value(:disable_link, options) -%>
 <%= content.ingredient -%>
 <%- else -%>
 <%= link_to(

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

@@ -1,23 +1,21 @@
-<% if options[:crop] && content.ingredient && content.ingredient.can_be_cropped_to(options[:image_size], options[:upsample]) %>
-<%= link_to_dialog(
-  render_icon('crop'),
-  alchemy.crop_admin_essence_picture_path(content.essence, options: options.to_json),
-  {
-    size: "1000x615",
-    title: _t('Edit Picturemask'),
-    image_loader: false,
-    padding: false
-  },
-  {
-    title: _t('Edit Picturemask')
-  }
-) %>
+<% linkable = content.settings_value(:linkable, options) != false %>
+
+<% if content.essence && content.essence.allow_image_cropping?(options) %>
+  <%= link_to_dialog render_icon('crop'),
+    alchemy.crop_admin_essence_picture_path(
+      content.essence,
+      options: content.settings.update(options).to_json
+    ), {
+      size: "1000x615",
+      title: Alchemy.t('Edit Picturemask'),
+      image_loader: false,
+      padding: false
+    }, {title: Alchemy.t('Edit Picturemask')} %>
 <%- else -%>
-<a href="#" class="disabled"><%= render_icon('crop') %></a>
+  <a href="#" class="disabled"><%= render_icon('crop') %></a>
 <%- end -%>
 
-<%= link_to_dialog(
-  render_icon('swap_picture'),
+<%= link_to_dialog render_icon('swap_picture'),
   alchemy.admin_pictures_path(
     element_id: content.element,
     content_id: content.id,
@@ -25,37 +23,32 @@
     options: options.to_json
   ),
   {
-    title: (content.ingredient ? _t(:swap_image) : _t(:insert_image)),
+    title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
     size: '780x580',
     padding: false
   },
-  title: (content.ingredient ? _t(:swap_image) : _t(:insert_image))
-) %>
+  title: (content.ingredient ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)) %>
 
-<%= link_to(render_icon(:link), '', {
-  onclick: 'd = new Alchemy.LinkDialog(this); d.open(); return false;',
+<%= link_to_if linkable, render_icon(:link), '', {
+  onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
   class: content.linked? ? 'linked' : nil,
-  title: _t(:link_image),
+  title: Alchemy.t(:link_image),
   'data-content-id' => content.id,
   id: "edit_link_#{content.id}"
-}) %>
+} %>
 
-<%= link_to(render_icon('unlink'), '', {
+<%= link_to_if linkable, render_icon('unlink'), '', {
   onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
   class: content.linked? ? 'linked' : 'disabled',
-  title: _t(:unlink)
-}) %>
+  title: Alchemy.t(:unlink)
+} %>
 
-<%= link_to_dialog(
-  render_icon('edit'),
+<%= link_to_dialog render_icon('edit'),
   alchemy.edit_admin_essence_picture_path(
     id: content.essence.id,
     content_id: content.id,
     options: options.to_json
-  ),
-  {
-    title: _t(:edit_image_properties),
-    size: (options[:caption_as_textarea] ? (options[:sizes] ? '380x320' : '380x300') : (options[:sizes] ? '380x290' : '380x255'))
-  },
-  title: _t(:edit_image_properties)
-) %>
+  ), {
+    title: Alchemy.t(:edit_image_properties),
+    size: edit_picture_dialog_size(content, options)
+  }, title: Alchemy.t(:edit_image_properties) %>

data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb

@@ -2,18 +2,18 @@
   <%= link_to(
     render_icon(:link),
     '#',
-    onclick: "d = new Alchemy.LinkDialog(this); d.open(); return false;",
-    class: "icon_button#{content.linked? ? ' linked' : ''}",
+    onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
+    class: "icon_button#{content.linked? ? ' linked' : ''} link-essence",
     'data-content-id' => content.id,
-    title: _t(:place_link),
+    title: Alchemy.t(:place_link),
     id: "edit_link_#{content.id}"
   ) %>
   <%= link_to(
     render_icon(:unlink),
     '#',
     onclick: "return Alchemy.LinkDialog.removeLink(this, #{content.id})",
-    class: "icon_button unlink #{content.linked? ? 'linked' : 'disabled'}",
+    class: "icon_button unlink-essence #{content.linked? ? 'linked' : 'disabled'}",
     'data-content-id' => content.id,
-    title: _t(:unlink)
+    title: Alchemy.t(:unlink)
   ) %>
 </span>

data/app/views/alchemy/language_links/_language.html.erb

@@ -1,12 +1,18 @@
-<% css_classes = [language.code] %>
-<% css_classes << 'active' if Alchemy::Language.current.id == language.id %>
-<% css_classes << 'first' if languages.first == language %>
-<% css_classes << 'last' if languages.last == language %>
-<% link_title = options[:show_title] ? _t("#{language.code}.title", scope: 'language_links', default: language.name) : nil %>
-
 <%= link_to(
   content_tag(:span, language.label(options[:linkname])).html_safe,
-  show_alchemy_page_path(language.pages.language_roots.first, locale: language.code),
-  class: css_classes.join(" "),
-  title: link_title
+  show_alchemy_page_path(
+    language.pages.language_roots.first,
+    locale: prefix_locale?(language.code) ? language.code : nil
+  ),
+  class: [
+    language.code,
+    Alchemy::Language.current.id == language.id ? 'active' : nil,
+    languages.first == language ? 'first' : nil,
+    languages.last == language ? 'last' : nil
+  ].compact,
+  title: options[:show_title] ? Alchemy.t(
+    "#{language.code}.title",
+    scope: 'language_links',
+    default: language.name
+  ) : nil
 ) %>

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

@@ -4,7 +4,7 @@
 
 Absender:
 
-<%= Alchemy::I18n.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
+<%= Alchemy.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
 <%= @message.address %>
 <%= @message.zip %> <%= @message.city %>
 

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

@@ -4,7 +4,7 @@
 
 Sender:
 
-<%= Alchemy::I18n.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
+<%= Alchemy.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
 <%= @message.address %>
 <%= @message.zip %> <%= @message.city %>
 

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

@@ -4,7 +4,7 @@
 
 Remitente:
 
-<%= Alchemy::I18n.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
+<%= Alchemy.t(@message.salutation, scope: 'contactform.labels') %> <%= @message.firstname %> <%= @message.lastname %>
 <%= @message.address %>
 <%= @message.zip %> <%= @message.city %>
 

data/app/views/alchemy/navigation/_link.html.erb

@@ -13,7 +13,6 @@
     {
       class: (page_active?(page) ? 'active' : nil),
       title: (options[:show_title] ? page.title : nil),
-      locale: page.language_code,
       data: {'page-id' => page.id}
     }
   ) %>

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

@@ -5,15 +5,17 @@ xml.rss version: "2.0" do
 
     xml.title @page.title
     xml.description @page.meta_description
-    xml.link show_page_url(urlname: @page.urlname, locale: multi_language? ? @page.language_code : nil)
+    xml.link show_alchemy_page_url(@page)
 
     @page.feed_elements.each do |element|
       xml.item do
         xml.title element.content_for_rss_title.try(:ingredient)
         xml.description element.content_for_rss_description.try(:ingredient)
-        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), locale: multi_language? ? @page.language_code : nil)
-        xml.guid show_page_url(urlname: @page.urlname, anchor: element_dom_id(element), locale: multi_language? ? @page.language_code : nil)
+        if element.has_ingredient?('date')
+          xml.pubDate element.ingredient('date').to_s(:rfc822)
+        end
+        xml.link show_alchemy_page_url(@page, anchor: element_dom_id(element))
+        xml.guid show_alchemy_page_url(@page, anchor: element_dom_id(element))
       end
     end
   end

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

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Welcome to AlchemyCMS</title>
+    <link href='https://fonts.googleapis.com/css?family=Bitter' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <%= stylesheet_link_tag "alchemy/welcome", media: "all" %>
+  </head>
+  <body>
+    <div class="container">
+      <%= image_tag 'alchemy/alchemy-logo.svg' %>
+      <h3>You have succesfully installed AlchemyCMS!</h3>
+      <p>
+        Thank you for using Alchemy. We hope you enjoy using it as much as we do.
+      </p>
+      <p>
+        The first thing you probably want to do before creating your first page:
+      </p>
+      <ul>
+        <li><%= link_to 'Create your first admin user', Alchemy.signup_path %></li>
+        <li><%= link_to 'Read the guidelines', 'http://guides.alchemy-cms.com/stable', target: '_blank' %></li>
+      </ul>
+    </div>
+  </body>
+</html>

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

@@ -37,14 +37,14 @@
     <%= javascript_include_tag('alchemy/alchemy', "data-turbolinks-track" => true) %>
     <%= yield :javascript_includes %>
   </head>
-  <body id="alchemy" class="<%= body_class %>">
+  <body id="alchemy" class="<%= alchemy_body_class %>">
     <noscript>
-      <h1><%= _t(:javascript_disabled_headline) %></h1>
-      <p><%= _t(:javascript_disabled_text) %></p>
+      <h1><%= Alchemy.t(:javascript_disabled_headline) %></h1>
+      <p><%= Alchemy.t(:javascript_disabled_text) %></p>
     </noscript>
     <div id="overlay">
       <div id="overlay_text_box">
-        <span id="overlay_text"><%= _t(:please_wait) %></span>
+        <span id="overlay_text"><%= Alchemy.t(:please_wait) %></span>
       </div>
     </div>
     <div id="left_menu">
@@ -57,15 +57,15 @@
       <div id="logout">
         <% if current_alchemy_user %>
           <%= link_to_dialog(
-            "#{render_icon('exit module')}<label>#{_t(:leave)}</label>".html_safe,
+            "#{render_icon('exit module')}<label>#{Alchemy.t(:leave)}</label>".html_safe,
             alchemy.leave_admin_path, {
               size: "300x155",
-              title: _t("Leave Alchemy")
+              title: Alchemy.t("Leave Alchemy")
           }, {'data-alchemy-hotkey' => 'alt+q'}) %>
         <% else %>
           <%= link_to(alchemy.root_path) do %>
             <span class="module icon exit"></span>
-            <label><%= _t(:leave) %></label>
+            <label><%= Alchemy.t(:leave) %></label>
           <% end %>
         <% end %>
       </div>
@@ -74,9 +74,12 @@
     <div id="top_menu">
       <div id="sub_navigation">
         <%= admin_subnavigation %>
-        <div id="subnav_additions">
-          <%= yield(:subnav_additions) %>
-        </div>
+        <% if @locked_pages.present? %>
+          <div id="locked_pages">
+            <label><%= Alchemy.t(:locked_pages) %> &raquo;</label>
+            <%= render partial: 'alchemy/admin/pages/locked_page', collection: @locked_pages %>
+          </div>
+        <% end %>
       </div>
       <div id="toolbar">
         <%= yield(:toolbar) %>
@@ -104,6 +107,7 @@
       // Setting the correct locale for select2 dropdown replacement.
       $.extend($.fn.select2.defaults, $.fn.select2.locales['<%= ::I18n.locale %>']);
     </script>
+    <%= render 'alchemy/admin/uploader/setup' %>
     <%= yield(:javascripts) %>
   </body>
 </html>

data/bin/alchemy

@@ -20,7 +20,7 @@ class AlchemyInstaller < Thor
   desc "new PROJECT", "Creates a new Alchemy CMS project."
   method_option :database, type: :string, aliases: "-d", desc: "Type of database to use for this project. Default sqlite."
   def new(project)
-    @application = project.downcase.strip.gsub(/ /, '_')
+    @application = project.downcase.strip.tr(' ', '_')
     say welcome_message, :yellow
     say "Step 1: Creating a Rails #{rails_version} application.", :yellow
     say "Please wait...", :yellow
@@ -120,11 +120,11 @@ config/database.yml
 config/initializers/secret_token.rb
 GITIGNORE
     end
-    %x[
+    `
       cd #{@application}
       mkdir -p ./uploads
       touch ./uploads/.gitkeep
-    ]
+    `
   end
 
   def create_database_yml(type)
@@ -261,7 +261,6 @@ DATABASE
     puts "\n"
     password
   end
-
 end
 
 AlchemyInstaller.start

data/bin/rspec

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/spring

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/config/alchemy/config.yml

@@ -13,23 +13,21 @@ require_ssl: false
 #
 # The amount of time of inactivity in minutes after which the user is kicked out of his current session.
 #
-# INFO: This is only active in production environments
+# NOTE: This is only active in production environments
 #
 auto_logout_time: 30
 
 # === Redirect Options
 #
-#   redirect_index            [Boolean]   # You can disable the redirect to first child page for not public pages.
 #   redirect_to_public_child  [Boolean]   # Alchemy redirects to the first public child page found, if a page is not visible.
 #
-redirect_index: true
 redirect_to_public_child: true
 
 # === Page caching
 #
-# Enable/Disable pagecaching globally.
+# Enable/Disable page caching globally.
 #
-# Hint: You can enable/disable page caching for single Alchemy::PageLayouts in the page_layout.yml file.
+# NOTE: You can enable/disable page caching for single Alchemy::PageLayouts in the page_layout.yml file.
 #
 cache_pages: true
 
@@ -42,7 +40,7 @@ cache_pages: true
 # ==== Config Options:
 #
 #   show_root [Boolean] # Show language root page in sitemap?
-#   show_flag [Boolean] # Enables the Checkbox in Page#update overlay. So your customer can set the visibilit of pages in the sitemap.
+#   show_flag [Boolean] # Enables the Checkbox in Page#update overlay. So your customer can set the visibility of pages in the sitemap.
 #
 sitemap:
   show_root: true
@@ -50,11 +48,11 @@ sitemap:
 
 # === URL nesting
 #
-# Since Alchemy 2.6.0 page urls are nested, respectivley to their tree position.
+# Since Alchemy 2.6.0, page urls are nested, respectively to their tree position.
 #
 # Disable +url_nesting+ to get slug only urls.
 #
-# NOTE: After changing the url_nesting, you should run one of these convert rake task:
+# NOTE: After changing the url_nesting, you should run one of these convert rake tasks:
 #
 #   rake alchemy:convert:urlnames:to_nested
 #   rake alchemy:convert:urlnames:to_slug
@@ -73,7 +71,7 @@ url_nesting: true
 #   preprocess_image_resize   [String]        # Use this option to resize images to that value. Downsizing example: '1000x1000>' (Default nil)
 #   image_output_format       [String]        # The global image output format setting.
 #
-# TIP: You can always override the output format in the options of your Essence. I.E. {:format => :gif}
+# NOTE: You can always override the output format in the options of your Essence. I.E. {:format => :gif}
 #
 output_image_jpg_quality: 85
 preprocess_image_resize:
@@ -88,11 +86,11 @@ default_language:
 
 # === Mailer Settings:
 #
-# To send Mails via contact forms you can create your form fields here and set which fields are to be validated.
+# To send emails via contact forms, you can create your form fields here and set which fields are to be validated.
 #
 # === Validating fields:
 #
-# Pass the field name as symbol and a message_id (will be translated) to :validate_fields:
+# Pass the field name as a symbol and a message_id (will be translated) to :validate_fields:
 #
 # ==== Options:
 #
@@ -151,12 +149,13 @@ uploader:
   upload_limit: 50
   file_size_limit: 100
   allowed_filetypes:
-    pictures:
-    - :jpg
-    - :jpeg
-    - :gif
-    - :png
-    attachments: ['*']
+    alchemy/attachments:
+    - '*'
+    alchemy/pictures:
+    - jpg
+    - jpeg
+    - gif
+    - png
 
 # === Link Target Options
 #