alchemy_cms 2.5.0.rc3 → 2.5.0

data/app/assets/stylesheets/alchemy/login.scss

@@ -3,7 +3,7 @@ div#alchemy_greeting {
   margin-right: auto;
   margin-left: auto;
   padding: 2*$default-padding;
-  margin-top: 1em;
+  margin-top: -4em;
   text-align: center;
 
   p {

data/app/assets/stylesheets/alchemy/menubar.css.scss

@@ -94,11 +94,13 @@
       @include inline-block;
       list-style-type: none;
 
-      a {
+      a, button {
         line-height: 14px;
         @include default-button-style;
         font-weight: normal;
         text-decoration: none !important;
+        color: $text-color !important;
+        font-family: $default-font-face;
       }
     }
   }

data/app/assets/stylesheets/alchemy/mixins.scss

@@ -124,3 +124,12 @@
     border-color: transparent transparent $light_yellow transparent;
   }
 }
+
+@mixin thumbnail-background {
+  display: table-cell;
+  background-color: $dark-gray;
+  text-align: center;
+  vertical-align: middle;
+  padding: 0;
+  line-height: 0;
+}

data/app/assets/stylesheets/alchemy/notices.scss

@@ -45,7 +45,7 @@ div.error {
   color: #931f23;
 }
 
