alchemy_cms 2.3.0 → 2.3.1

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

@@ -30,14 +30,12 @@ Alchemy.loadjQuery = function(callback) {
     head.appendChild(script);
   }
 
-  ;
-
-  getScript('/assets/jquery.min.js', function() {
+  getScript('//code.jquery.com/jquery.min.js', function() {
     if (typeof(jQuery) !== 'undefined') {
       if (thisPageUsingOtherJSLibrary) {
         jQuery.noConflict();
       }
-      callback();
+      callback(jQuery);
     }
   });
 

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

@@ -6,12 +6,20 @@ Alchemy.loadAlchemyMenuBar = function(options) {
 
   Alchemy.Menubar = {
 
+    init: function ($) {
+      var self = Alchemy.Menubar;
+      self._$ = $;
+      self.show();
+    },
+
     show: function() {
-      $('body').prepend(Alchemy.Menubar.build());
+      var self = Alchemy.Menubar;
+      self._$('body').prepend(Alchemy.Menubar.build());
     },
 
     build: function() {
-      var bar = $('<div id="alchemy_menubar"/>').append('<ul/>');
+      var self = Alchemy.Menubar;
+      var bar = self._$('<div id="alchemy_menubar"/>').append('<ul/>');
       bar.find('ul').append('<li><a href="' + options.route + '/admin">' + Alchemy.Menubar.t("to_alchemy") + '</a></li>').append('<li><a href="' + options.route + '/admin/pages/' + options.page_id + '/edit">' + Alchemy.Menubar.t("edit_page") + '</a></li>').append('<li><a href="' + options.route + '/admin/logout">' + Alchemy.Menubar.t("logout") + '</a></li>');
       return bar;
     },
@@ -43,9 +51,9 @@ Alchemy.loadAlchemyMenuBar = function(options) {
   };
 
   if (typeof(jQuery) === 'undefined') {
-    Alchemy.loadjQuery(Alchemy.Menubar.show);
+    Alchemy.loadjQuery(Alchemy.Menubar.init);
   } else {
-    Alchemy.Menubar.show();
+    Alchemy.Menubar.init(jQuery);
   }
 
 };

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

@@ -100,10 +100,7 @@
         @include default-button-style;
         font-weight: normal;
         line-height: 34px;
-
-        &:hover {
-          text-decoration: none !important;
-        }
+        text-decoration: none !important;
       }
     }
   }

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

@@ -95,6 +95,7 @@ div.sitemap_page:hover a.sitemap_pagename_link {
 }
 
 div.sitemap_left_images {
+  width: 16px;
   margin-top: 3px;
   float: left;
   margin-right: 8px;

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

@@ -340,7 +340,7 @@ module Alchemy
       #   :overlay_options        [Hash]                # Overlay options. See link_to_overlay_window helper.
       #   :if_permitted_to        [Array]               # Check permission for button. [:action, :controller]. Exactly how you defined the permission in your +authorization_rules.rb+. Defaults to controller and action from button url.
       #   :skip_permission_check  [Boolean]             # Skip the permission check. Default false. NOT RECOMMENDED!
-      #   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Default false.
+      #   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Only for buttons not opening an overlay window. Default true.
       #
       def toolbar_button(options = {})
         options.symbolize_keys!
@@ -350,7 +350,7 @@ module Alchemy
           :active => false,
           :link_options => {},
           :overlay_options => {},
-          :loading_indicator => false
+          :loading_indicator => true
         }
         options = defaults.merge(options)
         button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
@@ -365,7 +365,7 @@ module Alchemy
               }
             )
           else
-            link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? nil : ' please_wait'}", :title => options[:title]}.merge(options[:link_options]) do
+            link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? ' please_wait' : nil}", :title => options[:title]}.merge(options[:link_options]) do
               render_icon(options[:icon])
             end
           end

data/app/helpers/alchemy/pages_helper.rb

@@ -479,7 +479,7 @@ module Alchemy
               Alchemy.loadAlchemyMenuBar({
                 page_id: #{@page.id},
                 route: '#{Alchemy.mount_point}',
-                locale: '#{current_user.language}'
+                locale: '#{current_user.language || ::I18n.default_locale}'
               });
             } catch(e) {
               if(console){console.log(e)}

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

@@ -18,14 +18,15 @@
     )
   ) %>');
   Alchemy.enableButton('.disabled.button');
-  Alchemy.overlayObserver('#<%= content_dom_id(@content) %>');
   Alchemy.growl('<%= t("Successfully added content") % {:content => @content.name_for_label} %>')
 
 <% end %>
 
 <% if @content.essence_type == "Alchemy::EssencePicture" %>
 
+  <% if @content.ingredient %>
   $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
+  <% end %>
 
   <% if @contents_of_this_type.length > 1 %>
   $('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('dragable_picture');
@@ -50,5 +51,6 @@
   Alchemy.reloadPreview();
   Alchemy.closeCurrentWindow();
   Alchemy.SelectBox("#element_<%= @element.id %>");
+  Alchemy.overlayObserver('#<%= content_dom_id(@content) %>');
 
 })()

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1094,7 +1094,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4162011237072179792
+      hash: -2692259618496397345
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: