effective_bootstrap 0.11.14 → 0.11.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 848fb136fecffedd81eac47539676db7be177b0416fb222e4b9e152233308dc3
-  data.tar.gz: 1b514490cbc2b00d40ab118a455df977ff0b3f2cd9293ae9db5e74b7675c4e8d
+  metadata.gz: 135872e85367ae5e9997d208b8f7761af52f58c9372c75e619b0ad2fb07c9b7e
+  data.tar.gz: 204a7bdee71fddc4008f6667fa484b9ba3b40dbde7906f605b705a8a0ac89bae
 SHA512:
-  metadata.gz: dc6df6d54902724a5a96b537f73dc325025f8fffd2ba086ee2bd857378cd06839a971e78ea59f870a066eacd7408c6073ba1d48346624f71500dcba09e229aa3
-  data.tar.gz: dbe501f91e7ebb8524cbc8effff86ee1e499bc18beed91765176263b35ac529b98154529130667466ab3475e3f1597f7d436d876563e682402e71a192b5b8d38
+  metadata.gz: e7a8fddb1d2d2811b2781a5154e0c5e0ea656a5af12b64e03b24b6034393eafbb4b46d6ec08b1e1080ad1af36fc51a95c053cb36a05c9d0c4d14f1a0546d1ce3
+  data.tar.gz: e73fd06ebaccc00dc9613bde686a2aa2b3b672d25897e11afa40cc3e5e39aeb63da0ba3705d6217df7496610dc7efd495bafae1d098b030796f9ddbe6b669800

data/app/models/effective/form_inputs/article_editor.rb

@@ -15,10 +15,7 @@ module Effective
 
           # This is overridden by the custom_css() method below
           custom: {
-            css: [
-              'application.css',
-              '/assets/effective_bootstrap_article_editor.css'
-            ]
+            css: ['application.css', '/assets/effective_bootstrap_article_editor.css']
           },
 
           # The rest of these are just normal Hash options
@@ -28,40 +25,23 @@ module Effective
             'right': 'text-right',
             'justify': false
           },
