alchemy_cms 2.3.2 → 2.4.beta2

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

@@ -1,5 +1,5 @@
 <%= form_for([:admin, @page], :remote => true) do |f| %>
-  <div id="errors" style="display:none"></div>
+  <div id="errors"></div>
   <table id="page_names">
     <tr>
       <td class="label"><%= t("page_type") %>: </td>

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

@@ -159,8 +159,7 @@
           Alchemy.Tinymce.customInits[i].call();
         }
       }
-      jQuery('#cells').tabs();
-      jQuery('#cells').tabs('paging', { follow: true, followOnSelect: true } );
+      jQuery('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
     });
   }
 

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

@@ -6,14 +6,14 @@
     <li><a href="#create_page_tab"><%= t('New page') %></a></li>
     <li><a href="#paste_page_tab"><%= t('Paste from clipboard') %></a></li>
   </ul>
-  <div id="errors" style="display:none"></div>
+  <div id="errors"></div>
   <div id="create_page_tab">
     <%= render :partial => 'new_page_form' %>
   </div>
   <div id="paste_page_tab">
     <%= form_for([:admin, @page], :remote => true, :html => {:id => 'paste_page_form'}) do |f| %>
       <%= f.hidden_field(:parent_id) %>
-      <table id="new_page_form">
+      <table id="paste_page_form">
         <tr>
           <td class="label">
             <label for="paste_from_clipboard"><%= t("Page") %></label>

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

@@ -1,4 +1,12 @@
 (function() {
+
+Alchemy.growl("<%= @notice -%>");
+
+<% if @old_page_layout != @page.page_layout %>
+  Alchemy.ElementsWindow.reload();
+  Alchemy.growl('<%= t(:page_layout_changed_notice) %>');
+<% end %>
+
 <% if @while_page_edit %>
 
   Alchemy.reloadPreview();
@@ -25,6 +33,6 @@
 
 <% end %>
 
-  Alchemy.closeCurrentWindow();
-  Alchemy.growl("<%= @notice -%>");
+Alchemy.closeCurrentWindow();
+
 })()

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

@@ -1,8 +1,8 @@
-<%- entries.each do |entry| -%>
-  <%- entry.stringify_keys! -%>
-  <%- permitted_to?(*navigate_module(entry)) do -%>
+<% entries.each do |entry| %>
+  <% entry.stringify_keys! %>
+  <% permitted_to?(*navigate_module(entry)) do %>
   <div class="subnavi_tab<%= admin_sub_navigation_entry_active?(entry) ? ' active' : nil %>">
     <%= link_to t(entry["name"]), url_for_module_sub_navigation(entry) %>
-  <%- end -%>
   </div>
-<%- end -%>
+  <% end %>
+<% end %>

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

@@ -9,7 +9,8 @@
       [t("last_upload_only"), 'last_upload'],
       [t("recently_uploaded_only"), 'recent']
     ], params[:filter]),
-    :data => { :remote => !!request.xhr? }
+    :data => { :remote => !!request.xhr? },
+    :class => 'alchemy_selectbox'
   ) %>
 </div>
 

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

@@ -48,14 +48,14 @@
   </div>
   <%= link_to(
     image_tag(
-      alchemy.thumbnail_path(:id => picture, :size => @size),
+      alchemy.thumbnail_path(:id => picture, :size => @size, :sh => picture.security_token(:size => @size)),
       :alt => picture.name,
       :title => t('zoom_image'),
       :onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
       :style => "display: none;"
     ),
     '#',
-    :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
+    :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(:id => picture.id, :sh => picture.security_token)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
     :class => 'thumbnail_background',
     :id => 'show_in_window'
   ) %>

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

