alchemy_cms 2.2.1 → 2.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -290,7 +290,7 @@ if (typeof(Alchemy) === 'undefined') {
290
290
  var $this = $(this);
291
291
  var options = $this.data('alchemy-overlay');
292
292
  event.preventDefault();
293
- Alchemy.openWindow($this.attr('href'), options.title, options.size_x, options.size_y, options.resizable, options.overflow);
293
+ Alchemy.openWindow($this.attr('href'), options.title, options.size_x, options.size_y, options.resizable, options.modal, options.overflow);
294
294
  return false;
295
295
  });
296
296
 
@@ -51,7 +51,7 @@ module Alchemy
51
51
  end
52
52
 
53
53
  def leave
54
- ::I18n.locale = current_user.language.to_sym
54
+ ::I18n.locale = current_user.try(:language)
55
55
  render :layout => false
56
56
  end
57
57
 
@@ -0,0 +1,20 @@
1
+ $('#locked_page_<%= @page_id -%>').remove();
2
+
3
+ <% if @layoutpage %>
4
+
5
+ window.location.replace('<%= alchemy.admin_layoutpages_path -%>');
6
+
7
+ <% elsif @page_root %>
8
+
9
+ $('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
10
+ Alchemy.growl('<%= @message -%>');
11
+ Alchemy.Tooltips();
12
+ Alchemy.overlayObserver('#sitemap');
13
+
14
+ <% else %>
15
+
16
+ window.location.replace('<%= alchemy.admin_pages_path -%>');
17
+
18
+ <% end %>
19
+
20
+ Alchemy.pleaseWaitOverlay(false);
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
 
3
- VERSION = "2.2.1"
3
+ VERSION = "2.2.2"
4
4
 
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.1
4
+ version: 2.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2012-06-26 00:00:00.000000000 Z
15
+ date: 2012-07-07 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: rails
@@ -568,7 +568,7 @@ files:
568
568
  - app/views/alchemy/admin/pages/_sitemap.html.erb
569
569
  - app/views/alchemy/admin/pages/configure.html.erb
570
570
  - app/views/alchemy/admin/pages/configure_external.html.erb
571
- - app/views/alchemy/admin/pages/destroy.js.coffee
571
+ - app/views/alchemy/admin/pages/destroy.js.erb
572
572
  - app/views/alchemy/admin/pages/edit.html.erb
573
573
  - app/views/alchemy/admin/pages/flush.js.erb
574
574
  - app/views/alchemy/admin/pages/fold.js.erb
@@ -1039,7 +1039,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1039
1039
  version: '0'
1040
1040
  segments:
1041
1041
  - 0
1042
- hash: 3374243950541601124
1042
+ hash: -4110800022102781738
1043
1043
  requirements:
1044
1044
  - ImageMagick (libmagick), v6.6 or greater.
1045
1045
  rubyforge_project:
@@ -1,19 +0,0 @@
1
- $('#locked_page_<%= @page_id -%>').remove()
2
-
3
- <% if @layoutpage %>
4
-
5
- window.location.replace '<%= alchemy.admin_layoutpages_path -%>'
6
-
7
- <% elsif @page_root %>
8
-
9
- $('#sitemap').replaceWith '<%= escape_javascript(render(:partial => "sitemap")) -%>'
10
- Alchemy.growl '<%= @message -%>'
11
- Alchemy.Tooltips()^
12
-
13
- <% else %>
14
-
15
- window.location.replace '<%= alchemy.admin_pages_path -%>'
16
-
17
- <% end %>
18
-
19
- Alchemy.pleaseWaitOverlay false