trusty-cms 7.0.39 → 7.0.40

data/app/assets/config/trusty-cms-manifest.js

@@ -5,3 +5,5 @@
 //= link admin/assets_admin.js
 //= link admin/custom_file_upload.js
 //= link admin/validations/scheduled_status_validation.js
+//= link trusty_cms/ckeditor5.js
+//= link trusty_cms/ckeditor5.css

data/app/assets/javascripts/admin.js

@@ -17,7 +17,6 @@
 //= require 'jquery-validation/dist/jquery.validate.min'
 //= require jquery-treetable/jquery.treetable.js
 //= require_tree './admin/validations'
-//= require ckeditor/init
 //= require 'admin/persist.min'
 //= require 'admin/modernizr'
 //= require 'admin/datecheck'

data/app/assets/stylesheets/admin/_ckeditor.css

@@ -0,0 +1,109 @@
+@import url('https://fonts.googleapis.com/css2?family=Oswald&family=PT+Serif:ital,wght@0,400;0,700;1,400&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400;1,700&display=swap');
+
+@media print {
+    body {
+        margin: 0 !important;
+    }
+}
+
+:root {
+    --ck-content-font-family: 'Lato';
+}
+
+.main-container {
+    font-family: var(--ck-content-font-family);
+    width: fit-content;
+    /* margin-left: auto;
+    margin-right: auto; */
+}
+
+.editor-container_classic-editor .editor-container__editor {
+    min-width: 750px;
+    max-width: 1300px;
+}
+
+.ck-content {
+    height: 600px;
+}
+
+.ck-content h3.category {
+    font-family: 'Oswald';
+    font-size: 20px;
+    font-weight: bold;
+    color: #555;
+    letter-spacing: 10px;
+    margin: 0;
+    padding: 0;
+}
+
+.ck-content h2.document-title {
+    font-family: 'Oswald';
+    font-size: 50px;
+    font-weight: bold;
+    margin: 0;
+    padding: 0;
+    border: 0;
+}
+
+.ck-content h3.document-subtitle {
+    font-family: 'Oswald';
+    font-size: 20px;
+    color: #555;
+    margin: 0 0 1em;
+    font-weight: bold;
+    padding: 0;
+}
+
+.ck-content p.info-box {
+    --background-size: 30px;
+    --background-color: #e91e63;
+    padding: 1.2em 2em;
+    border: 1px solid var(--background-color);
+    background:
+            linear-gradient(135deg, var(--background-color) 0%, var(--background-color) var(--background-size), transparent var(--background-size)),
+            linear-gradient(
+                    135deg,
+                    transparent calc(100% - var(--background-size)),
+                    var(--background-color) calc(100% - var(--background-size)),
+                    var(--background-color)
+            );
+    border-radius: 10px;
+    margin: 1.5em 2em;
+    box-shadow: 5px 5px 0 #ffe6ef;
+}
+
+.ck-content span.marker {
+    background: yellow;
+}
+
+.ck-content span.spoiler {
+    background: #000;
+    color: #000;
+}
+
+.ck-content span.spoiler:hover {
+    background: #000;
+    color: #fff;
+}
+
+.ck-content .button {
+    display: inline-block;
+    width: 260px;
+    border-radius: 8px;
+    margin: 0 auto;
+    padding: 12px;
+    color: #ffffff;
+    font-size: 24px;
+    font-weight: 700;
+    text-align: center;
+    text-decoration: none;
+}
+
+.ck-content .button--green {
+    background-color: #406b1e;
+}
+
+.ck-content .button--black {
+    background-color: #141517;
+}

data/app/assets/stylesheets/admin/main.scss

@@ -4,6 +4,7 @@
 @import "base";
 @import "reset";
 @import "tablesaw/dist/stackonly/tablesaw.stackonly.scss";
+@import "ckeditor";
 
 // Partials
 @import "partials/typography";

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