@@ -13,7 +13,8 @@
     image_tag(
       alchemy.thumbnail_path(
         :id => picture_to_assign,
-        :size => size
+        :size => size,
+        :sh => picture_to_assign.security_token(:size => size)
       ),
       :alt => picture_to_assign.name,
       :onload => "Alchemy.fadeImage(this, '#picture_to_assign_#{picture_to_assign.id} .image_spinner');",

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

@@ -2,6 +2,7 @@
   alchemy.zoom_picture_path(
     :id => @picture.id,
     :name => @picture.urlname,
-    :format => :png
+    :format => :png,
+    :sh => @picture.security_token
   )
-) %>
+) %>

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form_for resource_instance_variable, :url => resource_path(resource_instance_variable), :remote => true do |f| %>
-  <div id="errors" style="display: none"></div>
+  <div id="errors"></div>
   <table>
     <%- resource_handler.attributes.each do |attribute| -%>
     <tr>

data/app/views/alchemy/admin/users/_table.html.erb

@@ -31,14 +31,14 @@
     <td class="label mandatory"><%= f.label 'password_confirmation' %></td>
     <td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border', :autocomplete => "off", :required => action_name == 'signup' %></td>
   </tr>
-  <%- unless action_name == 'signup' -%>
+  <% if action_name == 'signup' %>
+  <%= f.hidden_field :role %>
+  <% elsif permitted_to? :update_role %>
   <tr>
     <td class="label"><%= f.label 'role' %></td>
     <td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), {}, {:class => 'alchemy_selectbox'} %></td>
   </tr>
-  <%- else -%>
-  <%= f.hidden_field :role %>
-  <%- end -%>
+  <% end %>
   <tr>
     <td>&nbsp;</td>
     <td class="checkbox">

data/app/views/alchemy/admin/users/edit.html.erb

@@ -1,6 +1,6 @@
 <div id="user_edit">
   <%= form_for [:admin, @user], :remote => true do |f| %>
-    <div id="errors" style="display: none"></div>
+    <div id="errors"></div>
     <%= render :partial => 'table', :locals => {:f => f} %>
   <% end %>
 </div>

data/app/views/alchemy/admin/users/new.html.erb

@@ -1,6 +1,6 @@
 <div id="user_edit">
   <%= form_for [:admin, @user], :remote => true do |f| %>
-    <div id="errors" style="display: none"></div>
+    <div id="errors"></div>
     <%= render :partial => 'table', :locals => {:f => f} %>
   <% end %>
 </div>

data/app/views/alchemy/base/error_notice.js.erb

@@ -1,2 +1,2 @@
 Alchemy.growl('<%= escape_javascript(@notice) %>', 'error');
-Alchemy.enableButton('button.button, a.button, input.button');
+Alchemy.Buttons.enable();

data/app/views/alchemy/base/remote_errors.js.erb

@@ -1,3 +1,2 @@
-jQuery('#errors').html('<%= escape_javascript(@errors) %>');
-jQuery('#errors').show();
-Alchemy.enableButton('<%= @button || "form button.button" %>');
+jQuery('<%= @error_div_id %>').html('<%= escape_javascript(@errors) %>').show();
+Alchemy.Buttons.enable();

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

@@ -33,15 +33,18 @@
     <div class="picture_image">
       <div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
         <%- if content.ingredient -%>
