alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

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

@@ -1,26 +1,14 @@
-<% content_for(:subnav_additions) do %>
-<% unless @locked_pages.blank? %>
-<label><%= _t('Active Pages') %> &raquo;</label>
-<% @locked_pages.each do |page| %>
-<div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
-  <%= link_to alchemy.edit_admin_page_path(page) do %>
-  <span class="page_name" title="<%= page.name %>">
-    <%= truncate page.name, :length => 15 %>
-  </span>
+<% if @locked_pages.present? %>
+  <% content_for(:subnav_additions) do %>
+    <label><%= _t('Active Pages') %> &raquo;</label>
+    <%= render partial: 'locked_page', collection: @locked_pages %>
   <% end %>
-  <%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
-    <button class="icon_button small" title="<%= _t(:explain_unlocking) %>">
-      <%= render_icon('close small') %>
-    </button>
-  <% end %>
-</div>
-<% end %>
-<% end %>
 <% end %>
 
 <% content_for :toolbar do %>
 <div class="toolbar_buttons">
   <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
+  <div class="toolbar_spacer"></div>
   <% if can?(:flush, Alchemy::Page) %>
   <div class="button_with_label">
     <%= link_to(
@@ -63,13 +51,15 @@
   </div>
 </div>
 <div class="js_filter_field_box">
-  <input name="filter" id="search_field" class="thin_border js_filter_field">
+  <%= text_field_tag 'filter', '',
+    class: 'thin_border js_filter_field',
+    id: 'search_field',
+    placeholder: _t(:search) %>
   <%= render_icon :search %>
   <%= link_to('', '#', {
     class: "js_filter_field_clear",
     title: _t(:click_to_show_all)
   }) %>
-  <label><%= _t :search %></label>
 </div>
 <% end %>
 

data/app/views/alchemy/admin/pages/update.js.erb

@@ -26,7 +26,7 @@
   <% if @page.restricted? -%>
     $('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted');
   <% elsif @page.redirects_to_external? -%>
-    $('span.redirect_url', $page).html('&raquo; <%= _t("Redirects to") %>: <%= h @page.urlname %>');
+    $('span.redirect_url', $page).html('&raquo; <%= _t("Redirects to") %>: <%= h @page.external_urlname %>');
   <% else -%>
     $('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted');
   <% end -%>

data/app/views/alchemy/admin/partials/_remote_search_form.html.erb

@@ -11,18 +11,15 @@
   <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
   <div class="search_field">
   <%= render_icon('search') %>
-    <%= text_field_tag(
-      :query,
+    <%= text_field_tag :query,
       params['query'],
       class: 'thin_border',
-      id: "search_input_field"
-    ) %>
-    <%= link_to(
-      "",
-      url_for({
+      id: 'search_input_field',
+      placeholder: _t(:search) %>
+    <%= link_to '', url_for({
         action: 'index',
-        element_id: @element.blank? ? "" : @element.id,
-        content_id: @content.blank? ? "" : @content.id,
+        element_id: @element.blank? ? '' : @element.id,
+        content_id: @content.blank? ? '' : @content.id,
         options: @options.to_json,
         size: @size,
         overlay: true
@@ -31,8 +28,6 @@
       class: 'search_field_clear',
       id: 'search_field_clear',
       title: _t(:click_to_show_all),
-      style: (params[:query].nil? ? 'display: none' : 'display: block')
-    ) %>
+      style: params[:query].nil? ? 'display: none' : 'display: block' %>
   </div>
-  <%= submit_tag _t(:search), name: nil, class: 'button' %>
 <% end %>

data/app/views/alchemy/admin/partials/_routes.html.erb

@@ -0,0 +1,25 @@
+<script>
+  Alchemy.routes = {
+
+    admin_picture_path: function(id) {
+      return '<%= alchemy.admin_picture_path(id: 1) %>'.replace(/1/, id);
+    },
+
+    admin_trash_path: function(page_id) {
+      var url = '<%= alchemy.admin_trash_path %>';
+      if (page_id) url += '?page_id=' + page_id;
+      return url;
+    },
+
+    fold_admin_element_path: function(id) {
+      return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
+    },
+
+    list_admin_elements_path: '<%= alchemy.list_admin_elements_path %>',
+    order_admin_contents_path: '<%= alchemy.order_admin_contents_path %>',
+    order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
+    order_admin_pages_path: '<%= alchemy.order_admin_pages_path %>',
+    link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>'
+
+  };
+</script>

data/app/views/alchemy/admin/partials/_search_form.html.erb

@@ -4,19 +4,17 @@
         rescue NameError
           self
         end -%>
-<%- url ||= url_scope.url_for(:action => 'index') -%>
-<%= form_tag(url, :method => :get, class: 'search_form') do %>
+<%- url ||= url_scope.url_for(action: 'index') -%>
+<%= form_tag(url, method: 'get', class: 'search_form') do %>
   <div class="search_field">
     <%= render_icon('search') %>
-    <%= text_field_tag("query", params['query'], :class => 'thin_border', :id => "search_input_field") %>
-    <%= link_to(
-        "",
-        url,
-        :class => "search_field_clear",
-        :id => "search_field_clear",
-        :title => _t(:click_to_show_all),
-        :style => (params[:query].nil? ? "display: none" : "display: block")
-      ) %>
+    <%= text_field_tag 'query', params['query'],
+      class: 'thin_border', id: 'search_input_field',
+      placeholder: _t(:search) %>
+    <%= link_to '', url,
+        class: 'search_field_clear',
+        id: 'search_field_clear',
+        title: _t(:click_to_show_all),
+        style: params[:query].nil? ? 'display: none' : 'display: block' %>
   </div>
-  <label><%= _t(:search) %></label>
 <% end %>

data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb

@@ -1,51 +1,4 @@
 <div id="image_assign_filter_and_image_sizing">
-  <div class="button_with_label">
-    <%= link_to(
-      render_icon('zoom-out'),
-      alchemy.admin_pictures_path({
-        size: "small",
-        content_id: @content,
-        element_id: @element,
-        swap: @swap,
-        query: params[:query],
-        options: @options.to_json
-      }),
-      remote: true,
-      title: _t(:small_thumbnails),
-      class: "icon_button"
-    ) %>
-    <%= link_to(
-      render_icon('zoom-equal'),
-      alchemy.admin_pictures_path({
-        size: "medium",
-        content_id: @content,
-        element_id: @element,
-        swap: @swap,
-        query: params[:query],
-        options: @options.to_json
-      }),
-      remote: true,
-      title: _t(:medium_thumbnails),
-      class: "icon_button"
-    ) %>
-    <%= link_to(
-      render_icon('zoom-in'),
-      alchemy.admin_pictures_path({
-        size: "large",
-        content_id: @content,
-        element_id: @element,
-        swap: @swap,
-        query: params[:query],
-        options: @options.to_json
-      }),
-      remote: true,
-      title: _t(:big_thumbnails),
-      class: "icon_button"
-    ) %>
-    <label><%= _t('Image size') %></label>
-    <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
-  </div>
-  <div class="toolbar_spacer"></div>
   <div class="button_with_label">
     <%= link_to_dialog(
       render_icon('upload'),
@@ -68,5 +21,58 @@
     ) %>
     <label><%= _t(:upload_image) %></label>
   </div>
+  <div class="toolbar_spacer"></div>
+  <div class="button_group">
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon('zoom-out'),
+        alchemy.admin_pictures_path({
+          size: "small",
+          content_id: @content,
+          element_id: @element,
+          swap: @swap,
+          query: params[:query],
+          options: @options.to_json
+        }),
+        remote: true,
+        title: _t(:small_thumbnails),
+        class: "icon_button"
+      ) %>
+    </div>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon('zoom-equal'),
+        alchemy.admin_pictures_path({
+          size: "medium",
+          content_id: @content,
+          element_id: @element,
+          swap: @swap,
+          query: params[:query],
+          options: @options.to_json
+        }),
+        remote: true,
+        title: _t(:medium_thumbnails),
+        class: "icon_button"
+      ) %>
+    </div>
+    <div class="button_with_label">
+      <%= link_to(
+        render_icon('zoom-in'),
+        alchemy.admin_pictures_path({
+          size: "large",
+          content_id: @content,
+          element_id: @element,
+          swap: @swap,
+          query: params[:query],
+          options: @options.to_json
+        }),
+        remote: true,
+        title: _t(:big_thumbnails),
+        class: "icon_button"
+      ) %>
+    </div>
+    <label><%= _t('Image size') %></label>
+    <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
+  </div>
   <%= render partial: 'alchemy/admin/partials/remote_search_form' %>
 </div>

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

@@ -16,38 +16,43 @@
     <% if can? :create, Alchemy::Picture %>
     <div class="toolbar_spacer"></div>
     <% end %>
-    <div class="button_with_label">
-      <%= link_to(
-        render_icon('zoom-out'),
-        alchemy.admin_pictures_path({
-          size: "small",
-          query: params[:query]
-        }),
-        title: _t(:small_thumbnails),
-        class: "icon_button please_wait"
-      ) %>
-      <%= link_to(
-        render_icon('zoom-equal'),
-        alchemy.admin_pictures_path({
-          size: "medium",
-          query: params[:query]
-        }),
-        title: _t(:medium_thumbnails),
-        class: "icon_button please_wait"
-      ) %>
-      <%= link_to(
-        render_icon('zoom-in'),
-        alchemy.admin_pictures_path({
-          size: "large",
-          query: params[:query]
-        }),
-        title: _t(:big_thumbnails),
-        class: "icon_button please_wait"
-      ) %>
+    <div class="button_group">
+      <div class="button_with_label">
+        <%= link_to(
+          render_icon('zoom-out'),
+          alchemy.admin_pictures_path({
+            size: "small",
+            query: params[:query]
+          }),
+          title: _t(:small_thumbnails),
+          class: "icon_button please_wait"
+        ) %>
+      </div>
+      <div class="button_with_label">
+        <%= link_to(
+          render_icon('zoom-equal'),
+          alchemy.admin_pictures_path({
+            size: "medium",
+            query: params[:query]
+          }),
+          title: _t(:medium_thumbnails),
+          class: "icon_button please_wait"
+        ) %>
+      </div>
+      <div class="button_with_label">
+        <%= link_to(
+          render_icon('zoom-in'),
+          alchemy.admin_pictures_path({
+            size: "large",
+            query: params[:query]
+          }),
+          title: _t(:big_thumbnails),
+          class: "icon_button please_wait"
+        ) %>
+      </div>
       <label><%= _t('Image size') %></label>
       <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
     </div>
-
     <% if can?(:flush, Alchemy::Picture) %>
       <div class="toolbar_spacer"></div>
       <%= toolbar_button(

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

@@ -26,7 +26,7 @@
   ),
   {
     title: (content.ingredient ? _t(:swap_image) : _t(:insert_image)),
-    size: '780x585',
+    size: '780x580',
     padding: false
   },
   title: (content.ingredient ? _t(:swap_image) : _t(:insert_image))

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

@@ -1,20 +1,20 @@
 <% if page.redirects_to_external? %>
   <%= link_to(
     h(page.name),
-    page.urlname,
-    :title => options[:show_title] == true ? page.title : nil,
-    :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
-    :class => external_page_css_class(page)
+    page.external_urlname,
+    title: options[:show_title] == true ? page.title : nil,
+    target: configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
+    class: external_page_css_class(page)
   ) %>
 <% else %>
   <%= link_to(
     h(page.name),
     @preview_mode ? 'javascript: void(0)' : show_alchemy_page_path(page),
     {
-      :class => (page_active?(page) ? 'active' : nil),
-      :title => (options[:show_title] ? page.title : nil),
-      :lang => page.language_code,
-      :data => {'page-id' => page.id}
+      class: (page_active?(page) ? 'active' : nil),
+      title: (options[:show_title] ? page.title : nil),
+      lang: page.language_code,
+      data: {'page-id' => page.id}
     }
   ) %>
-<% end %>
+<% end %>

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

@@ -9,8 +9,8 @@ xml.rss :version => "2.0" do
 
     @page.feed_elements.each do |element|
       xml.item do
-        xml.title element.content_for_rss_title.ingredient
-        xml.description element.content_for_rss_description.ingredient
+        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), :lang => multi_language? ? @page.language_code : nil)
         xml.guid show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)

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

