trusty-cms 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cec5c72cf1d47c8753242f4bb6933ee6e11f2aa6dac456417d7cbc66b9b9f34
-  data.tar.gz: 891578d38ac65c2fc85e8525cf7e2f60ded3e9c68c33da8120783c7c093d785e
+  metadata.gz: 495dd85a4cd0982f102f8fb63be44f2d2e7dbe8c51808bf5ef0b6979d31cd0d3
+  data.tar.gz: 00b74e6d0c539056d9c2c8d47cd197718c073698583d5fb2c9d7c19c65664d0a
 SHA512:
-  metadata.gz: 4dc36d74cdd75908dce51329e1addbaf2dc071cca18286b855212a16f61516967106345ee2114a68a173f6627496ee66b7b745547509a41a14ded504bfc178da
-  data.tar.gz: a2f248822127a1fa38166eda8f11e6e90b3da5d5344e9a9a4d6b66bc3313bdb3821f18b2467828f60b2a10b18890bf9e8f41aa5b4317cac45f62135e4764877a
+  metadata.gz: 9da73e25d40b13367c1154eed3cc3f84a32c41a5d42435e5647a0cee356bb25578bf6d23f1a4d39d213a2ba7fedc1ea8e169d752b9f6d7046e2e4600e73d914e
+  data.tar.gz: cb4e090a2593a62755be1f19f2140cdfdaf1916adb3c4b20f78e79968205f300aa40c2eed33ed7ebf12ac9ff43e64696525d0c4a6455a2ae479e63b947f1df06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.1.0)
+    trusty-cms (4.1.1)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -168,7 +168,7 @@ GEM
       multipart-post
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8 (7.3.492.27.1-x86_64-darwin-18)
+    libv8 (7.3.492.27.1)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -183,8 +183,8 @@ GEM
     mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
+    mini_racer (0.2.10)
+      libv8 (> 7.3)
     minitest (5.14.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)

data/app/assets/stylesheets/admin/partials/_messages.scss

@@ -1,4 +1,4 @@
-.notice, .error, .warning {
+.notice, .error {
   padding: 1em;
 }
 
@@ -7,7 +7,12 @@
   color: #006600;
 }
 
-.error, .warning {
+.error {
   background-color: #f3c2c2;
   color: $alt-link-color;
 }
+
+.warning {
+  color: $alt-link-color;
+  line-height: 1em;
+}

data/app/assets/stylesheets/admin/partials/_popup.scss

@@ -1,4 +1,4 @@
-.popup {
+div.popup {
   background-color: $white;
   border: 1px solid #777777;
   color: #333333;

data/app/views/admin/assets/remove.html.haml

@@ -2,7 +2,7 @@
 = stylesheet_link_tag 'admin/assets'
 
 %h1= t("clipped_extension.remove_asset")
-%p.warning= t("clipped_extension.confirm_remove_asset")
+%h4.warning= t("clipped_extension.confirm_remove_asset")
 
 %table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
   %tbody

data/app/views/admin/layouts/remove.html.haml

@@ -1,6 +1,6 @@
 %h1= t('remove_layout')
 
-%p= t('text.layouts.remove_warning').html_safe
+%h4= t('text.layouts.remove_warning').html_safe
 
 %table.index#layouts
   %tbody

data/app/views/admin/pages/remove.html.haml

@@ -1,9 +1,10 @@
 - pages = @page.children.count > 1 ? t('pages') : t('page')
+- body_classes << 'reversed'
 
 %h1
   = t('remove_pages', :pages => pages)
 
-%p
+%h4
   = t('text.pages.remove_warning', :pages => pages).html_safe
 
 .inset

data/app/views/admin/sites/index.haml

@@ -31,7 +31,9 @@
               = h(site.base_domain)
           - tbody.modify_cell do
             %td.remove
-              = link_to image('remove.png', :alt => 'Remove'), admin_site_path(site), :method => :delete, :onclick => "return confirm('Are you sure you want to permanently remove #{site.name}?')"
+              = link_to admin_site_path(site), :method => :delete, :onclick => "return confirm('Are you sure you want to permanently remove #{site.name}?')" do
+                %i.fas.fa-minus-circle
+                = t('remove')
           - tbody.order_cell do
             %td.order
               = order_links(site).html_safe

data/app/views/admin/snippets/remove.html.haml

@@ -1,7 +1,7 @@
 %h1= t('remove_snippet')
 
-%p 
-  = t('text.snippets.remove_warning')
+%h4
+  = t('text.snippets.remove_warning').html_safe
 
 %table.index#snippets
   %tbody

data/app/views/admin/users/remove.html.haml

@@ -1,7 +1,7 @@
 %h1= t('remove_user')
 
-%p
-  = t('text.users.remove_warning')
+%h4
+  = t('text.users.remove_warning').html_safe
 
 %table.index#users
   %tbody

data/config/locales/en.yml

@@ -84,7 +84,7 @@ en:
     documents: 'Documents'
     caption: 'Caption'
     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!'
-    confirm_remove_asset: 'Are you sure you want to permanently remove the following asset?'
+    confirm_remove_asset: 'Are you sure you want to <span class="warning">permanently remove</span> the following asset?'
     confirm_remove_from_page: 'Are you sure you want to remove this asset from the page?'
     delete_asset: 'Delete Asset'
     detach: 'Detach'
@@ -279,11 +279,11 @@ en:
   testing: Testing
   text:
     layouts:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following layout?'
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following layout?'
     pages:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following %{pages}?'
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following %{pages}?'
     users:
-      remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following user?'
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following user?'
   this_file_language: "English"
   time:
     am: 'am'

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.1.0'
+    VERSION = '4.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list