alchemy_cms 2.5.0 → 2.5.1

data/alchemy_cms.gemspec

@@ -32,7 +32,7 @@ POST_INSTALL
   s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths         = ["lib"]
 
-  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.11"]
+  s.add_runtime_dependency %q<rails>,                      ["~> 3.2.12"]
   s.add_runtime_dependency %q<devise>,                     ["~> 2.2.3"]
   s.add_runtime_dependency %q<devise-encryptable>,         ["~> 0.1.1"]
   s.add_runtime_dependency %q<awesome_nested_set>,         ["~> 2.0"]

data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee

@@ -1,4 +1,4 @@
-window.Alchemy = {} if window.Alchemy == undefined
+window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 
 Alchemy.Buttons =
 

data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee

@@ -0,0 +1,93 @@
+window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
+
+Alchemy.ElementsWindow =
+
+  init: (path, options, callback) ->
+    self = Alchemy.ElementsWindow
+    $dialog = $('<div style="display: none" id="alchemyElementWindow"></div>')
+    closeCallback = ->
+      $dialog.dialog "destroy"
+      $("#alchemyElementWindow").remove()
+      Alchemy.ElementsWindow.button.enable()
+
+    self.path = path
+    self.callback = callback
+    $dialog.html Alchemy.getOverlaySpinner(x: 420, y: 300)
+    self.dialog = $dialog
+    $('#main_content').append($dialog)
+    Alchemy.ElementsWindow.currentWindow = $dialog.dialog(
+      modal: false
+      minWidth: 420
+      minHeight: 300
+      height: $(window).height() - 88
+      title: options.texts.title
+      show: "fade"
+      hide: "fade"
+      position:
+        my: "right bottom", at: "right-4px bottom-4px"
+      closeOnEscape: false
+      create: ->
+        $dialog.before Alchemy.ElementsWindow.createToolbar(options.toolbarButtons)
+
+      open: (event, ui) ->
+        Alchemy.ElementsWindow.button.disable()
+        Alchemy.ElementsWindow.reload callback
+
+      beforeClose: ->
+        if Alchemy.isPageDirty()
+          Alchemy.openConfirmWindow
+            title: options.texts.dirtyTitle
+            message: options.texts.dirtyMessage
+            okLabel: options.texts.okLabel
+            cancelLabel: options.texts.cancelLabel
+            okCallback: closeCallback
+
+          false
+        else
+          true
+
+      close: closeCallback
+    )
+
+  button:
+    enable: ->
+      $("div#show_element_window").removeClass("disabled").find("a").removeAttr "tabindex"
+
+    disable: ->
+      $("div#show_element_window").addClass("disabled").find("a").attr "tabindex", "-1"
+
+    toggle: ->
+      if $("div#show_element_window").hasClass("disabled")
+        Alchemy.ElementsWindow.button.enable()
+      else
+        Alchemy.ElementsWindow.button.disable()
+
+  createToolbar: (buttons) ->
+    $toolbar = $("<div id=\"overlay_toolbar\"></div>")
+    btn = undefined
+    i = 0
+    while i < buttons.length
+      btn = buttons[i]
+      $toolbar.append Alchemy.ToolbarButton(
+        buttonTitle: btn.title
+        buttonLabel: btn.label
+        iconClass: btn.iconClass
+        onClick: btn.onClick
+        buttonId: btn.buttonId
+      )
+      i++
+    $toolbar
+
+  reload: ->
+    self = Alchemy.ElementsWindow
+    $.ajax
+      url: self.path
+      success: (data, textStatus, XMLHttpRequest) ->
+        self.dialog.html data
+        Alchemy.Buttons.observe "#alchemyElementWindow"
+        Alchemy.overlayObserver "#alchemyElementWindow"
+        Alchemy.Datepicker "#alchemyElementWindow input.date, #alchemyElementWindow input[type=\"date\"]"
+        self.callback.call()  if self.callback
+
+      error: (XMLHttpRequest, textStatus, errorThrown) ->
+        Alchemy.AjaxErrorHandler $dialog, XMLHttpRequest.status, textStatus, errorThrown