@@ -9,19 +9,27 @@
     <%= stylesheet_link_tag('alchemy/admin', :media => 'screen', "data-turbolinks-track" => true) %>
     <%= stylesheet_link_tag('alchemy/print', :media => 'print', "data-turbolinks-track" => true) %>
     <%= yield :stylesheets %>
-    <script type="text/javascript" charset="utf-8">
-
+    <script>
+      // Global Alchemy JavaScript object.
+      var Alchemy = {};
       // Setting TinyMCE path.
       var tinyMCEPreInit = {
         base: '<%= Rails.application.config.assets.prefix %>/tinymce',
         suffix: '.min'
       };
-
-      // Initialize Alchemys JavaScript framework.
-      var Alchemy = {};
-      Alchemy.locale = '<%= ::I18n.locale %>';
-
+      // Store regular expression for external link url matching.
+      Alchemy.link_url_regexp = <%= link_url_regexp.inspect %>;
+      // Holds the default Alchemy TinyMCE configuration
+      Alchemy.Tinymce = {
+        defaults: {
+          plugins: '<%= Alchemy::Tinymce.plugins.join(',') %>',
+          <% Alchemy::Tinymce.init.each do |k, v| %>
+          <%= k %>: <%== v.to_json %>,
+          <% end %>
+        }
+      };
     </script>
+    <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/alchemy', "data-turbolinks-track" => true) %>
     <%= yield :javascript_includes %>
   </head>
@@ -70,11 +78,10 @@
         <%= yield(:toolbar) %>
       </div>
       <div id="user_info">
+        <%= current_alchemy_user_name %>
         <%= select_tag 'change_locale',
           options_for_select(translations_for_select, ::I18n.locale),
           class: 'alchemy_selectbox tiny' %>
-        <%= _t('Logged in as') %>
-        <%= current_alchemy_user.try(:name) %>
       </div>
     </div>
     <% end %>
@@ -82,6 +89,10 @@
     <div id="main_content">
       <%= yield %>
     </div>
+    <script>
+      // Store current locale for javascript translations.
+      Alchemy.locale = '<%= ::I18n.locale %>';
+    </script>
     <%= yield(:javascripts) %>
   </body>
 </html>

data/bin/alchemy

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-gem 'rails', '~> 4.0.2'
+gem 'rails', '~> 4.0'
 
 require 'rails/version'
 require "thor"