+        <% image_options = {
+          :size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
+          :crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
+          :crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
+          :crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil
+        } %>
         <%= image_tag(
-          alchemy.thumbnail_path(
+          alchemy.thumbnail_path({
             :id => content.ingredient.id,
-            :size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
-            :crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
-            :crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
-            :crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil,
-            :name => content.ingredient.urlname
-          ),
+            :name => content.ingredient.urlname,
+            :sh => content.ingredient.security_token(image_options)
+          }.merge(image_options)),
           :alt => content.ingredient.name,
           :class => 'img_paddingtop',
           :title => t("image_name") + ": #{content.ingredient.name}",

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

@@ -1,32 +1,34 @@
-<%- unless content.essence.picture.nil? -%>
-  <%- img_tag = image_tag(
-    alchemy.show_picture_url(
-      :id => content.essence.picture.id,
-      :name => content.essence.picture.urlname,
-      :size => options[:image_size],
-      :crop => options[:crop] ? 'crop' : nil,
-      :crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
-      :crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil,
-      :upsample  => options[:upsample],
-      :padding => options[:padding],
-      :format => (options[:format] or 'png'),
-      :effects => options[:effects].blank? ? nil : options[:effects]
+<% if content.essence.picture.present? %>
+
+  <% img_tag = image_tag(
+    show_alchemy_picture_url(content.essence.picture,
+      options.merge(
+        :size => options.delete(:image_size),
+        :crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
+        :crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil
+      ).delete_if { |k,v| v.blank? || k.to_sym == :show_caption || k.to_sym == :disable_link }
     ),
     {
       :alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
       :title => (content.essence.title.blank? ? nil : content.essence.title),
       :class => (content.essence.css_class.blank? ? nil : content.essence.css_class)
     }.merge(html_options)
-  ) -%>
+  ) %>
+
+  <% caption = content_tag("div", content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") %>
 
-  <%- caption = (content_tag("div", content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") unless (options[:show_caption] == false)) -%>
+  <% if content.essence.link.blank? || options[:disable_link] %>
 
-  <%- if content.essence.link.blank? || options[:disable_link] -%>
     <%= img_tag %>
-    <%- unless content.essence.caption.blank? -%>
+
+    <% if options[:show_caption] && content.essence.caption.present? %>
+
       <%= caption %>
-    <%- end -%>
-  <%- else -%>
+
+    <% end %>
+
+  <% else %>
+
     <%= link_to(
       content.essence.caption.blank? || options[:show_caption] == false ? img_tag : img_tag + caption,
       url_for(content.essence.link),
@@ -34,6 +36,7 @@
       :target => (content.essence.link_target == "blank" ? "_blank" : nil),
       'data-link-target' => content.essence.link_target
     ) %>
-  <%- end -%>
 
-<%- end -%>
+  <% end %>
+
+<% end %>

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

@@ -8,10 +8,18 @@
     <%= stylesheet_link_tag('alchemy/print', :media => 'print') %>
     <%= yield :stylesheets %>
     <script type="text/javascript" charset="utf-8">
+
+      // Setting TinyMCE path.
       var tinyMCEPreInit = {
         base: '<%= Rails.application.config.assets.prefix %>/tiny_mce',
         suffix: ''
       };
+
+      // Initialize Alchemys JavaScript framework.
+      var Alchemy = {};
+      Alchemy.locale = '<%= ::I18n.locale %>';
+      Alchemy.current_url = '<%= url_for.html_safe %>';
+
     </script>
     <%= javascript_include_tag('alchemy/alchemy') %>
     <%= yield :javascript_includes %>
@@ -60,7 +68,7 @@
         <%= yield(:toolbar) %>
       </div>
       <div id="user_info">
-        <%= select_tag 'change_locale', options_for_select(::I18n.available_locales.map { |l| [l.to_s.upcase, l] }, ::I18n.locale), :class => 'alchemy_select tiny' %>
+        <%= select_tag 'change_locale', options_for_select(::I18n.available_locales.map { |l| [l.to_s.upcase, l] }, ::I18n.locale), :class => 'alchemy_selectbox tiny' %>
         <%= t('Logged in as') %> <%= current_user.name %>
       </div>
     </div>
@@ -70,35 +78,5 @@
       <%= yield %>
     </div>
     <%= yield(:javascripts) %>
-    <script type="text/javascript" charset="utf-8">
-      jQuery(function($) {
-        // Preloading all background images from CSS files.
-        $.preloadCssImages();
-        $('html').removeClass('no-js');
-        Alchemy.locale = '<%= ::I18n.locale %>';
-        Alchemy.resizeFrame();
-        Alchemy.Tooltips();
-        Alchemy.SelectBox();
-        Alchemy.Datepicker();
-        if ($('#flash_notices').length > 0) {
-          Alchemy.Growler.fade();
-        }
-        $('a.please_wait, form button.button, form .icon_button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a, .pagination a').not('*[data-alchemy-confirm], #subnav_additions .subnavi_tab button').click(function() {
-          Alchemy.pleaseWaitOverlay();
-        });
-        // Hack for enabling tab focus for a's styled as button
-        $('a.button').attr({tabindex: 0});
-
-        // Locale select handler
-        $('select#change_locale').on('change', function(e) {
-          var url = '<%= url_for.html_safe %>';
-          delimiter = url.match(/\?/) ? '&' : '?';
-          window.location = url + delimiter + 'locale=' + $(this).val();
-        });
-      });
-      jQuery(window).resize(function() {
-        Alchemy.resizeFrame();
-      });
-    </script>
   </body>
 </html>

data/bin/alchemy

@@ -32,37 +32,33 @@ class AlchemyInstaller < Thor
     @application = project.downcase.strip.gsub(/ /, '_')
     say "Install Alchemy CMS into ./#{@application}", :yellow
     say "Generating new Rails App...", :yellow
-    
+
     if system("rails new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
-      
+
       create_database_yml if options[:database] == 'mysql'
-      
-      mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
-      mountpoint = "/" if mountpoint.empty?
-      sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-      inject_into_file "#{@application}/config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
-      
+
+      system "rake alchemy:mount"
+
       with_standard_set = yes?("\nDo you want to copy the files of Alchemy´s Standardset into your App? (y/N)")
-      
+
       if with_standard_set
         sentinel = /::Application\.configure do\s*$/
         inject_into_file "#{@application}/config/environments/production.rb", "\n  config.assets.precompile += %w( alchemy/standard_set.css )\n", { :after => sentinel, :verbose => true }
       end
-      
+
       results << system("cd ./#{@application} && rake db:create alchemy:install:migrations db:migrate alchemy:db:seed")
       results << system("cd ./#{@application} && rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}")
 
       %x[
         cd ./#{@application}
         rm ./public/index.html
-        rm ./app/views/layouts/application.html.erb
         rm ./app/assets/images/rails.png
       ]
 
       if !options[:scm].nil? && !options[:scm].empty?
-        
+
         clean_mountpoint = mountpoint.gsub('/', '')
-        
+
         %x[
           cd ./#{@application}
           rm -rf ./tmp/*
@@ -70,30 +66,30 @@ class AlchemyInstaller < Thor
           mkdir -p ./index
           mkdir -p ./uploads
         ]
-        
+
         if yes?("\nDo you want to generate a deploy script for Capistrano? (y/N)")
           system "cd #{@application} && rails g alchemy:deploy_script --scm=#{options[:scm]} --db=#{options[:database]}"
           say "\nCapifying...", :yellow
           system "cd #{@application} && capify ."
         end
-        
+
         case options[:scm]
           when 'svn'
             server = ask("\nURL of your svn server:")
             repository = ask("\nName of the repository (#{@application}):")
             repository = @application if repository.empty?
-            
+
             say "\nImporting #{@application} into #{server}/#{repository} ...", :yellow
             output = %x[svn import ./#{@application} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
-            
+
             if imported
-              
+
               say "Removing and checking out again...", :yellow
               %x[
                 rm -rf ./#{@application}
                 svn co #{server}/#{repository} #{@application}
               ]
-              
+
               say "Committing ignores...", :yellow
               %x[
                 cd ./#{@application}
@@ -103,11 +99,11 @@ class AlchemyInstaller < Thor
                 svn propset svn:ignore 'database.yml' ./config
                 svn commit -m 'set ignores'
               ]
-              
+
             else
               say "Error while importing!", :red
             end
-            
+
           when 'git'
             gitignore = <<-GIT
 log/*
@@ -119,7 +115,7 @@ public/#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}
 public/assets
 config/database.yml
 GIT
-            
+
             %x[
               cd #{@application}
               echo "#{gitignore}" > .gitignore
@@ -130,9 +126,9 @@ GIT
               git commit -am 'inital commit'
             ]
         end
-        
+
       end
-      
+
       readme = <<-EOF
 
 Successfully installed Alchemy CMS into ./#{@application}