trusty-cms 4.1.0 → 4.1.1
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +4 -4
- data/app/assets/stylesheets/admin/partials/_messages.scss +7 -2
- data/app/assets/stylesheets/admin/partials/_popup.scss +1 -1
- data/app/views/admin/assets/remove.html.haml +1 -1
- data/app/views/admin/layouts/remove.html.haml +1 -1
- data/app/views/admin/pages/remove.html.haml +2 -1
- data/app/views/admin/sites/index.haml +3 -1
- data/app/views/admin/snippets/remove.html.haml +2 -2
- data/app/views/admin/users/remove.html.haml +2 -2
- data/config/locales/en.yml +4 -4
- data/lib/trusty_cms.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 495dd85a4cd0982f102f8fb63be44f2d2e7dbe8c51808bf5ef0b6979d31cd0d3
|
|
4
|
+
data.tar.gz: 00b74e6d0c539056d9c2c8d47cd197718c073698583d5fb2c9d7c19c65664d0a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9da73e25d40b13367c1154eed3cc3f84a32c41a5d42435e5647a0cee356bb25578bf6d23f1a4d39d213a2ba7fedc1ea8e169d752b9f6d7046e2e4600e73d914e
|
|
7
|
+
data.tar.gz: cb4e090a2593a62755be1f19f2140cdfdaf1916adb3c4b20f78e79968205f300aa40c2eed33ed7ebf12ac9ff43e64696525d0c4a6455a2ae479e63b947f1df06
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
trusty-cms (4.1.
|
|
4
|
+
trusty-cms (4.1.1)
|
|
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)
|
|
@@ -168,7 +168,7 @@ GEM
|
|
|
168
168
|
multipart-post
|
|
169
169
|
launchy (2.5.0)
|
|
170
170
|
addressable (~> 2.7)
|
|
171
|
-
libv8 (7.3.492.27.1
|
|
171
|
+
libv8 (7.3.492.27.1)
|
|
172
172
|
loofah (2.4.0)
|
|
173
173
|
crass (~> 1.0.2)
|
|
174
174
|
nokogiri (>= 1.5.9)
|
|
@@ -183,8 +183,8 @@ GEM
|
|
|
183
183
|
mimemagic (0.3.4)
|
|
184
184
|
mini_mime (1.0.2)
|
|
185
185
|
mini_portile2 (2.4.0)
|
|
186
|
-
mini_racer (0.2.
|
|
187
|
-
libv8 (
|
|
186
|
+
mini_racer (0.2.10)
|
|
187
|
+
libv8 (> 7.3)
|
|
188
188
|
minitest (5.14.0)
|
|
189
189
|
multi_xml (0.6.0)
|
|
190
190
|
multipart-post (2.1.1)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
.notice, .error
|
|
1
|
+
.notice, .error {
|
|
2
2
|
padding: 1em;
|
|
3
3
|
}
|
|
4
4
|
|
|
@@ -7,7 +7,12 @@
|
|
|
7
7
|
color: #006600;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
.error
|
|
10
|
+
.error {
|
|
11
11
|
background-color: #f3c2c2;
|
|
12
12
|
color: $alt-link-color;
|
|
13
13
|
}
|
|
14
|
+
|
|
15
|
+
.warning {
|
|
16
|
+
color: $alt-link-color;
|
|
17
|
+
line-height: 1em;
|
|
18
|
+
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
= stylesheet_link_tag 'admin/assets'
|
|
3
3
|
|
|
4
4
|
%h1= t("clipped_extension.remove_asset")
|
|
5
|
-
%
|
|
5
|
+
%h4.warning= t("clipped_extension.confirm_remove_asset")
|
|
6
6
|
|
|
7
7
|
%table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
|
|
8
8
|
%tbody
|
|
@@ -31,7 +31,9 @@
|
|
|
31
31
|
= h(site.base_domain)
|
|
32
32
|
- tbody.modify_cell do
|
|
33
33
|
%td.remove
|
|
34
|
-
= link_to
|
|
34
|
+
= link_to admin_site_path(site), :method => :delete, :onclick => "return confirm('Are you sure you want to permanently remove #{site.name}?')" do
|
|
35
|
+
%i.fas.fa-minus-circle
|
|
36
|
+
= t('remove')
|
|
35
37
|
- tbody.order_cell do
|
|
36
38
|
%td.order
|
|
37
39
|
= order_links(site).html_safe
|
data/config/locales/en.yml
CHANGED
|
@@ -84,7 +84,7 @@ en:
|
|
|
84
84
|
documents: 'Documents'
|
|
85
85
|
caption: 'Caption'
|
|
86
86
|
confirm_refresh_assets: 'Are you sure you want to regenerate every asset thumbnail? This is likely to take a long time and use a lot of server resources: <strong class="warning">the performance of your site is very likely to be affected</strong> and your browser may time out before the operation is complete. This is only recommended if your asset collection is small!'
|
|
87
|
-
confirm_remove_asset: 'Are you sure you want to permanently remove the following asset?'
|
|
87
|
+
confirm_remove_asset: 'Are you sure you want to <span class="warning">permanently remove</span> the following asset?'
|
|
88
88
|
confirm_remove_from_page: 'Are you sure you want to remove this asset from the page?'
|
|
89
89
|
delete_asset: 'Delete Asset'
|
|
90
90
|
detach: 'Detach'
|
|
@@ -279,11 +279,11 @@ en:
|
|
|
279
279
|
testing: Testing
|
|
280
280
|
text:
|
|
281
281
|
layouts:
|
|
282
|
-
remove_warning: 'Are you sure you want to <
|
|
282
|
+
remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following layout?'
|
|
283
283
|
pages:
|
|
284
|
-
remove_warning: 'Are you sure you want to <
|
|
284
|
+
remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following %{pages}?'
|
|
285
285
|
users:
|
|
286
|
-
remove_warning: 'Are you sure you want to <
|
|
286
|
+
remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following user?'
|
|
287
287
|
this_file_language: "English"
|
|
288
288
|
time:
|
|
289
289
|
am: 'am'
|
data/lib/trusty_cms.rb
CHANGED
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.
|
|
4
|
+
version: 4.1.1
|
|
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-04-
|
|
11
|
+
date: 2020-04-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: acts_as_list
|