-          makebutton: {
-            items: {
-              primary: {
-                title: 'Primary',
-                params: { classname: 'btn btn-primary' }
-              },
-              secondary: {
-                title: 'Secondary',
-                params: { classname: 'btn btn-secondary' }
-              },
-              danger: {
-                title: 'Danger',
-                params: { classname: 'btn btn-danger' }
-              },
-              primary_large: {
-                title: 'Primary (large)',
-                params: { classname: 'btn btn-lg btn-primary' }
-              },
-              secondary_large: {
-                title: 'Secondary (large)',
-                params: { classname: 'btn btn-lg btn-secondary' }
-              },
-              danger_large: {
-                title: 'Danger (large)',
-                params: { classname: 'btn btn-lg btn-danger' }
-              }
-            }
-          },
-          classes: {
-            table: 'table'
+          cellcolors: {
+            'primary': { title: 'Primary', classname: 'table-primary' },
+            'secondary': { title: 'Secondary', classname: 'table-secondary' },
+            'active': { title: 'Active', classname: 'table-active' },
+            'success': { title: 'Success', classname: 'table-success' },
+            'danger': { title: 'Danger', classname: 'table-danger' },
+            'warning': { title: 'Warning', classname: 'table-warning' },
+            'info': { title: 'Info', classname: 'table-info' },
+            'light': { title: 'Light', classname: 'table-light' },
+            'dark': { title: 'Dark', classname: 'table-dark' }
           },
-          embed: {
-            script: false # do not strip out script tag from embeds
+          classes: { table: 'table' },
+          editor: {
+            csscache: true,  # Do not add ?=timestamp to css requests
+            https: true      # Embed links use https
           },
+          embed: { script: false }, # do not strip out script tag from embeds
           filelink: nil,
           format: ['p', 'h2', 'h3', 'h4', 'h5', 'ul', 'ol'],
           grid: {
@@ -92,6 +72,34 @@ module Effective
           },
           layer: false, # the layer button is confusing for the layperson
           link: { size: 500 }, # truncate after this length
+          makebutton: {
+            items: {
+              primary: {
+                title: 'Primary',
+                params: { classname: 'btn btn-primary' }
+              },
+              secondary: {
+                title: 'Secondary',
+                params: { classname: 'btn btn-secondary' }
+              },
+              danger: {
+                title: 'Danger',
+                params: { classname: 'btn btn-danger' }
+              },
+              primary_large: {
+                title: 'Primary (large)',
+                params: { classname: 'btn btn-lg btn-primary' }
+              },
+              secondary_large: {
+                title: 'Secondary (large)',
+                params: { classname: 'btn btn-lg btn-secondary' }
+              },
+              danger_large: {
+                title: 'Danger (large)',
+                params: { classname: 'btn btn-lg btn-danger' }
+              }
+            }
+          },
           outset: false, # tricky to design around
           plugins: ['blockcode', 'carousel', 'cellcolor', 'collapse', 'filelink', 'imageposition', 'imageresize', 'inlineformat', 'listitem', 'makebutton', 'removeformat', 'reorder', 'style'],
           quote: {
@@ -104,27 +112,26 @@ module Effective
               'small': { title: 'Small', classname: 'table-sm' },
               'striped': { title: 'Striped', classname: 'table-striped' },
             }
-          },
-          cellcolors: {
-            'primary': { title: 'Primary', classname: 'table-primary' },
-            'secondary': { title: 'Secondary', classname: 'table-secondary' },
-            'active': { title: 'Active', classname: 'table-active' },
-            'success': { title: 'Success', classname: 'table-success' },
-            'danger': { title: 'Danger', classname: 'table-danger' },
-            'warning': { title: 'Warning', classname: 'table-warning' },
-            'info': { title: 'Info', classname: 'table-info' },
-            'light': { title: 'Light', classname: 'table-light' },
-            'dark': { title: 'Dark', classname: 'table-dark' }
           }
         }
       end
 
-      def content
-        if defined?(ActionText::RichText) && value.kind_of?(ActionText::RichText)
-          return value.body&.to_html
-        end
+      def default_mode
+        self.class.defaults
+      end
 
-        value
+      def restricted_mode
+        self.class.defaults.merge(
+          code: false,
+          editor: { csscache: true, https: true, drop: false },
+          embed: false,
+          image: false,
+          plugins: ['blockcode', 'cellcolor', 'inlineformat', 'listitem', 'removeformat', 'reorder', 'style']
+        )
+      end
+
+      def content
+        (defined?(ActionText::RichText) && value.kind_of?(ActionText::RichText)) ? value.body&.to_html : value
       end
 
       def build_input(&block)
@@ -136,7 +143,14 @@ module Effective
       end
 
       def input_js_options
-        self.class.defaults.merge(active_storage: active_storage, css: css, custom: { css: custom_css })
+        case mode
+        when :default, :admin
+          default_mode.merge(active_storage: active_storage, css: css, custom: { css: custom_css })
+        when :restricted
+          restricted_mode.merge(active_storage: false, css: css, custom: { css: custom_css })
+        else
+          raise("unexpected mode: #{mode}. Try :default or :restricted")
+        end
       end
 
       def css
@@ -178,6 +192,20 @@ module Effective
         end
       end
 
+      def mode
+        return @mode unless @mode.nil?
+
+        @mode = if options.key?(:mode)
+          options.delete(:mode)
+        else
+          select_mode()
+        end
+      end
+
+      def select_mode
+        EffectiveResources.authorized?(@template, :admin, :effective_article_editor) ? :default : :restricted
+      end
+
     end
   end
 end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.11.14'.freeze
+  VERSION = '0.11.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.14
+  version: 0.11.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails