coalla-cms 0.5.1.8 → 0.5.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +13 -5
  2. data/Gemfile.lock +37 -37
  3. data/app/assets/javascripts/admin/admin.js +7 -3
  4. data/app/uploaders/generic_image_uploader.rb +1 -0
  5. data/app/views/admin/common/_nested_fields_for.html.haml +2 -1
  6. data/lib/coalla/cms/version.rb +1 -1
  7. metadata +46 -46
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 3ea912539c00f313d59137bee6720ad2b56226c0
4
- data.tar.gz: 2b20f789b498be99e49cf3631255f56a3fb5375a
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MDA4NjRkYTA0YTY4ZmMyNzcwZWZjYjc2ZDkxNjkyYTY4YmZjOWExZg==
5
+ data.tar.gz: !binary |-
6
+ ODgzMTI2ZjhjMTY2YmI4ZjE2NjlhYmIzZWIyYzRhNjgwYjUwYzAxMw==
5
7
  SHA512:
6
- metadata.gz: f3bd14c67d93811762a1edc5d795bc2751b38621e919cec4414b8b632379276c1d012c64f3feddc829b59a2a10a4989e6c42498d7f60f1a4b9db0413f1e7c75c
7
- data.tar.gz: 4de587dbe7011f1a380b9f9a45743fbaab1759a7072e42e4bcda34eb18baac4d66b1983b1a11baafa420e2a8bc122f07af988833d9481dfec38f13c71aa22d5e
8
+ metadata.gz: !binary |-
9
+ NGRlM2ZkMWE3NDRhNWNkYTU1MGY1MWE3ZmUzMGU2M2ZmYTkzMTA1YjIzODNj
10
+ OGYxYTNiYzQ1MzEzNzMyMzY2ZjkzNzlhN2JkZjZjZDZkNDRjMjAxMjRhZWM0
11
+ NzVmNWVlODBkNjllMTk2NjZmMzkzMjQyOTZlMzBmYTdlZDYxZDY=
12
+ data.tar.gz: !binary |-
13
+ NjIwNDVlYTU0ZThhZGE2NTRjNDI5NjUzNTgxZjA5NWE1YmMzOWIzNjNiMWI5
14
+ MmM4MWJjNTJjMjkwYTNkN2UzNWMzZDVmOTExNGEyMjhiNDkzNzliNmVlZWI3
15
+ YWNmZjc3NzQyMTdhYWZlODU3ZDZiZWI2ZWNlM2I3OGFhNTNhNTM=
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- coalla-cms (0.5.1.3)
4
+ coalla-cms (0.5.1.8)
5
5
  carrierwave
6
6
  ckeditor
7
7
  coalla-deploy (~> 0.1)
@@ -26,43 +26,43 @@ PATH
26
26
  GEM
27
27
  remote: http://rubygems.org/
28
28
  specs:
29
- actionmailer (4.2.5)
30
- actionpack (= 4.2.5)
31
- actionview (= 4.2.5)
32
- activejob (= 4.2.5)
29
+ actionmailer (4.2.6)
30
+ actionpack (= 4.2.6)
31
+ actionview (= 4.2.6)
32
+ activejob (= 4.2.6)
33
33
  mail (~> 2.5, >= 2.5.4)
34
34
  rails-dom-testing (~> 1.0, >= 1.0.5)
35
- actionpack (4.2.5)
36
- actionview (= 4.2.5)
37
- activesupport (= 4.2.5)
35
+ actionpack (4.2.6)
36
+ actionview (= 4.2.6)
37
+ activesupport (= 4.2.6)
38
38
  rack (~> 1.6)
39
39
  rack-test (~> 0.6.2)
40
40
  rails-dom-testing (~> 1.0, >= 1.0.5)
41
41
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
42
- actionview (4.2.5)
43
- activesupport (= 4.2.5)
42
+ actionview (4.2.6)
43
+ activesupport (= 4.2.6)
44
44
  builder (~> 3.1)
45
45
  erubis (~> 2.7.0)
46
46
  rails-dom-testing (~> 1.0, >= 1.0.5)
47
47
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
48
- activejob (4.2.5)
49
- activesupport (= 4.2.5)
48
+ activejob (4.2.6)
49
+ activesupport (= 4.2.6)
50
50
  globalid (>= 0.3.0)
51
- activemodel (4.2.5)
52
- activesupport (= 4.2.5)
51
+ activemodel (4.2.6)
52
+ activesupport (= 4.2.6)
53
53
  builder (~> 3.1)
54
- activerecord (4.2.5)
55
- activemodel (= 4.2.5)
56
- activesupport (= 4.2.5)
54
+ activerecord (4.2.6)
55
+ activemodel (= 4.2.6)
56
+ activesupport (= 4.2.6)
57
57
  arel (~> 6.0)
58
- activesupport (4.2.5)
58
+ activesupport (4.2.6)
59
59
  i18n (~> 0.7)
60
60
  json (~> 1.7, >= 1.7.7)
61
61
  minitest (~> 5.1)
62
62
  thread_safe (~> 0.3, >= 0.3.4)
