trusty-cms 4.1.5 → 4.1.6

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +67 -67
  3. data/app/views/admin/assets/edit.html.haml +3 -0
  4. data/config/locales/en.yml +1 -0
  5. data/lib/trusty_cms.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aec3fc02d82b69c746822773abba3b5dca525b4517ce22f5f2b90370f98a500d
4
- data.tar.gz: 6e873c828c7208ddb4e83118a26a854c701e7a52f95636fe56304b23a70a9bbd
3
+ metadata.gz: 1c22f1a0c39d50f9db4b32cc516fc855a8be5b4867cc8904f738a52a7e71cdfa
4
+ data.tar.gz: e4574f3bf96460aa8ff2fb6bf9af28dfa30592a30056dc3432ea6c232a74f0b3
5
5
  SHA512:
6
- metadata.gz: f514772d660155663d30d4008306b394eba8c4da9dc77a025de5fc01e72905c0135322aa98b93d580e5f45b1f8a1259a44bc7248513d40c310007eb703dcdd28
7
- data.tar.gz: bbe958ef9e0cb0404bf9126fa46b37a58a02bd708ba2cd5a3e7c6a05f86dcf9ca689fb2fc314053078ceee21d0c9bac2f4f1ee8668789b737f4bc6f51e80ae2c
6
+ metadata.gz: ff2dbedfb3586408e6ef2a561e755e084ba1cbd8d9ed778722ca862bed105c4b9073fa6e9db71ccee918ef824399b335f656bd84f84fa502d1d016ed54c2cb7c
7
+ data.tar.gz: 3882e09eeed5febdd6f9d991d598ef02d9407cfcbd3ba40796b8e622b3308e884afc441563abac25fb14b3cea157f811dc47cc0fed68f2faee6df2559d68543c
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (4.1.5)
4
+ trusty-cms (4.1.6)
5
5
  RedCloth (= 4.3.2)
6
6
  acts_as_list (>= 0.9.5, < 1.1.0)
7
7
  acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -34,71 +34,71 @@ GEM
34
34
  remote: https://rubygems.org/
35
35
  specs:
36
36
  RedCloth (4.3.2)
37
- actioncable (6.0.3.2)
38
- actionpack (= 6.0.3.2)
37
+ actioncable (6.0.3.3)
38
+ actionpack (= 6.0.3.3)
39
39
  nio4r (~> 2.0)
40
40
  websocket-driver (>= 0.6.1)
41
- actionmailbox (6.0.3.2)
42
- actionpack (= 6.0.3.2)
43
- activejob (= 6.0.3.2)
44
- activerecord (= 6.0.3.2)
45
- activestorage (= 6.0.3.2)
46
- activesupport (= 6.0.3.2)
41
+ actionmailbox (6.0.3.3)
42
+ actionpack (= 6.0.3.3)
43
+ activejob (= 6.0.3.3)
44
+ activerecord (= 6.0.3.3)
45
+ activestorage (= 6.0.3.3)
46
+ activesupport (= 6.0.3.3)
47
47
  mail (>= 2.7.1)
48
- actionmailer (6.0.3.2)
49
- actionpack (= 6.0.3.2)
50
- actionview (= 6.0.3.2)
51
- activejob (= 6.0.3.2)
48
+ actionmailer (6.0.3.3)
49
+ actionpack (= 6.0.3.3)
50
+ actionview (= 6.0.3.3)
51
+ activejob (= 6.0.3.3)
52
52
  mail (~> 2.5, >= 2.5.4)
53
53
  rails-dom-testing (~> 2.0)
54
- actionpack (6.0.3.2)
55
- actionview (= 6.0.3.2)
56
- activesupport (= 6.0.3.2)
54
+ actionpack (6.0.3.3)
55
+ actionview (= 6.0.3.3)
56
+ activesupport (= 6.0.3.3)
57
57
  rack (~> 2.0, >= 2.0.8)
58
58
  rack-test (>= 0.6.3)
59
59
  rails-dom-testing (~> 2.0)
60
60
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
61
- actiontext (6.0.3.2)
62
- actionpack (= 6.0.3.2)
63
- activerecord (= 6.0.3.2)
64
- activestorage (= 6.0.3.2)
65
- activesupport (= 6.0.3.2)
61
+ actiontext (6.0.3.3)
62
+ actionpack (= 6.0.3.3)
63
+ activerecord (= 6.0.3.3)
64
+ activestorage (= 6.0.3.3)
65
+ activesupport (= 6.0.3.3)
66
66
  nokogiri (>= 1.8.5)
67
- actionview (6.0.3.2)
68
- activesupport (= 6.0.3.2)
67
+ actionview (6.0.3.3)
68
+ activesupport (= 6.0.3.3)
69
69
  builder (~> 3.1)
70
70
  erubi (~> 1.4)
71
71
  rails-dom-testing (~> 2.0)