-div.warning {
+div.warning, div.warn {
   @include message;
   background-color: #f7efb8;
   color: #756f47;

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -4,7 +4,7 @@ div#sort_panel {
   position: fixed;
   top: 27px;
   left: 0;
-  z-index: 10;
+  z-index: 1;
   width: 100%;
   border-bottom: $default-border;
 

data/app/controllers/alchemy/admin/dashboard_controller.rb

@@ -1,14 +1,57 @@
+require 'net/http'
+
 module Alchemy
   module Admin
     class DashboardController < Alchemy::Admin::BaseController
 
       def index
-        @alchemy_version = Alchemy::VERSION
-        @clipboard_items = session[:clipboard]
         @last_edited_pages = Page.all_last_edited_from(current_user)
-        @locked_pages = Page.all_locked
+        @locked_pages = Page.from_current_site.all_locked
         @online_users = User.logged_in.to_a - [current_user]
         @first_time = current_user.sign_in_count == 1 && current_user.last_sign_in_at.nil?
+        @sites = Site.scoped
+      end
+
+      def info
+        @alchemy_version = Alchemy.version
+        render :layout => false
+      end
+
+      def update_check
+        @alchemy_version = Alchemy.version
+        if @alchemy_version < latest_alchemy_version
+          render :text => 'true'
+        else
+          render :text => 'false'
+        end
+      rescue UpdateServiceUnavailable => e
+        render :text => e, :status => 503
+      end
+
+    private
+
+      def alchemy_tags
+        url = URI.parse('https://api.github.com/repos/magiclabs/alchemy_cms/tags')
+        request = Net::HTTP::Get.new(url.path)
+        connection = Net::HTTP.new(url.host, url.port)
+        connection.use_ssl = true
+        connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        response = connection.request(request)
+        if response.code == "200"
+          JSON.parse(response.body)
+        else
+          raise UpdateServiceUnavailable
+        end
+      end
+
+      def alchemy_versions
+        return [] if alchemy_tags.blank?
+        alchemy_tags.collect { |h| h['name'] }.sort
+      end
+
+      def latest_alchemy_version
+        return '' if alchemy_versions.blank?
+        alchemy_versions.last.gsub(/^v/, '')
       end
 
     end

data/app/controllers/alchemy/admin/essence_pictures_controller.rb

@@ -3,6 +3,8 @@ module Alchemy
     class EssencePicturesController < Alchemy::Admin::BaseController
 
       helper "alchemy/admin/contents"
+      helper "alchemy/admin/essences"
+      helper "alchemy/url"
 
       def edit
         @essence_picture = EssencePicture.find(params[:id])
@@ -49,6 +51,7 @@ module Alchemy
         @essence_picture = EssencePicture.find(params[:id])
         @essence_picture.update_attributes(params[:essence_picture])
         @content = Content.find(params[:content_id])
+        @options = params[:options] || {}
       end
 
       def assign

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -15,7 +15,7 @@ module Alchemy
 
       def index
         @page_root = Page.language_root_for(session[:language_id])
-        @locked_pages = Page.all_locked_by(current_user)
+        @locked_pages = Page.from_current_site.all_locked_by(current_user)
         @languages = Language.all
         if !@page_root
           if @languages.length == 1
@@ -56,7 +56,9 @@ module Alchemy
           source_page = Page.find(params[:paste_from_clipboard])
           @page = Page.copy(source_page, {
             :parent_id => params[:page][:parent_id],
-            :language => parent.language
+            :language => parent.language,
+            :name => params[:page][:name],
+            :title => params[:page][:name]
           })
           if source_page.children.any?
             source_page.copy_children_to(@page)
@@ -81,7 +83,7 @@ module Alchemy
           redirect_to admin_pages_path
         else
           @page.lock(current_user)
-          @locked_pages = Page.all_locked_by(current_user)
+          @locked_pages = Page.from_current_site.from_current_site.all_locked_by(current_user)
         end
         @layoutpage = @page.layoutpage?
       end
@@ -135,10 +137,8 @@ module Alchemy
         end
         @area_name = params[:area_name]
         @content_id = params[:content_id]
-        @attachments = Attachment.all.collect { |f| [f.name, download_attachment_path(:id => f.id, :name => f.name)] }
+        @attachments = Attachment.all.collect { |f| [f.name, download_attachment_path(:id => f.id, :name => f.urlname)] }
         if params[:link_urls_for] == "newsletter"
-          # TODO: links in newsletters has to go through statistic controller. therfore we have to put a string inside the content_rtfs and replace this string with recipient.id before sending the newsletter.
-          #@url_prefix = "#{current_server}/recipients/reacts"
           @url_prefix = current_server
         end
         if multi_language?
@@ -161,7 +161,7 @@ module Alchemy
         # fetching page via before filter
         @page.unlock
         flash[:notice] = _t("unlocked_page", :name => @page.name)
-        @pages_locked_by_user = Page.all_locked_by(current_user)
+        @pages_locked_by_user = Page.from_current_site.all_locked_by(current_user)
         respond_to do |format|
           format.js
           format.html {

data/app/controllers/alchemy/attachments_controller.rb

@@ -29,7 +29,7 @@ module Alchemy
   private
 
     def load_attachment
-      @attachment = Attachment.find(params[:id])
+      @attachment = Attachment.where(:id => params[:id]).first
     end
 
   end

data/app/controllers/alchemy/base_controller.rb

@@ -11,7 +11,7 @@ module Alchemy
     before_filter :mailer_set_url_options
     before_filter :store_user_request_time
 
-    helper_method :current_server, :current_site
+    helper_method :current_server, :current_site, :multi_site?
 
     # Returns a host string with the domain the app is running on.
     def current_server
@@ -36,6 +36,10 @@ module Alchemy
       Language.published.count > 1
     end
 
+    def multi_site?
+      Site.count > 1
+    end
+
     def raise_not_found_error
       raise ActionController::RoutingError.new('Not Found')
     end

data/app/helpers/alchemy/admin/essences_helper.rb

@@ -125,6 +125,27 @@ module Alchemy
         render :partial => 'alchemy/admin/contents/missing', :locals => {:element => element, :name => name, :options => options}
       end
 
+      def essence_picture_thumbnail(content, options)
+        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;"
+        )
+      end
+
     end
   end
 end

data/app/models/alchemy/attachment.rb

@@ -25,7 +25,9 @@ module Alchemy
     end
 
     def urlname
-      ::CGI.escape(read_attribute(:filename).split('.').first)
+      parts = filename.split('.')
+      sfx = parts.pop
+      "#{parts.join('-')}.#{sfx}"
     end
 
     # Checks if the attachment is restricted, because it is attached on restricted pages only

data/app/models/alchemy/page.rb

@@ -131,7 +131,8 @@ module Alchemy
         differences.stringify_keys!
         attributes = source.attributes.merge(differences)
         attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY)
-        attributes.merge!('name' => "#{source.name} (#{I18n.t('Copy')})")
+        new_name = differences['name'].present? ? differences['name'] : "#{source.name} (#{I18n.t('Copy')})"
+        attributes.merge!('name' => new_name)
         page = self.new(attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY))
         page.tag_list = source.tag_list
         if page.save!
@@ -232,17 +233,17 @@ module Alchemy
 
     # Finds selected elements from page.
     #
