alchemy_cms 2.5.0.rc3 → 2.5.0

data/app/views/alchemy/admin/dashboard/info.html.erb

@@ -0,0 +1,57 @@
+<p class="center with_margin"><%= image_tag('alchemy/alchemy-logo.png') %></p>
+<h2 class="center with_margin">
+  <%= _t("Version") %>: <%= @alchemy_version %>
+</h2>
+<p class="center with_margin" id="update_check">
+  <%= image_tag('alchemy/ajax_loader.gif', :id => 'load_info') %>
+  <span id="update_available">
+    <%= render_icon('warn') %>
+    <%= _t 'Update available' %>
+  </span>
+  <span id="up_to_date">
+    <%= render_icon('tick') %>
+    <%= _t 'Alchemy is up to date' %>
+  </span>
+  <span id="error">
+    <%= render_icon('error') %>
+    <%= _t 'Update status unavailable' %>
+  </span>
+</p>
+<div class="info with_margin">
+  <%= render_icon('info') %>
+  <p><%= _t('Alchemy is open software and itself uses open software and free resources:') %></p>
+  <ul>
+    <li>
+      <a href="http://rubyonrails.org" target="_blank">RubyOnRails</a>
+    </li>
+    <li>
+      <a href="http://jquery.com" target="_blank">jQuery Javascript Library</a>
+    </li>
+    <li>
+      <a href="http://jqueryui.com" target="_blank">jQuery UI Javascript GUI Library</a>
+    </li>
+    <li>
+      <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE - Javascript WYSIWYG Editor</a>
+    </li>
+    <li>
+      <a href="http://swfupload.org" target="_blank">SWFUpload</a>
+    </li>
+    <li>
+      <a href="http://p.yusukekamiyamane.com" target="_blank">Fugue Icons by Yusuke Kamiyamane</a>
+    </li>
+  </ul>
+</div>
+<script type="text/javascript">
+  $('#load_info').show();
+  $.get('/admin/dashboard/update_check', function(data, textStatus, jqXHR) {
+    if (data == 'true') {
+      $('#update_available').show();
+    } else {
+      $('#up_to_date').show();
+    }
+  }).fail(function(jqXHR, textStatus, errorThrown) {
+    $('#error').show();
+  }).always(function() {
+    $('#load_info').hide();
+  });
+</script>

data/app/views/alchemy/admin/elements/create.js.erb

@@ -7,7 +7,10 @@ $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
 <% end %>
 
 <% if @page.can_have_cells? %>
-Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? _t("other Elements") : @cell.name_for_label -%>');
+if ($('#cells').length == 0) {
+  Alchemy.buildTabbedCells('<%= _t(:main_content) %>');
+}
+Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? _t(:main_content) : @cell.name_for_label -%>');
 <% end %>
 
 $element_area = $('#cell_<%= @cell_name -%>');

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