72
72
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
73
- activejob (6.0.3.2)
74
- activesupport (= 6.0.3.2)
73
+ activejob (6.0.3.3)
74
+ activesupport (= 6.0.3.3)
75
75
  globalid (>= 0.3.6)
76
- activemodel (6.0.3.2)
77
- activesupport (= 6.0.3.2)
78
- activerecord (6.0.3.2)
79
- activemodel (= 6.0.3.2)
80
- activesupport (= 6.0.3.2)
81
- activestorage (6.0.3.2)
82
- actionpack (= 6.0.3.2)
83
- activejob (= 6.0.3.2)
84
- activerecord (= 6.0.3.2)
76
+ activemodel (6.0.3.3)
77
+ activesupport (= 6.0.3.3)
78
+ activerecord (6.0.3.3)
79
+ activemodel (= 6.0.3.3)
80
+ activesupport (= 6.0.3.3)
81
+ activestorage (6.0.3.3)
82
+ actionpack (= 6.0.3.3)
83
+ activejob (= 6.0.3.3)
84
+ activerecord (= 6.0.3.3)
85
85
  marcel (~> 0.3.1)
86
- activesupport (6.0.3.2)
86
+ activesupport (6.0.3.3)
87
87
  concurrent-ruby (~> 1.0, >= 1.0.2)
88
88
  i18n (>= 0.7, < 2)
89
89
  minitest (~> 5.1)
90
90
  tzinfo (~> 1.1)
91
91
  zeitwerk (~> 2.2, >= 2.2.2)
92
- acts_as_list (1.0.1)
92
+ acts_as_list (1.0.2)
93
93
  activerecord (>= 4.2)
94
94
  acts_as_tree (2.8.0)
95
95
  activerecord (>= 3.0.0)
96
96
  addressable (2.7.0)
97
97
  public_suffix (>= 2.0.2, < 5.0)
98
- bcrypt (3.1.15)
98
+ bcrypt (3.1.16)
99
99
  builder (3.2.4)
100
100
  byebug (11.1.3)
101
- capybara (3.32.2)
101
+ capybara (3.33.0)
102
102
  addressable
103
103
  mini_mime (>= 0.1.3)
104
104
  nokogiri (~> 1.8)
@@ -114,7 +114,7 @@ GEM
114
114
  cocaine (0.6.0)
115
115
  terrapin (= 0.6.0)
116
116
  coderay (1.1.3)
117
- concurrent-ruby (1.1.6)
117
+ concurrent-ruby (1.1.7)
118
118
  crass (1.0.6)
119
119
  css_parser (1.7.1)
120
120
  addressable
@@ -127,7 +127,7 @@ GEM
127
127
  railties (>= 4.1.0)
128
128
  responders
129
129
  warden (~> 1.2.3)
130
- diff-lcs (1.3)
130
+ diff-lcs (1.4.4)
131
131
  docile (1.3.2)
132
132
  erubi (1.9.0)
133
133
  erubis (2.7.0)
@@ -169,7 +169,7 @@ GEM
169
169
  launchy (2.5.0)
170
170
  addressable (~> 2.7)
171
171
  libv8 (8.4.255.0)
172
- loofah (2.6.0)
172
+ loofah (2.7.0)
173
173
  crass (~> 1.0.2)
174
174
  nokogiri (>= 1.5.9)
175
175
  mail (2.7.1)
@@ -185,11 +185,11 @@ GEM
185
185
  mini_portile2 (2.4.0)
186
186
  mini_racer (0.3.1)
187
187
  libv8 (~> 8.4.255)
188
- minitest (5.14.1)
188
+ minitest (5.14.2)
189
189
  multi_xml (0.6.0)
190
190
  multipart-post (2.1.1)
191
191
  mysql2 (0.5.3)
192
- nio4r (2.5.2)
192
+ nio4r (2.5.3)
193
193
  nokogiri (1.10.10)
194
194
  mini_portile2 (~> 2.4.0)
195
195
  orm_adapter (0.5.0)
@@ -209,27 +209,27 @@ GEM
209
209
  pry-byebug (3.9.0)
210
210
  byebug (~> 11.0)
211
211
  pry (~> 0.13.0)
212
- public_suffix (4.0.5)
212
+ public_suffix (4.0.6)
213
213
  rack (2.2.3)
214
214
  rack-cache (1.12.0)
215
215
  rack (>= 0.4)
216
216
  rack-test (1.1.0)
217
217
  rack (>= 1.0, < 3)
218
218
  radius (0.7.5)