-    # Options are:
+    # Returns only public elements by default.
+    # Pass true as second argument to get all elements.
+    #
+    # === Options are:
     #
     #     :only => Array of element names    # Returns only elements with given names
     #     :except => Array of element names  # Returns all elements except the ones with given names
     #     :count => Integer                  # Limit the count of returned elements
     #     :offset => Integer                 # Starts with an offset while returning elements
-    #     :random => Boolean                 # Returning elements randomly shuffled
-    #     :from_cell => Cell or String       # Returning elements from given cell
-    #
-    # Returns only public elements by default.
-    # Pass true as second argument to get all elements.
+    #     :random => Boolean                 # Return elements randomly shuffled
+    #     :from_cell => Cell or String       # Return elements from given cell
     #
     def find_selected_elements(options = {}, show_non_public = false)
       if options[:from_cell].class.name == 'Alchemy::Cell'
@@ -252,7 +253,9 @@ module Alchemy
         if cell
           elements = cell.elements
         else
-          raise(ActiveRecord::RecordNotFound, "Cell with name `#{options[:from_cell]}` could not be found!")
+          warn("Cell with name `#{options[:from_cell]}` could not be found!")
+          # Returns an empty relation. Can be removed with the release of Rails 4
+          elements = self.elements.where('1 = 0')
         end
       else
         elements = self.elements.not_in_cell

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

@@ -0,0 +1,38 @@
+<div class="widget">
+  <h2><%= _t('Currently locked pages') %>:</h2>
+  <table>
+  <% if @locked_pages.blank? %>
+    <tr class="even">
+      <td><%= _t('no pages') %></td>
+    </tr>
+  <% else %>
+    <% @locked_pages.each do |page| %>
+    <tr class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
+      <% if current_user.id == page.locked_by %>
+      <td>
+        <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %>
+      </td>
+      <td>
+        <small><%= _t(:me) %></small>
+      </td>
+      <td>
+        <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
+          <button class="icon_button small" title="<%= _t('explain_unlocking') %>">
+            <%= render_icon('close small') %>
+          </button>
+        <% end %>
+      </td>
+      <% else %>
+      <td>
+        <%= page.name %>
+      </td>
+      <td colspan="2">
+        <small><%= page.locker_name %></small>
+      </td>
+    <% end %>
+    </tr>
+    <% end %>
+  <% end %>
+  </table>
+</div>
+<% reset_cycle('locked_pages') %>

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

@@ -0,0 +1,22 @@
+<div class="widget">
+  <h2><%= _t('Your last updated pages') %>:</h2>
+  <table>
+  <% if @last_edited_pages.blank? %>
+    <tr class="even">
+      <td><%= _t('no pages') %></td>
+    </tr>
+  <% else %>
+    <% @last_edited_pages.each do |page| %>
+    <tr class="<%= cycle('even', 'odd', :name => 'edited_pages') %>">
+      <td>
+        <%= link_to_if((page.locked_by.blank? || page.locked_by == current_user.id), page.name, edit_admin_page_path(page)) %>
+      </td>
+      <td>
+        <small><%= l(page.updated_at) %></small>
+      </td>
+    </tr>
+    <% end %>
+  <% end %>
+  </table>
+</div>
+<% reset_cycle('edited_pages') %>

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

@@ -0,0 +1,13 @@
+<div class="widget">
+  <h2><%= Alchemy::Site.model_name.human(:count => 2) %>:</h2>
+  <table>
+    <% @sites.each do |site| %>
+    <tr class="<%= cycle('even', 'odd', :name => 'sites') %>">
+      <td>
+        <%= link_to_unless(site == Alchemy::Site.current, site.name, login_url(:protocol => 'http://', :host => site.host, :user => {:login => current_user.login}), :target => '_blank') %>
+      </td>
+      <td><small><%= site.host %></small></td>
+    </tr>
+    <% end %>
+  </table>
+</div>

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

@@ -0,0 +1,19 @@
+<div class="widget">
+  <h2><%= _t('Who else is online') %>:</h2>
+  <table>
+  <% if @online_users.blank? %>
+    <tr class="even">
+      <td><%= _t('no users') %></td>
+    </tr>
+  <% else %>
+    <% @online_users.each do |user| %>
+    <tr class="<%= cycle('even', 'odd') %>">
+      <td><%= user.name %></td>
+      <td>
+        <small><%= user.human_role_name %></small>
+      </td>
+    </tr>
+    <% end %>
+  <% end %>
+  </table>
+</div>

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