63
63
  tzinfo (~> 1.1)
64
64
  arel (6.0.3)
65
- bcrypt (3.1.10)
65
+ bcrypt (3.1.11)
66
66
  builder (3.2.2)
67
67
  carrierwave (0.10.0)
68
68
  activemodel (>= 3.2.0)
@@ -86,7 +86,7 @@ GEM
86
86
  coffee-script-source
87
87
  execjs
88
88
  coffee-script-source (1.10.0)
89
- concurrent-ruby (1.0.0)
89
+ concurrent-ruby (1.0.1)
90
90
  crass (1.0.2)
91
91
  devise (3.5.6)
92
92
  bcrypt (~> 3.0)
@@ -102,8 +102,8 @@ GEM
102
102
  haml (4.0.7)
103
103
  tilt
104
104
  i18n (0.7.0)
105
- jquery-rails (4.1.0)
106
- rails-dom-testing (~> 1.0)
105
+ jquery-rails (4.1.1)
106
+ rails-dom-testing (>= 1, < 3)
107
107
  railties (>= 4.2.0)
108
108
  thor (>= 0.14, < 2.0)
109
109
  jquery-timepicker-addon-rails (1.4.1)
@@ -120,7 +120,7 @@ GEM
120
120
  mime-types (>= 1.16, < 3)
121
121
  meta-tags (2.1.0)
122
122
  actionpack (>= 3.0.0)
123
- mime-types (2.99)
123
+ mime-types (2.99.1)
124
124
  mini_magick (4.4.0)
125
125
  mini_portile2 (2.0.0)
126
126
  minitest (5.8.4)
@@ -132,16 +132,16 @@ GEM
132
132
  rack (1.6.4)
133
133
  rack-test (0.6.3)
134
134
  rack (>= 1.0)
135
- rails (4.2.5)
136
- actionmailer (= 4.2.5)
137
- actionpack (= 4.2.5)
138
- actionview (= 4.2.5)
139
- activejob (= 4.2.5)
140
- activemodel (= 4.2.5)
141
- activerecord (= 4.2.5)
142
- activesupport (= 4.2.5)
135
+ rails (4.2.6)
136
+ actionmailer (= 4.2.6)
137
+ actionpack (= 4.2.6)
138
+ actionview (= 4.2.6)
139
+ activejob (= 4.2.6)
140
+ activemodel (= 4.2.6)
141
+ activerecord (= 4.2.6)
142
+ activesupport (= 4.2.6)
143
143
  bundler (>= 1.3.0, < 2.0)
144
- railties (= 4.2.5)
144
+ railties (= 4.2.6)
145
145
  sprockets-rails
146
146
  rails-deprecated_sanitizer (1.0.3)
147
147
  activesupport (>= 4.2.0.alpha)
@@ -151,12 +151,12 @@ GEM
151
151
  rails-deprecated_sanitizer (>= 1.0.1)
152
152
  rails-html-sanitizer (1.0.3)
153
153
  loofah (~> 2.0)
154
- railties (4.2.5)
155
- actionpack (= 4.2.5)
156
- activesupport (= 4.2.5)
154
+ railties (4.2.6)
155
+ actionpack (= 4.2.6)
156
+ activesupport (= 4.2.6)
157
157
  rake (>= 0.8.7)
158
158
  thor (>= 0.18.1, < 2.0)
159
- rake (10.5.0)
159
+ rake (11.0.1)
160
160
  remotipart (1.2.1)
161
161
  responders (2.1.1)
162
162
  railties (>= 4.2.0, < 5.1)
@@ -175,7 +175,7 @@ GEM
175
175
  sprockets (3.5.2)
176
176
  concurrent-ruby (~> 1.0)
177
177
  rack (> 1, < 3)
178
- sprockets-rails (3.0.1)
178
+ sprockets-rails (3.0.4)
179
179
  actionpack (>= 4.0)
180
180
  activesupport (>= 4.0)
181
181
  sprockets (>= 3.0.0)