@@ -19,6 +19,7 @@ $('#element_<%= @element.id %>_errors').html('<%= @error_message %><ul><li><%= @
 $("#element_<%= @element.id %>_errors").show();
 $('div.content_editor').removeClass('validation_failed');
 $('<%= @element.contents_with_errors.map { |content| "#" + content_dom_id(content) }.join(", ") %>').addClass('validation_failed');
+Alchemy.ElementEditorSelector.scrollToElement('#element_<%= @element.id %>');
 Alchemy.Buttons.enable($el);
 
 <% end %>

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -1,49 +1,46 @@
+<div id="jscropper">
 <% if @no_image_notice %>
-<div class="with_padding">
-  <div class="info">
-    <%= render_icon('info') %>
+  <%= render_message do %>
     <%= @no_image_notice %>
-  </div>
-</div>
+  <% end %>
 <% else %>
-<div id="overlay_toolbar">
-  <%= form_for(@essence_picture, :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options), :id => 'image_cropper_form', :remote => true) do |f| %>
+  <%= render_message do %>
+    <%= _t('explain cropping') %>
+  <% end %>
+  <div class="thumbnail_background">
+    <span class="picture_content_spinner">
+      <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
+    </span>
+    <%= image_tag(show_alchemy_picture_path(@essence_picture.picture, :size => '800x600', :format => :png),
+      :id => 'imageToCrop',
+      :onload => %(
+        Alchemy.fadeImage(this, '#jscropper .picture_content_spinner');
+        Alchemy.ImageCropper.init(
+          [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
+          #{@size_x},
+          #{@size_y},
+          [#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
+          #{@ratio},
+          [#{@essence_picture.picture.image_file_width}, #{@essence_picture.picture.image_file_height}]
+        );
+      ),
+      :style => "display: none;"
+    ) %>
+  </div>
+  <%= form_for(
+    @essence_picture,
+    :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options),
+    :id => 'image_cropper_form',
+    :remote => true
+  ) do |f| %>
     <%= f.hidden_field :crop_from %>
     <%= f.hidden_field :crop_size %>
-    <%= hidden_field_tag 'content_id', @content.id %>
-    <%= f.button _t("save"), :class => 'button' %>
-  <% end %>
-  <div class="toolbar_spacer"></div>
-  <div class="button_with_label">
-    <%= link_to(render_icon('delete-small'), '#', {
+    <%= hidden_field_tag :content_id, @content.id %>
+    <%= link_to(render_icon('delete-small') + _t('Reset Imagemask'), '#', {
       :onclick => 'Alchemy.ImageCropper.reset()',
-      :class => 'icon_button',
-      :title => _t('Reset Imagemask')
+      :class => 'button with_icon'
     }) %>
-    <label><%= _t("Reset Imagemask") %></label>
-  </div>
-</div>
-
-<div id="crop_explain" class="tip">
-  <%= _t('explain cropping') %>
-</div>
-
-<div id="jscropper">
-  <%= image_tag(
-    alchemy.zoom_picture_path(
-      :id => @essence_picture.picture.id,
-      :name => @essence_picture.picture.urlname,
-      :format => @options[:format],
-      :sh => @essence_picture.picture.security_token
-    ),
-    :id => 'imageToCrop',
-    :onload => "Alchemy.ImageCropper.init(
-      [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
-      #{@size_x},
-      #{@size_y},
-      [#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
-      #{@ratio}
-    );"
-  ) %>
-</div>
+    <%= f.button _t("apply"), :class => 'button' %>
+  <% end %>
 <% end %>
+</div>

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

@@ -1,8 +1,6 @@
 (function($) {
   Alchemy.ImageCropper.destroy();
   Alchemy.closeCurrentWindow();
-  Alchemy.setElementDirty('#element_<%= @content.element.id -%>');
-<%- if @content.element.all_contents_by_type("Alchemy::EssencePicture").count > 1 -%>
-  Alchemy.SortableContents('<%= form_authenticity_token -%>');
-<%- end -%>
+  Alchemy.setElementDirty('#element_<%= @content.element.id %>');
+  $('.thumbnail_background img', '#<%= content_dom_id(@content) %>').replaceWith('<%= essence_picture_thumbnail(@content, @options) %>');
 })(jQuery);

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

@@ -2,8 +2,7 @@
   h(content.essence.attachment.name),
   alchemy.download_attachment_path(
     :id => content.essence.attachment.id,
-    :name => content.essence.attachment.urlname,
-    :format => content.essence.attachment.suffix
+    :name => content.essence.attachment.urlname
   ),
   :class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
   :title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"

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

@@ -38,24 +38,7 @@
     <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({
-            :id => content.ingredient.id,
-            :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}",
-          :onload => "Alchemy.fadeImage(this, '##{content_dom_id(content)} .picture_content_spinner');",
-          :style => "display: none;"
-        ) %>
+        <%= essence_picture_thumbnail(content, options) %>
         <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
         <% end %>
       </div>

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

@@ -3,7 +3,7 @@
   render_icon('crop'),
   alchemy.crop_admin_essence_picture_path(content.essence, :options => options),
   {
-    :size => "fullscreen",
+    :size => "816x754",
     :title => _t('Edit Picturemask')
   },
   {

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

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <title><%= render_alchemy_title %></title>
     <%= csrf_meta_tag %>
+    <meta name="robots" content="noindex">
     <%= stylesheet_link_tag('alchemy/admin', :media => 'screen') %>
     <%= stylesheet_link_tag('alchemy/print', :media => 'print') %>
     <%= yield :stylesheets %>

data/config/authorization_rules.rb

@@ -45,6 +45,7 @@ authorization do
     has_permission_on :alchemy_admin_trash, :to => [:index, :clear]
     has_permission_on :alchemy_admin_clipboard, :to => [:index, :insert, :remove, :clear]
     has_permission_on :alchemy_admin_tags, :to => [:autocomplete]
+    has_permission_on :alchemy_admin_dashboard, :to => [:info, :update_check]
   end
 
   role :editor do

data/config/locales/alchemy.de.yml

@@ -197,6 +197,7 @@ de:
     "Add global page": "Neue globale Seite"
     "Adobe Website": "Adobe Webseite"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy ist offene Software und benutzt selbst offene Software und freie Ressourcen:"
+    "Alchemy is up to date": 'Alchemy ist aktuell'
     "Change password": "Passwort ändern"
     "Choose page": "Seite wählen"
     "Cleared trash": "Der Papierkorb wurde geleert"
@@ -408,7 +409,7 @@ de:
     element_of_type: "Element"
     element_saved: "Element wurde gespeichert."
     enter_external_link: "Geben Sie hier die Adresse der Seite ein zu der Sie einen Link setzen wollen."
-    explain cropping: "Sie können den Rahmen verschieben und in der Größe verändern um den Bildausschnitt festzulegen. Wenn Sie zufrieden sind, dann klicken Sie bitte auf speichern."
+    'explain cropping': "Sie können den Rahmen verschieben und in der Größe verändern um den Bildausschnitt festzulegen. Wenn Sie zufrieden sind, dann klicken Sie bitte auf speichern."
     explain_publishing: "Die gecachte Version vom Server löschen und die aktuellen Änderungen veröffentlichen"
     explain_sitemap_dragndrop_sorting: "Tip: Halten Sie zum Sortieren der Seiten das Seitensymbol mit der Maus fest und bewegen Sie sie an ihre neue Position."
     explain_unlocking: "Die Seite verlassen und für andere Benutzer zum Bearbeiten freigeben."
@@ -456,6 +457,7 @@ de:
     mail_to: "Empfängeradresse"
     main_content: "Hauptinhalt"
     male: "Herr"
+    me: 'Ich'
     medium_thumbnails: "mittlere Miniaturbilder"
     meta_data: "Meta Daten"
     meta_description: "Meta Beschreibung"
@@ -618,6 +620,8 @@ de:
     "Now drop the files": "Lassen Sie die Dateien nun los"
     "Queued x files": "x Dateien in der Warteschlange."
     complete: 'Abgeschlossen'
+    "Update available": 'Es ist ein Update verfügbar'
+    "Update status unavailable": 'Update Status konnte nicht ermittelt werden'
     "Uploading": "Hochladen"
     "Uploaded x files": "x Dateien hochgeladen."
 

data/config/locales/alchemy.en.yml

@@ -249,6 +249,7 @@ en:
     element_of_type: "Element"
     element_saved: "Saved element."
     enter_external_link: "Please enter the URL you want to link with"
+    'explain cropping': "Move the frame and change its size to adjust the image section. Click on apply when you are satisfied."
     explain_publishing: "Publish the page and remove the cached version from the server."
     explain_sitemap_dragndrop_sorting: "Tip: Drag the pages at the icon in order to sort them."
     explain_unlocking: "Leave page and unlock it for other users."

data/config/routes.rb

@@ -8,6 +8,10 @@ Alchemy::Engine.routes.draw do
 
   get '/admin/dashboard' => 'admin/dashboard#index',
         :as => :admin_dashboard
+  get '/admin/dashboard/info' => 'admin/dashboard#info',
+        :as => :dashboard_info
+  get '/admin/dashboard/update_check' => 'admin/dashboard#update_check',
+        :as => :update_check
 
   devise_scope :user do
     get '/admin/login' => 'user_sessions#new', :as => :login
@@ -34,7 +38,7 @@ Alchemy::Engine.routes.draw do
   get '/admin/signup' => 'users#new', :as => :signup
   post '/admin/signup' => 'users#create', :as => :signup
 
-  get '/attachment/:id/download(/:name)(.:format)' => 'attachments#download',
+  get '/attachment/:id/download(/:name)' => 'attachments#download',
         :as => :download_attachment
   get '/attachment/:id/show' => 'attachments#show',
         :as => :show_attachment

data/lib/alchemy/errors.rb

@@ -42,4 +42,11 @@ module Alchemy
 
   class TinymceError < StandardError; end
 
+  class UpdateServiceUnavailable < StandardError
+    # Raised it no succesful connection to GitHub was possible
+    def message
+      "The update service is temporarily unavailable!"
+    end
+  end
+
 end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.5.0.rc3"
+  VERSION = "2.5.0"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -10,6 +10,7 @@ if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'dragonfly'
   require 'dynamic_form'
   require 'jquery-rails'
+  require 'jquery-ui-rails'
   require 'rails3-jquery-autocomplete'
   require 'kaminari'
   require 'userstamp'

data/lib/tasks/ferret.rake

@@ -2,11 +2,8 @@ namespace :ferret do
 
   desc "Updates the Ferret index."
   task :rebuild_index => :environment do
-    puts "Rebuilding Ferret index for EssenceText"
     Alchemy::EssenceText.where(:do_not_index => false).rebuild_index
-    puts "Rebuilding Ferret index for EssenceRichtext"
     Alchemy::EssenceRichtext.where(:do_not_index => false).rebuild_index
-    puts "Completed Ferret index rebuild"
   end
 
 end

data/spec/models/attachment_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Attachment do
+
+    describe '#urlname' do
+
+      context "with url characters in the filename" do
+        subject { Attachment.new(:filename => 'f#%&cking cute kitten pic.png') }
+
+        it "should escape as uri" do
+          subject.urlname.should == 'f___cking_cute_kitten_pic.png'
+        end
+      end
+
+      context "with lot of dots in the name" do
+        subject { Attachment.new(:filename => 'cute.kitten.pic.png') }
+
+        it "should convert dots in the name part into dashes" do
+          subject.urlname.should == 'cute-kitten-pic.png'
+        end
+      end
+
+    end
+
+  end
+end

data/spec/models/page_spec.rb

@@ -736,6 +736,13 @@ module Alchemy
           subject.elements.should be_empty
         end
       end
+
+      context "with different page name given" do
+        subject { Page.copy(page, {:name => 'Different name'}) }
+        it "should take this name" do
+          subject.name.should == 'Different name'
+        end
+      end
     end
 
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0.rc3
-  prerelease: 6
+  version: 2.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,6 +223,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.3
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: attachment_magic
   requirement: !ruby/object:Gem::Requirement
@@ -431,7 +447,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
+description: Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.
 email:
 - alchemy@magiclabs.de
 executables:
@@ -610,7 +626,12 @@ files:
 - app/views/alchemy/admin/contents/destroy.js.coffee
 - app/views/alchemy/admin/contents/new.html.erb
 - app/views/alchemy/admin/contents/order.js.erb
+- app/views/alchemy/admin/dashboard/_locked_pages.html.erb
+- app/views/alchemy/admin/dashboard/_recent_pages.html.erb
+- app/views/alchemy/admin/dashboard/_sites.html.erb
+- app/views/alchemy/admin/dashboard/_users.html.erb
 - app/views/alchemy/admin/dashboard/index.html.erb
+- app/views/alchemy/admin/dashboard/info.html.erb
 - app/views/alchemy/admin/elements/_add_picture.html.erb
 - app/views/alchemy/admin/elements/_element.html.erb
 - app/views/alchemy/admin/elements/_element_foot.html.erb
@@ -953,6 +974,7 @@ files:
 - spec/libraries/essence_spec.rb
 - spec/libraries/resource_spec.rb
 - spec/libraries/resources_helper_spec.rb
+- spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb
@@ -1101,16 +1123,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4006673498087041620
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: An extremly flexbile CMS for Rails 3.2
+summary: A powerful, userfriendly and flexible CMS for Rails 3
 test_files:
 - spec/alchemy_spec.rb
 - spec/config_spec.rb
@@ -1213,6 +1238,7 @@ test_files:
 - spec/libraries/essence_spec.rb
 - spec/libraries/resource_spec.rb
 - spec/libraries/resources_helper_spec.rb
+- spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/clipboard_spec.rb
 - spec/models/content_spec.rb