coalla-cms 0.5.1.9 → 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 +15 -0
  2. data/Rakefile +24 -24
  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 +5 -47
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MDA4NjRkYTA0YTY4ZmMyNzcwZWZjYjc2ZDkxNjkyYTY4YmZjOWExZg==
5
+ data.tar.gz: !binary |-
6
+ ODgzMTI2ZjhjMTY2YmI4ZjE2NjlhYmIzZWIyYzRhNjgwYjUwYzAxMw==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ NGRlM2ZkMWE3NDRhNWNkYTU1MGY1MWE3ZmUzMGU2M2ZmYTkzMTA1YjIzODNj
10
+ OGYxYTNiYzQ1MzEzNzMyMzY2ZjkzNzlhN2JkZjZjZDZkNDRjMjAxMjRhZWM0
11
+ NzVmNWVlODBkNjllMTk2NjZmMzkzMjQyOTZlMzBmYTdlZDYxZDY=
12
+ data.tar.gz: !binary |-
13
+ NjIwNDVlYTU0ZThhZGE2NTRjNDI5NjUzNTgxZjA5NWE1YmMzOWIzNjNiMWI5
14
+ MmM4MWJjNTJjMjkwYTNkN2UzNWMzZDVmOTExNGEyMjhiNDkzNzliNmVlZWI3
15
+ YWNmZjc3NzQyMTdhYWZlODU3ZDZiZWI2ZWNlM2I3OGFhNTNhNTM=
data/Rakefile CHANGED
@@ -3,27 +3,27 @@ require 'net/ssh'
3
3
  require 'net/scp'
4
4
  require 'fileutils'
5
5
 
6
- # task 'build:gem' do
7
- # host = '148.251.43.54'
8
- # user = 'deployer'
9
- # Net::SSH.start(host, user, port: 60000) do |ssh|
10
- # base_dir = "/home/deployer/temp/coalla-gems"
11
- # project_name = 'coalla-cms'
12
- # git_url = "git@bitbucket.org:coalla/#{project_name}.git"
13
- # gems_dir = '/var/www/virtual-hosts/gems.coalla.ru'
14
- # output = ssh.exec! <<-SH
15
- # mkdir --parents #{base_dir}
16
- # cd #{base_dir}
17
- # git clone #{git_url}
18
- # cd #{project_name}
19
- # source /etc/profile
20
- # rvm 1.9.3
21
- # gem build coalla-cms.gemspec
22
- # cp -rf *.gem #{gems_dir}/gems
23
- # cd #{gems_dir}
24
- # gem generate_index
25
- # rm -R #{base_dir}
26
- # SH
27
- # puts output
28
- # end
29
- # end
6
+ task 'build:gem' do
7
+ host = '148.251.43.54'
8
+ user = 'deployer'
9
+ Net::SSH.start(host, user, port: 60000) do |ssh|
10
+ base_dir = "/home/deployer/temp/coalla-gems"
11
+ project_name = 'coalla-cms'
12
+ git_url = "git@bitbucket.org:coalla/#{project_name}.git"
13
+ gems_dir = '/var/www/virtual-hosts/gems.coalla.ru'
14
+ output = ssh.exec! <<-SH
15
+ mkdir --parents #{base_dir}
16
+ cd #{base_dir}
17
+ git clone #{git_url}
18
+ cd #{project_name}
19
+ source /etc/profile
20
+ rvm 1.9.3
21
+ gem build coalla-cms.gemspec
22
+ cp -rf *.gem #{gems_dir}/gems
23
+ cd #{gems_dir}
24
+ gem generate_index
25
+ rm -R #{base_dir}
26
+ SH
27
+ puts output
28
+ end
29
+ end
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.9'
3
+ VERSION = '0.5.2.4'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: coalla-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1.9
5
- prerelease:
4
+ version: 0.5.2.4
6
5
  platform: ruby
7
6
  authors:
8
7
  - coalla
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2016-03-10 00:00:00.000000000 Z
11
+ date: 2016-11-01 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: railties
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rails
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ~>
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ~>
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: devise
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ! '>='
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ! '>='
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: haml
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ! '>='
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ! '>='
76
67
  - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: coffee-rails
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ! '>='
84
74
  - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ! '>='
92
81
  - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: sass-rails
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ! '>='
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ! '>='
108
95
  - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: coalla-deploy
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - ~>
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - ~>
124
109
  - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: jquery-rails
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - ! '>='
132
116
  - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
134
118
  type: :runtime
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - ! '>='
140
123
  - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: jquery-ui-rails
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
129
  - - ! '>='
148
130
  - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
150
132
  type: :runtime
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
136
  - - ! '>='
156
137
  - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: jquery-timepicker-addon-rails
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
143
  - - ! '>='
164
144
  - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
166
146
  type: :runtime
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
150
  - - ! '>='
172
151
  - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
174
153
  - !ruby/object:Gem::Dependency
175
154
  name: js-routes
176
155
  requirement: !ruby/object:Gem::Requirement
177
- none: false
178
156
  requirements:
179
157
  - - ! '>='
180
158
  - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
182
160
  type: :runtime
183
161
  prerelease: false
184
162
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
163
  requirements:
187
164
  - - ! '>='
188
165
  - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
190
167
  - !ruby/object:Gem::Dependency
191
168
  name: carrierwave
192
169
  requirement: !ruby/object:Gem::Requirement
193
- none: false
194
170
  requirements:
195
171
  - - ! '>='
196
172
  - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
198
174
  type: :runtime
199
175
  prerelease: false
200
176
  version_requirements: !ruby/object:Gem::Requirement
201
- none: false
202
177
  requirements:
203
178
  - - ! '>='
204
179
  - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
206
181
  - !ruby/object:Gem::Dependency
207
182
  name: ckeditor