219
- rails (6.0.3.2)
220
- actioncable (= 6.0.3.2)
221
- actionmailbox (= 6.0.3.2)
222
- actionmailer (= 6.0.3.2)
223
- actionpack (= 6.0.3.2)
224
- actiontext (= 6.0.3.2)
225
- actionview (= 6.0.3.2)
226
- activejob (= 6.0.3.2)
227
- activemodel (= 6.0.3.2)
228
- activerecord (= 6.0.3.2)
229
- activestorage (= 6.0.3.2)
230
- activesupport (= 6.0.3.2)
219
+ rails (6.0.3.3)
220
+ actioncable (= 6.0.3.3)
221
+ actionmailbox (= 6.0.3.3)
222
+ actionmailer (= 6.0.3.3)
223
+ actionpack (= 6.0.3.3)
224
+ actiontext (= 6.0.3.3)
225
+ actionview (= 6.0.3.3)
226
+ activejob (= 6.0.3.3)
227
+ activemodel (= 6.0.3.3)
228
+ activerecord (= 6.0.3.3)
229
+ activestorage (= 6.0.3.3)
230
+ activesupport (= 6.0.3.3)
231
231
  bundler (>= 1.3.0)
232
- railties (= 6.0.3.2)
232
+ railties (= 6.0.3.3)
233
233
  sprockets-rails (>= 2.0.0)
234
234
  rails-dom-testing (2.0.3)
235
235
  activesupport (>= 4.2.0)
@@ -238,9 +238,9 @@ GEM
238
238
  loofah (~> 2.3)
239
239
  rails-observers (0.1.5)
240
240
  activemodel (>= 4.0)
241
- railties (6.0.3.2)
242
- actionpack (= 6.0.3.2)
243
- activesupport (= 6.0.3.2)
241
+ railties (6.0.3.3)
242
+ actionpack (= 6.0.3.3)
243
+ activesupport (= 6.0.3.3)
244
244
  method_source
245
245
  rake (>= 0.8.7)
246
246
  thor (>= 0.20.3, < 2.0)
@@ -273,7 +273,7 @@ GEM
273
273
  rspec-mocks (~> 3.9)
274
274
  rspec-support (~> 3.9)
275
275
  rspec-support (3.9.3)
276
- ruby_parser (3.14.2)
276
+ ruby_parser (3.15.0)
277
277
  sexp_processor (~> 4.9)
278
278
  sassc (2.4.0)
279
279
  ffi (~> 1.9)
@@ -283,15 +283,15 @@ GEM
283
283
  sprockets (> 3.0)
284
284
  sprockets-rails
285
285
  tilt
286
- sexp_processor (4.15.0)
287
- simplecov (0.18.5)
286
+ sexp_processor (4.15.1)
287
+ simplecov (0.19.0)
288
288
  docile (~> 1.1)
289
289
  simplecov-html (~> 0.11)
290
290
  simplecov-html (0.12.2)
291
291
  sprockets (4.0.2)
292
292
  concurrent-ruby (~> 1.0)
293
293
  rack (> 1, < 3)
294
- sprockets-rails (3.2.1)
294
+ sprockets-rails (3.2.2)
295
295
  actionpack (>= 4.0)
296
296
  activesupport (>= 4.0)
297
297
  sprockets (>= 3.0.0)
@@ -309,9 +309,9 @@ GEM
309
309
  uglifier (4.2.0)
310
310
  execjs (>= 0.3.0, < 3)
311
311
  uuidtools (2.2.0)
312
- warden (1.2.8)
313
- rack (>= 2.0.6)
314
- websocket-driver (0.7.2)
312
+ warden (1.2.9)
313
+ rack (>= 2.0.9)
314
+ websocket-driver (0.7.3)
315
315
  websocket-extensions (>= 0.1.0)
316
316
  websocket-extensions (0.1.5)
317
317
  will_paginate (3.3.0)
data/app/views/admin/assets/edit.html.haml CHANGED
@@ -14,6 +14,9 @@
14
14
  %fieldset
15
15
  %label.filename
16
16
  = "#{t("clipped_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
17
+ %br
18
+ %label.url
19
+ = "#{t("clipped_extension.asset_url")}: #{image_path @asset.thumbnail unless @asset.new_record?}"
17
20
  %p.asset
18
21
  - display_size = TrustyCms::config['assets.display_size'] || 'normal'
19
22
  = image_tag @asset.thumbnail(display_size.to_sym), :class => 'preview'
data/config/locales/en.yml CHANGED
@@ -65,6 +65,7 @@ en:
65
65
  asset_errors: 'Sorry. {{errors}}'
66
66
  asset_page_attachment_note: 'Attached assets. These can be inserted with drag and drop or shown with the <code>&lt;r:assets:each /&gt;</code> tag.'
67
67
  asset_note: 'Attached assets. '
68
+ asset_url: 'Asset URL'
68
69
  assets: 'Assets'
69
70
  assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on an asset name above to edit it or click <code>Remove</code> to delete it.'
70
71
  assets_title: 'Assets'
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = '4.1.5'.freeze
5
+ VERSION = '4.1.6'.freeze
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.5
4
+ version: 4.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-27 00:00:00.000000000 Z
11
+ date: 2020-09-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: acts_as_list