data/app/assets/javascripts/alchemy/alchemy.preview_window.js

@@ -22,8 +22,8 @@ if (typeof(Alchemy) === 'undefined') {
         Alchemy.PreviewWindow.currentWindow = $iframe.dialog({
           modal: false,
           title: title,
-          width: $(window).width() - 504,
-          height: $(window).height() - 78,
+          width: $(window).width() - 502,
+          height: $(window).height() - 76,
           minWidth: 600,
           minHeight: 300,
           show: "fade",

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

@@ -244,7 +244,7 @@ div#library_sidebar {
   right: 0;
   width: 232px;
   padding-top: 96px;
-  padding: 0 4*$default-padding;
+  padding: 84px 4*$default-padding 0 4*$default-padding;
   height: 100%;
   z-index: 1;
   background-color: $light-gray;
@@ -257,13 +257,13 @@ div#library_sidebar {
 div#filter_bar {
 
   .selectboxit {
-    width: 180px;
+    width: 192px;
   }
 }
 
 div#tag_list {
   @include box-sizing(border-box);
-  height: 85%;
+  height: 80%;
 
   .js_filter_field_box {
 
@@ -316,23 +316,30 @@ div#tag_list {
   }
 }
 
-div#alchemy_window_body div#tag_list ul {
-  height: 364px;
+div#alchemy_window_body {
+
+  #library_sidebar {
+    padding: 0 4*$default-padding;
+  }
+
+  div#tag_list ul {
+    height: 364px;
+  }
 }
 
 div#pictures_page_list {
 
-  h2 { margin: 0 8px }
-  h3 { padding: 0 }
+  h2 { margin: 0 2*$default-padding }
+  h3 { padding: 0 $default-padding }
 
   ul.list {
-    height: 100px;
+    max-height: 100px;
     overflow: auto;
-    margin: 8px;
+    margin: 2*$default-margin;
     background-color: $medium-gray;
 
-    ul { padding: 0 4px }
+    ul { padding: 0 $default-padding }
   }
 
-  li.even, li.odd { padding: 4px }
+  li.even, li.odd { padding: $default-padding }
 }

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