208
183
  requirement: !ruby/object:Gem::Requirement
209
- none: false
210
184
  requirements:
211
185
  - - ! '>='
212
186
  - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
214
188
  type: :runtime
215
189
  prerelease: false
216
190
  version_requirements: !ruby/object:Gem::Requirement
217
- none: false
218
191
  requirements:
219
192
  - - ! '>='
220
193
  - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
222
195
  - !ruby/object:Gem::Dependency
223
196
  name: mini_magick
224
197
  requirement: !ruby/object:Gem::Requirement
225
- none: false
226
198
  requirements:
227
199
  - - ! '>='
228
200
  - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
230
202
  type: :runtime
231
203
  prerelease: false
232
204
  version_requirements: !ruby/object:Gem::Requirement
233
- none: false
234
205
  requirements:
235
206
  - - ! '>='
236
207
  - !ruby/object:Gem::Version
@@ -238,7 +209,6 @@ dependencies:
238
209
  - !ruby/object:Gem::Dependency
239
210
  name: sanitize
240
211
  requirement: !ruby/object:Gem::Requirement
241
- none: false
242
212
  requirements:
243
213
  - - ! '>='
244
214
  - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
246
216
  type: :runtime
247
217
  prerelease: false
248
218
  version_requirements: !ruby/object:Gem::Requirement
249
- none: false
250
219
  requirements:
251
220
  - - ! '>='
252
221
  - !ruby/object:Gem::Version
@@ -254,7 +223,6 @@ dependencies:
254
223
  - !ruby/object:Gem::Dependency
255
224
  name: remotipart
256
225
  requirement: !ruby/object:Gem::Requirement
257
- none: false
258
226
  requirements:
259
227
  - - ! '>='
260
228
  - !ruby/object:Gem::Version
@@ -262,7 +230,6 @@ dependencies:
262
230
  type: :runtime
263
231
  prerelease: false
264
232
  version_requirements: !ruby/object:Gem::Requirement
265
- none: false
266
233
  requirements:
267
234
  - - ! '>='
268
235
  - !ruby/object:Gem::Version
@@ -270,7 +237,6 @@ dependencies:
270
237
  - !ruby/object:Gem::Dependency
271
238
  name: rmagick
272
239
  requirement: !ruby/object:Gem::Requirement
273
- none: false
274
240
  requirements:
275
241
  - - ! '>='
276
242
  - !ruby/object:Gem::Version
@@ -278,7 +244,6 @@ dependencies:
278
244
  type: :runtime
279
245
  prerelease: false
280
246
  version_requirements: !ruby/object:Gem::Requirement
281
- none: false
282
247
  requirements:
283
248
  - - ! '>='
284
249
  - !ruby/object:Gem::Version
@@ -286,7 +251,6 @@ dependencies:
286
251
  - !ruby/object:Gem::Dependency
287
252
  name: will_paginate
288
253
  requirement: !ruby/object:Gem::Requirement
289
- none: false
290
254
  requirements:
291
255
  - - ! '>='
292
256
  - !ruby/object:Gem::Version
@@ -294,7 +258,6 @@ dependencies:
294
258
  type: :runtime
295
259
  prerelease: false
296
260
  version_requirements: !ruby/object:Gem::Requirement
297
- none: false
298
261
  requirements:
299
262
  - - ! '>='
300
263
  - !ruby/object:Gem::Version
@@ -302,7 +265,6 @@ dependencies:
302
265
  - !ruby/object:Gem::Dependency
303
266
  name: standalone_typograf
304
267
  requirement: !ruby/object:Gem::Requirement
305
- none: false
306
268
  requirements:
307
269
  - - ~>
308
270
  - !ruby/object:Gem::Version
@@ -310,7 +272,6 @@ dependencies:
310
272
  type: :runtime
311
273
  prerelease: false
312
274
  version_requirements: !ruby/object:Gem::Requirement
313
- none: false
314
275
  requirements:
315
276
  - - ~>
316
277
  - !ruby/object:Gem::Version
@@ -318,7 +279,6 @@ dependencies:
318
279
  - !ruby/object:Gem::Dependency
319
280
  name: meta-tags
320
281
  requirement: !ruby/object:Gem::Requirement
321
- none: false
322
282
  requirements:
323
283
  - - ~>
324
284
  - !ruby/object:Gem::Version
@@ -326,7 +286,6 @@ dependencies:
326
286
  type: :runtime
327
287
  prerelease: false
328
288
  version_requirements: !ruby/object:Gem::Requirement
329
- none: false
330
289
  requirements:
331
290
  - - ~>
332
291
  - !ruby/object:Gem::Version
@@ -630,26 +589,25 @@ files:
630
589
  - lib/generators/coalla/cms/wysiwyg/templates/ckeditor/plugins/slideshow/plugin.js
631
590
  homepage: http://coalla.ru
632
591
  licenses: []
592
+ metadata: {}
633
593
  post_install_message:
634
594
  rdoc_options: []
635
595
  require_paths:
636
596
  - lib
637
597
  required_ruby_version: !ruby/object:Gem::Requirement
638
- none: false
639
598
  requirements:
640
599
  - - ! '>='
641
600
  - !ruby/object:Gem::Version
642
601
  version: '0'
643
602
  required_rubygems_version: !ruby/object:Gem::Requirement
644
- none: false
645
603
  requirements:
646
604
  - - ! '>='
647
605
  - !ruby/object:Gem::Version
648
606
  version: '0'
649
607
  requirements: []
650
608
  rubyforge_project: coalla-cms
651
- rubygems_version: 1.8.25
609
+ rubygems_version: 2.4.8
652
610
  signing_key:
653
- specification_version: 3
611
+ specification_version: 4
654
612
  summary: Coalla CMS gem
655
613
  test_files: []