alchemy_cms 2.0.3.1 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/README.md +1 -0
  2. data/alchemy_cms.gemspec +7 -5
  3. data/app/controllers/admin/elements_controller.rb +1 -0
  4. data/app/views/admin/clipboard/insert.js.erb +19 -12
  5. data/app/views/admin/elements/create.js.erb +26 -19
  6. data/lib/alchemy/version.rb +1 -1
  7. metadata +147 -150
data/README.md CHANGED
@@ -2,6 +2,7 @@ Alchemy CMS
2
2
  ===========
3
3
 
4
4
  [![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png)](http://travis-ci.org/magiclabs/alchemy_cms)
5
+ ![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
5
6
 
6
7
  About
7
8
  -----
data/alchemy_cms.gemspec CHANGED
@@ -34,13 +34,15 @@ Gem::Specification.new do |s|
34
34
  s.add_runtime_dependency(%q<tinymce_hammer>, ["~> 0.2"])
35
35
  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.1.1"])
36
36
 
37
- s.add_development_dependency(%q<rspec-rails>, [">= 2.0"])
37
+ s.add_development_dependency(%q<rspec-rails>, ["~> 2.6"])
38
38
  s.add_development_dependency(%q<sqlite3>)
39
39
 
40
- if RUBY_VERSION =~ /^1.9/
41
- s.add_development_dependency(%q<ruby-debug19>)
42
- else
43
- s.add_development_dependency(%q<ruby-debug>)
40
+ if !ENV['CI']
41
+ if RUBY_VERSION =~ /^1.9/
42
+ s.add_development_dependency(%q<ruby-debug19>)
43
+ else
44
+ s.add_development_dependency(%q<ruby-debug>)
45
+ end
44
46
  end
45
47
 
46
48
  end
data/app/controllers/admin/elements_controller.rb CHANGED
@@ -45,6 +45,7 @@ class Admin::ElementsController < AlchemyController
45
45
  @element = Element.copy(source_element, {:page_id => @page.id})
46
46
  if element_from_clipboard[:action] == 'cut'
47
47
  source_element.destroy
48
+ @cutted_element_id = source_element.id
48
49
  @clipboard.delete_if { |i| i[:id].to_i == source_element.id }
49
50
  end
50
51
  else
data/app/views/admin/clipboard/insert.js.erb CHANGED
@@ -1,14 +1,21 @@
1
1
  (function($) {
2
-
3
- <%- if params[:remove] -%>
4
- $("#<%= @item.class.to_s.downcase -%>_<%= @item.id -%>").remove();
5
- <%- if @item.class.to_s == 'Element' -%>
6
- $('#element_area').sortable('refresh');
7
- <%- end -%>
8
- Alchemy.growl('<%= _("item %{name} moved to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name} -%>');
9
- <%- else -%>
10
- Alchemy.growl('<%= _("item %{name} copied to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name} -%>')
11
- <%- end -%>
12
- $('#clipboard_button .icon.clipboard').addClass('full');
13
-
2
+
3
+ <% if params[:remove] %>
4
+
5
+ $(".element_editor[data-element-id='<%= @item.id -%>']").remove();
6
+
7
+ <% if @item.class.to_s == 'Element' %>
8
+ $('#element_area').sortable('refresh');
9
+ <% end %>
10
+
11
+ Alchemy.growl('<%= escape_javascript(_("item %{name} moved to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name}) -%>');
12
+
13
+ <% else %>
14
+
15
+ Alchemy.growl('<%= escape_javascript(_("item %{name} copied to clipboard") % {:name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name}) -%>')
16
+
17
+ <% end %>
18
+
19
+ $('#clipboard_button .icon.clipboard').addClass('full');
20
+
14
21
  })(jQuery);
data/app/views/admin/elements/create.js.erb CHANGED
@@ -1,24 +1,31 @@
1
1
  (function($) {
2
-
3
- <%- if @page.can_have_cells? -%>
4
- Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? _("other Elements") : @cell.name_for_label -%>');
5
- <%- end -%>
6
- $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
7
- $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
8
- Alchemy.growl('<%= _("successfully_added_element") -%>');
9
- Alchemy.closeCurrentWindow();
10
- <%- @element.rtf_contents.each do |content| -%>
11
- TinymceHammer.addEditor('<%= content.form_field_id -%>');
12
- <%- end -%>
13
- Alchemy.PreviewWindow.refresh();
14
- Alchemy.ElementEditorSelector.init();
15
- $('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
16
- Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
17
- Alchemy.SelectBox('#element_<%= @element.id -%> select');
18
- Alchemy.ButtonObserver('#element_<%= @element.id -%> button.button');
19
2
 
20
- <%- if @clipboard.blank? -%>
21
- $('#clipboard_button .icon.clipboard').removeClass('full');
3
+ <% if @cutted_element_id %>
4
+ $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
5
+ <% end %>
6
+
7
+ <%- if @page.can_have_cells? -%>
8
+ Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? _("other Elements") : @cell.name_for_label -%>');
9
+ <%- end -%>
10
+
11
+ $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
12
+ $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
13
+ Alchemy.growl('<%= _("successfully_added_element") -%>');
14
+ Alchemy.closeCurrentWindow();
15
+
16
+ <%- @element.rtf_contents.each do |content| -%>
17
+ TinymceHammer.addEditor('<%= content.form_field_id -%>');
18
+ <%- end -%>
19
+
20
+ Alchemy.PreviewWindow.refresh();
21
+ Alchemy.ElementEditorSelector.init();
22
+ $('.element_editor[data-element-id="<%= @element.id -%>"]').trigger('Alchemy.SelectElementEditor');
23
+ Alchemy.ElementDirtyObserver('#element_<%= @element.id -%>');
24
+ Alchemy.SelectBox('#element_<%= @element.id -%> select');
25
+ Alchemy.ButtonObserver('#element_<%= @element.id -%> button.button');
26
+
27
+ <%- if @clipboard.blank? -%>
28
+ $('#clipboard_button .icon.clipboard').removeClass('full');
22
29
  <%- end -%>
23
30
 
24
31
  })(jQuery);
data/lib/alchemy/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
 
3
- VERSION = "2.0.3.1"
3
+ VERSION = "2.0.4"
4
4
 
5
5
  end
metadata CHANGED
@@ -1,216 +1,214 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.0.4
4
5
  prerelease:
5
- version: 2.0.3.1
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Thomas von Deyen
9
- - "Robin B\xC3\xB6ning"
9
+ - Robin Böning
10
10
  - Carsten Fregin
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
-
15
- date: 2011-11-09 00:00:00 Z
16
- dependencies:
17
- - !ruby/object:Gem::Dependency
14
+ date: 2011-12-09 00:00:00.000000000 Z
15
+ dependencies:
16
+ - !ruby/object:Gem::Dependency
18
17
  name: rails
19
- prerelease: false
20
- requirement: &id001 !ruby/object:Gem::Requirement
18
+ requirement: &70179184164880 !ruby/object:Gem::Requirement
21
19
  none: false
22
- requirements:
20
+ requirements:
23
21
  - - ~>
24
- - !ruby/object:Gem::Version
25
- version: "3.0"
22
+ - !ruby/object:Gem::Version
23
+ version: '3.0'
26
24
  type: :runtime
27
- version_requirements: *id001
28
- - !ruby/object:Gem::Dependency
29
- name: authlogic
30
25
  prerelease: false
31
- requirement: &id002 !ruby/object:Gem::Requirement
26
+ version_requirements: *70179184164880
27
+ - !ruby/object:Gem::Dependency
28
+ name: authlogic
29
+ requirement: &70179184163920 !ruby/object:Gem::Requirement
32
30
  none: false
33
- requirements:
31
+ requirements:
34
32
  - - ~>
35
- - !ruby/object:Gem::Version
36
- version: "3.0"
33
+ - !ruby/object:Gem::Version
34
+ version: '3.0'
37
35
  type: :runtime
38
- version_requirements: *id002
39
- - !ruby/object:Gem::Dependency
40
- name: awesome_nested_set
41
36
  prerelease: false
42
- requirement: &id003 !ruby/object:Gem::Requirement
37
+ version_requirements: *70179184163920
38
+ - !ruby/object:Gem::Dependency
39
+ name: awesome_nested_set
40
+ requirement: &70179184163160 !ruby/object:Gem::Requirement
43
41
  none: false
44
- requirements:
42
+ requirements:
45
43
  - - ~>
46
- - !ruby/object:Gem::Version
47
- version: "2.0"
44
+ - !ruby/object:Gem::Version
45
+ version: '2.0'
48
46
  type: :runtime
49
- version_requirements: *id003
50
- - !ruby/object:Gem::Dependency
51
- name: declarative_authorization
52
47
  prerelease: false
53
- requirement: &id004 !ruby/object:Gem::Requirement
48
+ version_requirements: *70179184163160
49
+ - !ruby/object:Gem::Dependency
50
+ name: declarative_authorization
51
+ requirement: &70179184162200 !ruby/object:Gem::Requirement
54
52
  none: false
55
- requirements:
53
+ requirements:
56
54
  - - ~>
57
- - !ruby/object:Gem::Version
58
- version: "0.5"
55
+ - !ruby/object:Gem::Version
56
+ version: '0.5'
59
57
  type: :runtime
60
- version_requirements: *id004
61
- - !ruby/object:Gem::Dependency
62
- name: tvdeyen-fleximage
63
58
  prerelease: false
64
- requirement: &id005 !ruby/object:Gem::Requirement
59
+ version_requirements: *70179184162200
60
+ - !ruby/object:Gem::Dependency
61
+ name: tvdeyen-fleximage
62
+ requirement: &70179184160540 !ruby/object:Gem::Requirement
65
63
  none: false
66
- requirements:
64
+ requirements:
67
65
  - - ~>
68
- - !ruby/object:Gem::Version
66
+ - !ruby/object:Gem::Version
69
67
  version: 1.0.7
70
68
  type: :runtime
71
- version_requirements: *id005
72
- - !ruby/object:Gem::Dependency
73
- name: gettext_i18n_rails
74
69
  prerelease: false
75
- requirement: &id006 !ruby/object:Gem::Requirement
70
+ version_requirements: *70179184160540
71
+ - !ruby/object:Gem::Dependency
72
+ name: gettext_i18n_rails
73
+ requirement: &70179184159840 !ruby/object:Gem::Requirement
76
74
  none: false
77
- requirements:
78
- - - ">="
79
- - !ruby/object:Gem::Version
80
- version: "0.3"
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0.3'
81
79
  type: :runtime
82
- version_requirements: *id006
83
- - !ruby/object:Gem::Dependency
84
- name: will_paginate
85
80
  prerelease: false
86
- requirement: &id007 !ruby/object:Gem::Requirement
81
+ version_requirements: *70179184159840
82
+ - !ruby/object:Gem::Dependency
83
+ name: will_paginate
84
+ requirement: &70179184158920 !ruby/object:Gem::Requirement
87
85
  none: false
88
- requirements:
86
+ requirements:
89
87
  - - ~>
90
- - !ruby/object:Gem::Version
91
- version: "3.0"
88
+ - !ruby/object:Gem::Version
89
+ version: '3.0'
92
90
  type: :runtime
93
- version_requirements: *id007
94
- - !ruby/object:Gem::Dependency
95
- name: acts_as_ferret
96
91
  prerelease: false
97
- requirement: &id008 !ruby/object:Gem::Requirement
92
+ version_requirements: *70179184158920
93
+ - !ruby/object:Gem::Dependency
94
+ name: acts_as_ferret
95
+ requirement: &70179184157880 !ruby/object:Gem::Requirement
98
96
  none: false
99
- requirements:
97
+ requirements:
100
98
  - - ~>
101
- - !ruby/object:Gem::Version
102
- version: "0.5"
99
+ - !ruby/object:Gem::Version
100
+ version: '0.5'
103
101
  type: :runtime
104
- version_requirements: *id008
105
- - !ruby/object:Gem::Dependency
106
- name: acts_as_list
107
102
  prerelease: false
108
- requirement: &id009 !ruby/object:Gem::Requirement
103
+ version_requirements: *70179184157880
104
+ - !ruby/object:Gem::Dependency
105
+ name: acts_as_list
106
+ requirement: &70179184156820 !ruby/object:Gem::Requirement
109
107
  none: false
110
- requirements:
108
+ requirements:
111
109
  - - ~>
112
- - !ruby/object:Gem::Version
113
- version: "0.1"
110
+ - !ruby/object:Gem::Version
111
+ version: '0.1'
114
112
  type: :runtime
115
- version_requirements: *id009
116
- - !ruby/object:Gem::Dependency
117
- name: userstamp
118
113
  prerelease: false
119
- requirement: &id010 !ruby/object:Gem::Requirement
114
+ version_requirements: *70179184156820
115
+ - !ruby/object:Gem::Dependency
116
+ name: userstamp
117
+ requirement: &70179184156120 !ruby/object:Gem::Requirement
120
118
  none: false
121
- requirements:
119
+ requirements:
122
120
  - - ~>
123
- - !ruby/object:Gem::Version
121
+ - !ruby/object:Gem::Version
124
122
  version: 2.0.1
125
123
  type: :runtime
126
- version_requirements: *id010
127
- - !ruby/object:Gem::Dependency
128
- name: dynamic_form
129
124
  prerelease: false
130
- requirement: &id011 !ruby/object:Gem::Requirement
125
+ version_requirements: *70179184156120
126
+ - !ruby/object:Gem::Dependency
127
+ name: dynamic_form
128
+ requirement: &70179184155520 !ruby/object:Gem::Requirement
131
129
  none: false
132
- requirements:
130
+ requirements:
133
131
  - - ~>
134
- - !ruby/object:Gem::Version
135
- version: "1.1"
132
+ - !ruby/object:Gem::Version
133
+ version: '1.1'
136
134
  type: :runtime
137
- version_requirements: *id011
138
- - !ruby/object:Gem::Dependency
139
- name: jquery-rails
140
135
  prerelease: false
141
- requirement: &id012 !ruby/object:Gem::Requirement
136
+ version_requirements: *70179184155520
137
+ - !ruby/object:Gem::Dependency
138
+ name: jquery-rails
139
+ requirement: &70179184154900 !ruby/object:Gem::Requirement
142
140
  none: false
143
- requirements:
141
+ requirements:
144
142
  - - ~>
145
- - !ruby/object:Gem::Version
146
- version: "1.0"
143
+ - !ruby/object:Gem::Version
144
+ version: '1.0'
147
145
  type: :runtime
148
- version_requirements: *id012
149
- - !ruby/object:Gem::Dependency
150
- name: tinymce_hammer
151
146
  prerelease: false
152
- requirement: &id013 !ruby/object:Gem::Requirement
147
+ version_requirements: *70179184154900
148
+ - !ruby/object:Gem::Dependency
149
+ name: tinymce_hammer
150
+ requirement: &70179184154380 !ruby/object:Gem::Requirement
153
151
  none: false
154
- requirements:
152
+ requirements:
155
153
  - - ~>
156
- - !ruby/object:Gem::Version
157
- version: "0.2"
154
+ - !ruby/object:Gem::Version
155
+ version: '0.2'
158
156
  type: :runtime
159
- version_requirements: *id013
160
- - !ruby/object:Gem::Dependency
161
- name: attachment_magic
162
157
  prerelease: false
163
- requirement: &id014 !ruby/object:Gem::Requirement
158
+ version_requirements: *70179184154380
159
+ - !ruby/object:Gem::Dependency
160
+ name: attachment_magic
161
+ requirement: &70179184153720 !ruby/object:Gem::Requirement
164
162
  none: false
165
- requirements:
163
+ requirements:
166
164
  - - ~>
167
- - !ruby/object:Gem::Version
165
+ - !ruby/object:Gem::Version
168
166
  version: 0.1.1
169
167
  type: :runtime
170
- version_requirements: *id014
171
- - !ruby/object:Gem::Dependency
172
- name: rspec-rails
173
168
  prerelease: false
174
- requirement: &id015 !ruby/object:Gem::Requirement
169
+ version_requirements: *70179184153720
170
+ - !ruby/object:Gem::Dependency
171
+ name: rspec-rails
172
+ requirement: &70179184153080 !ruby/object:Gem::Requirement
175
173
  none: false
176
- requirements:
177
- - - ">="
178
- - !ruby/object:Gem::Version
179
- version: "2.0"
174
+ requirements:
175
+ - - ~>
176
+ - !ruby/object:Gem::Version
177
+ version: '2.6'
180
178
  type: :development
181
- version_requirements: *id015
182
- - !ruby/object:Gem::Dependency
183
- name: sqlite3
184
179
  prerelease: false
185
- requirement: &id016 !ruby/object:Gem::Requirement
180
+ version_requirements: *70179184153080
181
+ - !ruby/object:Gem::Dependency
182
+ name: sqlite3
183
+ requirement: &70179184152520 !ruby/object:Gem::Requirement
186
184
  none: false
187
- requirements:
188
- - - ">="
189
- - !ruby/object:Gem::Version
190
- version: "0"
185
+ requirements:
186
+ - - ! '>='
187
+ - !ruby/object:Gem::Version
188
+ version: '0'
191
189
  type: :development
192
- version_requirements: *id016
193
- - !ruby/object:Gem::Dependency
194
- name: ruby-debug19
195
190
  prerelease: false
196
- requirement: &id017 !ruby/object:Gem::Requirement
191
+ version_requirements: *70179184152520
192
+ - !ruby/object:Gem::Dependency
193
+ name: ruby-debug19
194
+ requirement: &70179184151620 !ruby/object:Gem::Requirement
197
195
  none: false
198
- requirements:
199
- - - ">="
200
- - !ruby/object:Gem::Version
201
- version: "0"
196
+ requirements:
197
+ - - ! '>='
198
+ - !ruby/object:Gem::Version
199
+ version: '0'
202
200
  type: :development
203
- version_requirements: *id017
204
- description: Alchemy is an awesome Rails CMS with an extremely flexible content storing architecture.
205
- email:
201
+ prerelease: false
202
+ version_requirements: *70179184151620
203
+ description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
204
+ architecture.
205
+ email:
206
206
  - alchemy@magiclabs.de
207
- executables:
207
+ executables:
208
208
  - alchemy
209
209
  extensions: []
210
-
211
210
  extra_rdoc_files: []
212
-
213
- files:
211
+ files:
214
212
  - .gitignore
215
213
  - .rspec
216
214
  - .travis.yml
@@ -762,33 +760,32 @@ files:
762
760
  - spec/routing_spec.rb
763
761
  - spec/spec_helper.rb
764
762
  homepage: http://alchemy-cms.com
765
- licenses:
763
+ licenses:
766
764
  - BSD New
767
765
  post_install_message:
768
766
  rdoc_options: []
769
-
770
- require_paths:
767
+ require_paths:
771
768
  - lib
772
- required_ruby_version: !ruby/object:Gem::Requirement
769
+ required_ruby_version: !ruby/object:Gem::Requirement
773
770
  none: false
774
- requirements:
775
- - - ">="
776
- - !ruby/object:Gem::Version
777
- version: "0"
778
- required_rubygems_version: !ruby/object:Gem::Requirement
771
+ requirements:
772
+ - - ! '>='
773
+ - !ruby/object:Gem::Version
774
+ version: '0'
775
+ required_rubygems_version: !ruby/object:Gem::Requirement
779
776
  none: false
780
- requirements:
781
- - - ">="
782
- - !ruby/object:Gem::Version
783
- version: "0"
784
- requirements:
777
+ requirements:
778
+ - - ! '>='
779
+ - !ruby/object:Gem::Version
780
+ version: '0'
781
+ requirements:
785
782
  - ImageMagick (libmagick), v6.6 or greater.
786
783
  rubyforge_project:
787
- rubygems_version: 1.8.11
784
+ rubygems_version: 1.8.10
788
785
  signing_key:
789
786
  specification_version: 3
790
787
  summary: An extremly flexbile CMS for Rails 3.
791
- test_files:
788
+ test_files:
792
789
  - spec/alchemy_spec.rb
793
790
  - spec/config_spec.rb
794
791
  - spec/controllers/admin/clipboard_controller_spec.rb