data/app/assets/javascripts/admin/admin.js CHANGED
@@ -152,15 +152,19 @@ $(function () {
152
152
  $form.on('click', '.add_fields', function () {
153
153
  var time = new Date().getTime();
154
154
  var regexp = new RegExp($(this).data('id'), 'g');
155
- $(this).before($(this).data('fields').replace(regexp, time));
155
+ var wrapper = $(this).closest('.nested_buttons');
156
+ var insertHtml = $( $(this).data('fields').replace(regexp, time) );
157
+ wrapper.before(insertHtml);
158
+ // fix for Bootstrap 3 dropdown components
159
+ wrapper.removeClass('open');
156
160
  window.NestedFormCallbacks = window.NestedFormCallbacks || [];
157
161
  _.each(window.NestedFormCallbacks, function (callback) {
158
- callback();
162
+ callback(insertHtml);
159
163
  });
160
164
  addDatePickers();
161
165
  addDateTimePickers();
162
166
  addTimePickers();
163
- return false
167
+ return false;
164
168
  });
165
169
 
166
170
  $('[data-multi-field]').each(function () {
data/app/uploaders/generic_image_uploader.rb CHANGED
@@ -48,6 +48,7 @@ class GenericImageUploader < CarrierWave::Uploader::Base
48
48
  model.send(setter(:file_name), file.filename) if model.respond_to?(setter(:file_name))
49
49
  model.send(setter(:size), file.size) if model.respond_to?(setter(:size))
50
50
  model.send(setter(:content_type), file.content_type) if model.respond_to?(setter(:content_type))
51
+ capture_size_before_cache(file)
51
52
  end
52
53
 
53
54
  private
data/app/views/admin/common/_nested_fields_for.html.haml CHANGED
@@ -2,4 +2,5 @@
2
2
  = field_set section_name do
3
3
  = f.fields_for collection do |builder|
4
4
  = render 'admin/common/nested_fields_for_element', builder: builder, partial: partial
5
- = link_to_add_fields('Добавить', f, collection)
5
+ .nested_buttons
6
+ = link_to_add_fields('Добавить', f, collection)
data/lib/coalla/cms/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Coalla
2
2
  module Cms
3
- VERSION = '0.5.1.8'
3
+ VERSION = '0.5.2.4'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,293 +1,293 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: coalla-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1.8
4
+ version: 0.5.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - coalla
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-10 00:00:00.000000000 Z
11
+ date: 2016-11-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '4.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: '4.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rails
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '4.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '4.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: devise
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: haml
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: coffee-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sass-rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: coalla-deploy
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0.1'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0.1'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: jquery-rails
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - ! '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: jquery-ui-rails
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - ! '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - ! '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: jquery-timepicker-addon-rails
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - ! '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - ! '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: js-routes
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - ! '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - ! '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: carrierwave
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - ! '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: ckeditor
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - ! '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - ! '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: mini_magick
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - ! '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - ! '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: sanitize
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - ! '>='
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - ! '>='
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: remotipart
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ">="
227
+ - - ! '>='
228
228
  - !ruby/object:Gem::Version
229
229
  version: '0'
230
230
  type: :runtime
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ">="
234
+ - - ! '>='
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: rmagick
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - ">="
241
+ - - ! '>='
242
242
  - !ruby/object:Gem::Version
243
243
  version: '0'
244
244
  type: :runtime
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - ">="
248
+ - - ! '>='
249
249
  - !ruby/object:Gem::Version
250
250
  version: '0'
251
251
  - !ruby/object:Gem::Dependency
252
252
  name: will_paginate
253
253
  requirement: !ruby/object:Gem::Requirement
254
254
  requirements:
255
- - - ">="
255
+ - - ! '>='
256
256
  - !ruby/object:Gem::Version
257
257
  version: '0'
258
258
  type: :runtime
259
259
  prerelease: false
260
260
  version_requirements: !ruby/object:Gem::Requirement
261
261
  requirements:
262
- - - ">="
262
+ - - ! '>='
263
263
  - !ruby/object:Gem::Version
264
264
  version: '0'
265
265
  - !ruby/object:Gem::Dependency
266
266
  name: standalone_typograf
267
267
  requirement: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - "~>"
269
+ - - ~>
270
270
  - !ruby/object:Gem::Version
271
271
  version: 3.0.2
272
272
  type: :runtime
273
273
  prerelease: false
274
274
  version_requirements: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - "~>"
276
+ - - ~>
277
277
  - !ruby/object:Gem::Version
278
278
  version: 3.0.2
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: meta-tags
281
281
  requirement: !ruby/object:Gem::Requirement
282
282
  requirements:
283
- - - "~>"
283
+ - - ~>
284
284
  - !ruby/object:Gem::Version
285
285
  version: 2.1.0
286
286
  type: :runtime
287
287
  prerelease: false
288
288
  version_requirements: !ruby/object:Gem::Requirement
289
289
  requirements:
290
- - - "~>"
290
+ - - ~>
291
291
  - !ruby/object:Gem::Version
292
292
  version: 2.1.0
293
293
  description: Coalla CMS gem
@@ -297,7 +297,7 @@ executables: []
297
297
  extensions: []
298
298
  extra_rdoc_files: []
299
299
  files:
300
- - ".gitignore"
300
+ - .gitignore
301
301
  - Gemfile
302
302
  - Gemfile.lock
303
303
  - Rakefile
@@ -596,17 +596,17 @@ require_paths:
596
596
  - lib
597
597
  required_ruby_version: !ruby/object:Gem::Requirement
598
598
  requirements:
599
- - - ">="
599
+ - - ! '>='
600
600
  - !ruby/object:Gem::Version
601
601
  version: '0'
602
602
  required_rubygems_version: !ruby/object:Gem::Requirement
603
603
  requirements:
604
- - - ">="
604
+ - - ! '>='
605
605
  - !ruby/object:Gem::Version
606
606
  version: '0'
607
607
  requirements: []
608
608
  rubyforge_project: coalla-cms
609
- rubygems_version: 2.4.6
609
+ rubygems_version: 2.4.8
610
610
  signing_key:
611
611
  specification_version: 4
612
612
  summary: Coalla CMS gem