@@ -32,6 +32,7 @@ body.reversed {
   right: 0;
   top: 0;
   width: 100%;
+  z-index: 5;
 }
 
 .clipped {
@@ -52,6 +53,7 @@ body.reversed {
   position: fixed;
   right: 20px;
   top: 10px;
+  z-index: 5;
 
   &:hover {
     opacity: 1;

data/app/controllers/admin/assets_controller.rb

@@ -1,6 +1,7 @@
 class Admin::AssetsController < Admin::ResourceController
   paginate_models(per_page: 50)
   COMPRESS_FILE_TYPE = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'].freeze
+  APPROVED_CONTENT_TYPES = Asset::APPROVED_CONTENT_TYPES
 
   def index
     assets = Asset.order('created_at DESC')
@@ -28,27 +29,41 @@ class Admin::AssetsController < Admin::ResourceController
     end
   end
 
+  def uploader
+    @page_attachments = []
+    result = process_uploaded_asset(asset_params[:upload])
+
+    if result[:asset]
+      @asset = result[:asset]
+      if params[:for_attachment]
+        @page = Page.find_by_id(params[:page_id]) || Page.new
+        @page_attachments << (@page_attachment = @asset.page_attachments.build(page: @page))
+      end
+
+      render json: { url: @asset.asset.url }
+    else
+      flash[result.fetch(:flash_type, :error)] = result[:error]
+      render json: { error: result[:error] }, status: result.fetch(:status, :unprocessable_entity)
+    end
+  end
+
   def create
     @assets = []
     @page_attachments = []
-    compress = current_site.try(:compress).nil? ? true : current_site.compress
-    asset_params[:asset][:asset].reject(&:blank?).each do |uploaded_asset|
-      if uploaded_asset.content_type == 'application/octet-stream'
-        flash[:notice] = 'Please only upload assets that have a valid extension in the name.'
-      else
-        uploaded_asset = compress(uploaded_asset) if $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(uploaded_asset.content_type) && compress
-        @asset = Asset.create(asset: uploaded_asset, caption: asset_params[:asset][:caption])
-        if @asset.valid?
-          set_owner_or_editor
-          if params[:for_attachment]
-            @page = Page.find_by_id(params[:page_id]) || Page.new
-            @page_attachments << @page_attachment = @asset.page_attachments.build(page: @page)
-          end
-          @assets << @asset
-        else
-          error = @asset.errors.first.message
-          flash[:error] = error
+    uploads = Array(asset_params.dig('asset', 'asset')).reject(&:blank?)
+
+    uploads.each do |uploaded_asset|
+      result = process_uploaded_asset(uploaded_asset)
+
+      if result[:asset]
+        @asset = result[:asset]
+        if params[:for_attachment]
+          @page = Page.find_by_id(params[:page_id]) || Page.new
+          @page_attachments << (@page_attachment = @asset.page_attachments.build(page: @page))
         end
+        @assets << @asset
+      else
+        flash[result.fetch(:flash_type, :error)] = result[:error]
       end
     end
 
@@ -72,6 +87,44 @@ class Admin::AssetsController < Admin::ResourceController
 
   private
 
+  def process_uploaded_asset(uploaded_asset)
+    return failure_response('No file uploaded.', :unprocessable_entity, :error) unless uploaded_asset.present?
+
+    if uploaded_asset.content_type == 'application/octet-stream'
+      return failure_response('Please only upload assets that have a valid extension in the name.', :unprocessable_entity, :notice)
+    end
+
+    unless APPROVED_CONTENT_TYPES.include?(uploaded_asset.content_type)
+      return failure_response('Unsupported file type.', :unsupported_media_type, :error)
+    end
+
+    processed_upload = maybe_compress(uploaded_asset)
+    asset = Asset.create(asset: processed_upload, caption: '')
+
+    if asset.valid?
+      set_owner_or_editor(asset)
+      { asset: asset }
+    else
+      failure_response(asset.errors.full_messages.first, :unprocessable_entity, :error)
+    end
+  end
+
+  def maybe_compress(uploaded_asset)
+    should_compress?(uploaded_asset.content_type) ? compress(uploaded_asset) : uploaded_asset
+  end
+
+  def should_compress?(content_type)
+    $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(content_type) && compression_enabled?
+  end
+
+  def compression_enabled?
+    current_site.try(:compress).nil? ? true : current_site.compress
+  end
+
+  def failure_response(message, status, flash_type)
+    { error: message, status: status, flash_type: flash_type }
+  end
+
   def compress(uploaded_asset)
     require 'open-uri'
     data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
@@ -80,13 +133,15 @@ class Admin::AssetsController < Admin::ResourceController
     uploaded_asset
   end
 
-  def set_owner_or_editor
-    @asset.created_by_id = current_user.id
-    @asset.updated_by_id = current_user.id
-    @asset.save! if @asset.id.present?
+  def set_owner_or_editor(asset = @asset)
+    return unless asset
+
+    asset.created_by_id = current_user.id
+    asset.updated_by_id = current_user.id
+    asset.save! if asset.id.present?
   end
 
   def asset_params
-    params.permit(:id, :for_attachment, asset: [:for_attachment, { asset: [] }])
+    params.permit(:id, :upload, :for_attachment, asset: [:for_attachment, { asset: [] }])
   end
-end
+end

data/app/controllers/admin/pages_controller.rb

@@ -2,6 +2,7 @@ class Admin::PagesController < Admin::ResourceController
   before_action :initialize_meta_rows_and_buttons, only: %i[new edit create update]
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
+  before_action :append_editor_stylesheets, only: %i[new edit create update]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
   include Admin::PagesHelper
   include Admin::UrlHelper
@@ -181,6 +182,36 @@ class Admin::PagesController < Admin::ResourceController
     raise PreviewStop
   end
 
+  def append_editor_stylesheets
+    return unless TrustyCms.respond_to?(:editor_stylesheets)
+
+    @stylesheets ||= []
+    @stylesheets |= editor_stylesheets_for_current_site
+    @editor_style_definitions = TrustyCms.editor_style_definitions
+  end
+
+  def editor_stylesheets_for_current_site
+    stylesheets = TrustyCms.editor_stylesheets
+    return stylesheets unless respond_to?(:current_site) && current_site.present?
+
+    stylesheets.filter_map do |entry|
+      site_key, path =
+        case entry
+        when Hash
+          [entry[:site], entry[:path]]
+        else
+          [nil, entry] # backward compatibility with plain strings
+        end
+
+      next path if site_key.blank? # global stylesheet
+      next path if site_key.to_s == identifier_for(current_site)
+    end
+  end
+
+  def identifier_for(site)
+    current_site.try(:name)&.downcase.gsub(' ', '_')
+  end
+
   def count_deleted_pages
     @count = model.children.count + 1
   end