@@ -26,6 +26,9 @@ body {
   background-color: $light-gray;
   height: 100%;
   cursor: default;
+
+  // Fix for strange element window offset
+  &.pages.edit { overflow: hidden }
 }
 
 h1 {
@@ -844,6 +847,7 @@ div#overlay_toolbar {
   background: $medium-gray url('shading.png') repeat-x 0 -42px;
   border: $default-border;
   height: 44px;
+  border-top-style: none;
   border-left-style: none;
   border-right-style: none;
   padding: $default-padding;

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

@@ -319,10 +319,11 @@ select {
  * Author: @gregfranko
  */
 
-form td.select .selectboxit {
+td.select .selectboxit {
 
   .selectboxit-text {
     line-height: 17px !important;
+    max-width: 80% !important;
   }
 }
 

data/app/assets/stylesheets/alchemy/jquery-ui.scss

@@ -1473,6 +1473,7 @@ button.ui-button::-moz-focus-inner {
   padding: 8px 12px;
   position: relative;
   margin-bottom: 0;
+  @include border-bottom-radius(0)
 }
 
 #alchemy .ui-dialog .ui-dialog-title {

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

@@ -88,7 +88,7 @@
     height: auto;
 
     li {
-      height: auto;
+      height: 35px;
       margin: 0 $default-padding 0 0;
       padding: 0;
       @include inline-block;

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

@@ -90,6 +90,7 @@ td.checkbox {
 
 td.value {
   padding-top: 4px;
+  overflow: hidden;
 
   p {
     @include inline-block;

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

@@ -2,6 +2,8 @@ module Alchemy
   module Admin
     class ContentsController < Alchemy::Admin::BaseController
 
+      helper "alchemy/admin/essences"
+
       def new
         @element = Element.find(params[:element_id])
         @contents = @element.available_contents

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

@@ -30,28 +30,54 @@ module Alchemy
 
     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)
+      # Returns latest alchemy version.
+      def latest_alchemy_version
+        versions = get_alchemy_versions
+        return '' if versions.blank?
+        # reject any non release version
+        versions.reject! { |v| v =~ /[a-z]/ }
+        versions.sort.last
+      end
+
+      # Get alchemy versions from rubygems or github, if rubygems failes.
+      def get_alchemy_versions
+        # first we try rubygems.org
+        response = query_rubygems
         if response.code == "200"
-          JSON.parse(response.body)
+          alchemy_versions = JSON.parse(response.body)
+          alchemy_versions.collect { |h| h['number'] }.sort
         else
-          raise UpdateServiceUnavailable
+          # rubygems.org not available?
+          # then we try github
+          response = query_github
+          if response.code == "200"
+            alchemy_tags = JSON.parse(response.body)
+            alchemy_tags.collect { |h| h['name'] }.sort
+          else
+            # no luck at all?
+            raise UpdateServiceUnavailable
+          end
         end
       end
 
-      def alchemy_versions
-        return [] if alchemy_tags.blank?
-        alchemy_tags.collect { |h| h['name'] }.sort
+      # Query the RubyGems API for alchemy versions.
+      def query_rubygems
+        make_api_request('https://rubygems.org/api/v1/versions/alchemy_cms.json')
       end
 
-      def latest_alchemy_version
-        return '' if alchemy_versions.blank?
-        alchemy_versions.last.gsub(/^v/, '')
+      # Query the GitHub API for alchemy tags.
+      def query_github
+        make_api_request('https://api.github.com/repos/magiclabs/alchemy_cms/tags')
+      end
+
+      # Make a HTTP API request for given request url.
+      def make_api_request(request_url)
+        url = URI.parse(request_url)
+        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
+        connection.request(request)
       end
 
     end

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

@@ -107,7 +107,7 @@ module Alchemy
           @notice = _t("Page saved", :name => @page.name)
           @while_page_edit = request.referer.include?('edit')
         else
-          render_remote_errors(@page, "#alchemyOverlay button.button")
+          render_remote_errors(@page)
         end
       end
 

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

@@ -105,14 +105,22 @@ module Alchemy
         if request.delete? && params[:picture_ids].present?
           pictures = Picture.find(params[:picture_ids])
           names = []
+          not_deletable = []
           pictures.each do |picture|
-            next unless picture.deletable?
-            names << picture.name
-            picture.destroy
+            if picture.deletable?
+              names << picture.name
+              picture.destroy
+            else
+              not_deletable << picture.name
+            end
+          end
+          if not_deletable.any?
+            flash[:warn] = _t("These pictures could not be deleted, because they where in use", :names => not_deletable.to_sentence)
+          else
+            flash[:notice] = _t("Pictures deleted successfully", :names => names.to_sentence)
           end
-          flash[:notice] = _t("Pictures deleted successfully", :names => names.to_sentence)
         else
-          flash[:notice] = _t("Could not delete Pictures")
+          flash[:warn] = _t("Could not delete Pictures")
         end
       rescue Exception => e
         flash[:error] = e.message

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -53,5 +53,14 @@ module Alchemy
       session[:screen_size] = params[:user_screensize]
     end
 
+    # Ovewriting the default of Devise
+    def after_sign_out_path_for(resource_or_scope)
+      if request.referer.blank? || request.referer.to_s =~ /admin/
+        root_path
+      else
+        request.referer
+      end
+    end
+
   end
 end

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

@@ -546,6 +546,11 @@ module Alchemy
         end
       end
 
+      # Appends the current controller and action to body as css class.
+      def body_class
+        "#{controller_name} #{action_name}"
+      end
+
     end
   end
 end

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

@@ -126,6 +126,7 @@ module Alchemy
       end
 
       def essence_picture_thumbnail(content, options)
+        return if content.ingredient.blank?
         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,

data/app/helpers/alchemy/essences_helper.rb

@@ -134,8 +134,46 @@ module Alchemy
     #   :disable_link => true                          # You can surpress the link of an EssencePicture. Default false
     #
     def render_essence_view(content, options = {}, html_options = {})
-      defaults = {:show_caption => true, :disable_link => false}
-      render_essence(content, :view, {:for_view => defaults.update(options)}, html_options)
+      render_essence(content, :view, {:for_view => options}, html_options)
+    end
+
+    # Renders a essence picture
+    #
+    def render_essence_picture_view(content, options, html_options)
+      options = {:show_caption => true, :disable_link => false}.update(options)
+      return if content.essence.picture.blank?
+      if content.essence.caption.present? && options[:show_caption]
+        caption = content_tag(:figcaption, content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption")
+      end
+      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 => (caption || content.essence.css_class.blank? ? nil : content.essence.css_class)
+        }.merge(caption ? {} : html_options)
+      )
+      output = caption ? img_tag + caption : img_tag
+      if content.essence.link.present? && !options[:disable_link]
+        output = link_to(url_for(content.essence.link), {
+          :title => content.essence.link_title.blank? ? nil : content.essence.link_title,
+          :target => (content.essence.link_target == "blank" ? "_blank" : nil),
+          'data-link-target' => content.essence.link_target.blank? ? nil : content.essence.link_target
+        }) do
+          output
+        end
+      end
+      if caption
+        content_tag(:figure, output, {class: content.essence.css_class.blank? ? nil : content.essence.css_class}.merge(html_options))
+      else
+        output
+      end
     end
 
   end

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

@@ -7,7 +7,7 @@
     <tr>
       <td class="label"><%= f.label "caption" %></td>
       <td class="input">
-        <%- if @options[:caption_as_textarea] -%>
+        <%- if @options[:caption_as_textarea] == 'true' -%>
         <%= f.text_area "caption", :class => 'thin_border' %>
         <%- else -%>
         <%= f.text_field "caption", :class => 'thin_border' %>
@@ -43,7 +43,7 @@
       </td>
     </tr>
     <%- end -%>
-    <%- if @options[:image_float_selector] -%>
+    <%- if @options[:image_float_selector] == 'true' -%>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
       <td class="select">

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

@@ -2,5 +2,7 @@
   Alchemy.ImageCropper.destroy();
   Alchemy.closeCurrentWindow();
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
+<% if @content.ingredient %>
   $('.thumbnail_background img', '#<%= content_dom_id(@content) %>').replaceWith('<%= essence_picture_thumbnail(@content, @options) %>');
+<% end %>
 })(jQuery);

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

@@ -1,39 +1 @@
-<% 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)
-) %>
-
-<% if content.essence.caption.present? && options[:show_caption] %>
-  <% caption = content_tag(:figcaption, content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") %>
-<figure>
-<% end %>
-
-  <% if content.essence.link.blank? || options[:disable_link] %>
-
-    <%= caption ? img_tag + caption : img_tag %>
-
-  <% else %>
-
-    <%= link_to(url_for(content.essence.link), {
-      :title => content.essence.link_title,
-      :target => (content.essence.link_target == "blank" ? "_blank" : nil),
-      'data-link-target' => content.essence.link_target
-    }) do %>
-      <%= caption ? img_tag + caption : img_tag %>
-    <% end %>
-
-  <% end %>
-<% if caption %></figure><% end %>
-<% end %>
+<%= render_essence_picture_view(content, options, html_options) %>

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

@@ -25,7 +25,7 @@
     <%= javascript_include_tag('alchemy/alchemy') %>
     <%= yield :javascript_includes %>
   </head>
-  <body id="alchemy">
+  <body id="alchemy" class="<%= body_class %>">
     <noscript>
       <h1><%= _t(:javascript_disabled_headline) %></h1>
       <p><%= _t(:javascript_disabled_text) %></p>

data/config/locales/alchemy.de.yml

@@ -306,6 +306,7 @@ de:
     searchresults_editor_info: "Dieses Element stellt die Suchergebnisse dar. Es Bedarf keinerlei Anpassung."
     element_dirty_notice: "Dieses Element hat nicht gespeicherte Änderungen. Möchten Sie es wirklich einklappen?"
     "Tags": "Tags"
+    "These pictures could not be deleted, because they where in use": "Diese Bilder konnten nicht gelöscht werden, da sie in Benutzung sind: %{names}"
     "This page is locked by %{name}": "Diese Seite wird gerade von %{name} blockiert"
     "Title": "Titel"
     "Trash": "Papierkorb"

data/config/locales/alchemy.en.yml

@@ -392,6 +392,7 @@ en:
     successfully_added_element: "Succesfully added new element."
     successfully_saved_element_position: "Element position updated succesfully."
     swap_image: "Change image"
+    "These pictures could not be deleted, because they where in use": "These pictures could not be deleted, because they where in use: %{names}"
     insert_image: "Insert image"
     swfupload:
       cancel_uploads: "Cancel uploads"

data/lib/alchemy/version.rb

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

data/spec/views/essences/essence_picture_view_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe "essences/_essence_picture_view" do
+
+  let(:essence_picture) { stub_model(Alchemy::EssencePicture, picture: stub_model(Alchemy::Picture), caption: 'This is a cute cat') }
+  let(:content) { stub_model(Alchemy::Content, name: 'image', essence_type: 'EssencePicture', essence: essence_picture) }
+
+  before do
+    ActionView::Base.send(:include, Alchemy::UrlHelper)
+    ActionView::Base.send(:include, Alchemy::EssencesHelper)
+    view.stub!(:configuration).and_return(:jpg)
+  end
+
+  context "with caption" do
+    let(:options) { {show_caption: true} }
+    let(:html_options) { {} }
+
+    subject do
+      render partial: "alchemy/essences/essence_picture_view", locals: {
+        content: content,
+        options: options,
+        html_options: html_options
+      }
+    end
+
+    it "should enclose the image in a <figure> element" do
+      should have_selector('figure img')
+    end
+
+    context "and essence with css class" do
+      before { essence_picture.css_class = 'left' }
+
+      it "should have the class on the <figure> element" do
+        should have_selector('figure.left img')
+      end
+
+      it "should not have the class on the <img> element" do
+        should_not have_selector('figure img.left')
+      end
+    end
+
+    context "and css class in the html_options" do
+      before { html_options[:class] = 'right' }
+
+      it "should have the class from the html_options on the <figure> element" do
+        should have_selector('figure.right img')
+      end
+
+      it "should not have the class from the essence on the <figure> element" do
+        should_not have_selector('figure.left img')
+      end
+
+      it "should not have the class from the html_options on the <img> element" do
+        should_not have_selector('figure img.right')
+      end
+    end
+  end
+
+  context "with link" do
+    let(:options) { {} }
+
+    subject do
+      essence_picture.link = '/home'
+      render partial: "alchemy/essences/essence_picture_view", locals: {
+        content: content,
+        options: options,
+        html_options: {}
+      }
+    end
+
+    it "should enclose the image in a link tag" do
+      should have_selector('a[href="/home"] img')
+    end
+
+    context "but disabled link option" do
+      before { options[:disable_link] = true }
+
+      it "should not enclose the image in a link tag" do
+        should_not have_selector('a img')
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -485,7 +485,7 @@ files:
 - app/assets/javascripts/alchemy/alchemy.dirty.js
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js
 - app/assets/javascripts/alchemy/alchemy.element_editor_selector.js
-- app/assets/javascripts/alchemy/alchemy.elements_window.js
+- app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee
 - app/assets/javascripts/alchemy/alchemy.file_progress.js
 - app/assets/javascripts/alchemy/alchemy.growler.js
 - app/assets/javascripts/alchemy/alchemy.gui.js.coffee
@@ -1001,6 +1001,7 @@ files:
 - spec/support/image2.PNG
 - spec/support/image3.jpeg
 - spec/url_helpers_spec.rb
+- spec/views/essences/essence_picture_view_spec.rb
 - vendor/assets/images/Jcrop.gif
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.1_0_1.js
@@ -1128,7 +1129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4006673498087041620
+      hash: 1217136868404784011
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
@@ -1265,4 +1266,5 @@ test_files:
 - spec/support/image2.PNG
 - spec/support/image3.jpeg
 - spec/url_helpers_spec.rb
+- spec/views/essences/essence_picture_view_spec.rb
 has_rdoc: 

data/app/assets/javascripts/alchemy/alchemy.elements_window.js

@@ -1,120 +0,0 @@
-if (typeof(Alchemy) === 'undefined') {
-  var Alchemy = {};
-}
-
-(function($) {
-
-  var ElementsWindow = {};
-  $.extend(Alchemy, ElementsWindow);
-
-  Alchemy.ElementsWindow = {
-
-    init: function(path, options, callback) {
-      var self = Alchemy.ElementsWindow;
-      var $dialog = $('<div style="display: none" id="alchemyElementWindow"></div>');
-      var closeCallback = function() {
-          $dialog.dialog("destroy");
-          $('#alchemyElementWindow').remove();
-          Alchemy.ElementsWindow.button.enable();
-        };
-      self.path = path;
-      self.callback = callback;
-      $dialog.html(Alchemy.getOverlaySpinner({
-        x: 420,
-        y: 300
-      }));
-      self.dialog = $dialog;
-      Alchemy.ElementsWindow.currentWindow = $dialog.dialog({
-        modal: false,
-        minWidth: 422,
-        minHeight: 300,
-        height: $(window).height() - 90,
-        title: options.texts.title,
-        show: "fade",
-        hide: "fade",
-        position: [$(window).width() - 428, 84],
-        closeOnEscape: false,
-        create: function() {
-          $dialog.before(Alchemy.ElementsWindow.createToolbar(options.toolbarButtons));
-        },
-        open: function(event, ui) {
-          Alchemy.ElementsWindow.button.disable();
-          Alchemy.ElementsWindow.reload(callback);
-        },
-        beforeClose: function() {
-          if (Alchemy.isPageDirty()) {
-            Alchemy.openConfirmWindow({
-              title: options.texts.dirtyTitle,
-              message: options.texts.dirtyMessage,
-              okLabel: options.texts.okLabel,
-              cancelLabel: options.texts.cancelLabel,
-              okCallback: closeCallback
-            });
-            return false;
-          } else {
-            return true;
-          }
-        },
-        close: closeCallback
-      });
-    },
-
-    button: {
-      enable: function() {
-        $('div#show_element_window').
-          removeClass('disabled').
-          find('a').removeAttr('tabindex');
-      },
-      disable: function() {
-        $('div#show_element_window').
-          addClass('disabled').
-          find('a').attr('tabindex', '-1');
-      },
-      toggle: function() {
-        if ($('div#show_element_window').hasClass('disabled')) {
-          Alchemy.ElementsWindow.button.enable();
-        } else {
-          Alchemy.ElementsWindow.button.disable();
-        }
-      }
-    },
-
-    createToolbar: function(buttons) {
-      var $toolbar = $('<div id="overlay_toolbar"></div>'),
-        btn;
-      for (i = 0; i < buttons.length; i++) {
-        btn = buttons[i];
-        $toolbar.append(
-        Alchemy.ToolbarButton({
-          buttonTitle: btn.title,
-          buttonLabel: btn.label,
-          iconClass: btn.iconClass,
-          onClick: btn.onClick,
-          buttonId: btn.buttonId
-        }));
-      }
-      return $toolbar;
-    },
-
-    reload: function() {
-      var self = Alchemy.ElementsWindow;
-      $.ajax({
-        url: self.path,
-        success: function(data, textStatus, XMLHttpRequest) {
-          self.dialog.html(data);
-          Alchemy.Buttons.observe('#alchemyElementWindow');
-          Alchemy.overlayObserver('#alchemyElementWindow');
-          Alchemy.Datepicker('#alchemyElementWindow input.date, #alchemyElementWindow input[type="date"]');
-          if (self.callback) {
-            self.callback.call();
-          }
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
-        }
-      });
-    }
-
-  }
-
-})(jQuery);