@@ -1,105 +1,39 @@
+<%= toolbar(
+  :buttons => [
+    {
+      :icon => 'info',
+      :label => _t('info'),
+      :url => alchemy.dashboard_info_path,
+      :title => _t('info'),
+      :overlay_options => {
+        :title => _t('info'),
+        :size => "420x360"
+      },
+      :if_permitted_to => [:info, :alchemy_admin_dashboard]
+    }
+  ],
+  :search => false
+) %>
+
 <div id="dashboard">
-  <div class="with_padding">
-    <h1>
-      <% if @first_time -%>
-      <%= _t('Welcome, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
-      <% else -%>
-      <%= _t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
-      <% end -%>
-    </h1>
-    <p>
-      <small><%= _t('Your last login was on %{time}', :time => l(current_user.last_sign_in_at)) unless current_user.last_sign_in_at.blank? %></small>
-    </p>
-  </div>
-  <div class="widget">
-    <h2><%= _t('Your last updated pages') %>:</h2>
-    <%- if @last_edited_pages.blank? -%>
-    <ul><li class="even"><%= _t('no pages') %></li></ul>
-    <%- else -%>
-    <ul>
-      <%- @last_edited_pages.each do |page| -%>
-      <li class="<%= cycle('even', 'odd', :name => 'edited_pages') %>"><%= link_to_if((page.locked_by.blank? || page.locked_by == current_user.id), page.name, edit_admin_page_path(page)) %> <small>(<%= l(page.updated_at) %>)</small></li>
-      <%- end -%>
-    </ul>
-    <%- end -%>
-  </div>
-  <%- reset_cycle('edited_pages') -%>
-  <div class="widget">
-    <h2><%= _t('Currently locked pages') %>:</h2>
-    <%- if @locked_pages.blank? -%>
-    <ul><li class="even"><%= _t('no pages') %></li></ul>
-    <%- else -%>
-    <ul>
-      <%- @locked_pages.each do |page| -%>
-      <li class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
-        <%- if current_user.id == page.locked_by -%>
-        <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %> <small>(<%= page.locker.name %>)</small>
-        <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
-          <button class="icon_button small" title="<%= _t('explain_unlocking') %>">
-            <%= render_icon('close small') %>
-          </button>
-        <% end %>
-        <%- else -%>
-        <%= page.name %> <small>(<%= page.locker_name %>)</small>
-        <%- end -%>
-      </li>
-      <%- end -%>
-    </ul>
-    <%- end -%>
-  </div>
-  <%- reset_cycle('locked_pages') -%>
-  <div class="widget">
-    <h2><%= _t('Who else is online') %>:</h2>
-    <%- if @online_users.blank? -%>
-    <ul><li class="even"><%= _t('no users') %></li></ul>
-    <%- else -%>
-    <ul>
-      <%- @online_users.each do |user| -%>
-      <li class="<%= cycle('even', 'odd') %>"><%= user.name %> <small>(<%= user.human_role_name %>)</small></li>
-      <%- end -%>
-    </ul>
-    <%- end -%>
+  <h1>
+    <% if @first_time -%>
+    <%= _t('Welcome, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+    <% else -%>
+    <%= _t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+    <% end -%>
+  </h1>
+  <p>
+    <small><%= _t('Your last login was on %{time}', :time => l(current_user.last_sign_in_at)) unless current_user.last_sign_in_at.blank? %></small>
+  </p>
+  <div class="column left">
+    <%= render 'locked_pages' %>
+    <%= render 'recent_pages' %>
   </div>
-</div>
-<div id="sideboard">
-  <%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
-  <p><%= _t("Version") %>: <%= @alchemy_version %></p>
-  <div class="sideboard_body" style="display: none">
-    <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 class="column right">
+    <%= render 'users' %>
+    <% if multi_site? %>
+      <%= render 'sites' %>
+    <% end %>
   </div>
 </div>
-
-<%= content_for :javascripts do %>
-<script type="text/javascript" charset="utf-8">
-  (function($) {
-
-    $('#sideboard img:first-child').click(function(e) {
-      e.preventDefault();
-      $('#sideboard .sideboard_body').toggle();
-    }).bind('mouseover', function() {
-      $(this).css({cursor: 'pointer'});
-    });
-
-  })(jQuery);
-</script>
-<% end %>