pages_core 3.15.4 → 3.15.5

data/app/assets/builds/pages_core/mailer.css

@@ -26,7 +26,39 @@ p {
   margin: 0 0 1rem 0;
 }
 
-h1:last-child, h2:last-child, h3:last-child, h4:last-child, h5:last-child, h6:last-child, ul:last-child, ol:last-child, p:last-child {
+h1:last-child {
+    margin-bottom: 0rem;
+  }
+
+h2:last-child {
+    margin-bottom: 0rem;
+  }
+
+h3:last-child {
+    margin-bottom: 0rem;
+  }
+
+h4:last-child {
+    margin-bottom: 0rem;
+  }
+
+h5:last-child {
+    margin-bottom: 0rem;
+  }
+
+h6:last-child {
+    margin-bottom: 0rem;
+  }
+
+ul:last-child {
+    margin-bottom: 0rem;
+  }
+
+ol:last-child {
+    margin-bottom: 0rem;
+  }
+
+p:last-child {
     margin-bottom: 0rem;
   }
 
@@ -66,14 +98,14 @@ a.button {
   text-decoration: none;
 }
 
-button.primary, a.button.primary {
+button.primary:not(.does-not-exist),a.primary.button {
     background: #111;
     border-color: #111;
     color: #fff;
     box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.2);
   }
 
-button.primary:hover, a.button.primary:hover {
+button.primary:not(.does-not-exist):hover,a.primary.button:hover {
       box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.1);
     }
 
@@ -82,7 +114,11 @@ table {
   margin: 1.5rem 0;
 }
 
-.buttons:last-child, table:last-child {
+.buttons:last-child {
+    margin-bottom: 0px;
+  }
+
+table:not(.does-not-exist):last-child {
     margin-bottom: 0px;
   }
 
@@ -91,8 +127,7 @@ table {
   border-top: 1px solid #ddd;
 }
 
-table th,
-  table td {
+table th,table td {
     text-align: left;
     padding: 0.5rem 1rem 0.5rem 0;
     border-bottom: 1px solid #ddd;

data/app/assets/stylesheets/pages_core/admin/components/forms.css

@@ -146,7 +146,7 @@ form {
   display: table;
   padding: 1px;
   padding-right: 22px;
-  background: transparent url("pages/admin/warning-icon.gif") right 5px
+  background: transparent url("/pages/admin/warning-icon.gif") right 5px
     no-repeat;
 }
 
@@ -242,7 +242,7 @@ select {
 
 select {
   padding-right: 2em;
-  background-image: url("pages/admin/angle-down-solid.svg");
+  background-image: url("/pages/admin/angle-down-solid.svg");
   background-position: top 50% right 0.5em;
   background-repeat: no-repeat;
   background-size: 1em 1em;

data/app/assets/stylesheets/pages_core/admin/components/header.css

@@ -16,7 +16,7 @@ header {
   }
 
   .logo {
-    background: url("pages/admin/icon.svg");
+    background: url("/pages/admin/icon.svg");
     background-repeat: no-repeat;
     min-height: 27px;
     padding-left: 38px;

data/app/assets/stylesheets/pages_core/admin/controllers/pages.css

@@ -6,7 +6,7 @@
   margin-left: 6px;
   width: 13px;
   height: 16px;
-  background-image: url("pages/admin/drag-icon.png");
+  background-image: url("/pages/admin/drag-icon.png");
 }
 
 td.drag-handle {

data/app/assets/stylesheets/pages_core/admin/global/fonts.css

@@ -5,7 +5,7 @@
   font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  src: url("InterVariable.woff2") format("woff2");
+  src: url("/InterVariable.woff2") format("woff2");
 }
 
 @font-face {
@@ -13,133 +13,133 @@
   font-style: italic;
   font-weight: 100 900;
   font-display: swap;
-  src: url("InterVariable-Italic.woff2") format("woff2");
+  src: url("/InterVariable-Italic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 100;
-  src: url("Inter-Thin.woff2") format("woff2");
+  src: url("/Inter-Thin.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 100;
-  src: url("Inter-ThinItalic.woff2") format("woff2");
+  src: url("/Inter-ThinItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 200;
-  src: url("Inter-ExtraLight.woff2") format("woff2");
+  src: url("/Inter-ExtraLight.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 200;
-  src: url("Inter-ExtraLightItalic.woff2") format("woff2");
+  src: url("/Inter-ExtraLightItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 300;
-  src: url("Inter-Light.woff2") format("woff2");
+  src: url("/Inter-Light.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 300;
-  src: url("Inter-LightItalic.woff2") format("woff2");
+  src: url("/Inter-LightItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 400;
-  src: url("Inter-Regular.woff2") format("woff2");
+  src: url("/Inter-Regular.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 400;
-  src: url("Inter-Italic.woff2") format("woff2");
+  src: url("/Inter-Italic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 500;
-  src: url("Inter-Medium.woff2") format("woff2");
+  src: url("/Inter-Medium.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 500;
-  src: url("Inter-MediumItalic.woff2") format("woff2");
+  src: url("/Inter-MediumItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 600;
-  src: url("Inter-SemiBold.woff2") format("woff2");
+  src: url("/Inter-SemiBold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 600;
-  src: url("Inter-SemiBoldItalic.woff2") format("woff2");
+  src: url("/Inter-SemiBoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 700;
-  src: url("Inter-Bold.woff2") format("woff2");
+  src: url("/Inter-Bold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 700;
-  src: url("Inter-BoldItalic.woff2") format("woff2");
+  src: url("/Inter-BoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 800;
-  src: url("Inter-ExtraBold.woff2") format("woff2");
+  src: url("/Inter-ExtraBold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 800;
-  src: url("Inter-ExtraBoldItalic.woff2") format("woff2");
+  src: url("/Inter-ExtraBoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: normal;
   font-weight: 900;
-  src: url("Inter-Black.woff2") format("woff2");
+  src: url("/Inter-Black.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Inter";
   font-style: italic;
   font-weight: 900;
-  src: url("Inter-BlackItalic.woff2") format("woff2");
+  src: url("/Inter-BlackItalic.woff2") format("woff2");
 }
 
 /* InterDisplay */
@@ -148,124 +148,124 @@
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 100;
-  src: url("InterDisplay-Thin.woff2") format("woff2");
+  src: url("/InterDisplay-Thin.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 100;
-  src: url("InterDisplay-ThinItalic.woff2") format("woff2");
+  src: url("/InterDisplay-ThinItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 200;
-  src: url("InterDisplay-ExtraLight.woff2") format("woff2");
+  src: url("/InterDisplay-ExtraLight.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 200;
-  src: url("InterDisplay-ExtraLightItalic.woff2") format("woff2");
+  src: url("/InterDisplay-ExtraLightItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 300;
-  src: url("InterDisplay-Light.woff2") format("woff2");
+  src: url("/InterDisplay-Light.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 300;
-  src: url("InterDisplay-LightItalic.woff2") format("woff2");
+  src: url("/InterDisplay-LightItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 400;
-  src: url("InterDisplay-Regular.woff2") format("woff2");
+  src: url("/InterDisplay-Regular.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 400;
-  src: url("InterDisplay-Italic.woff2") format("woff2");
+  src: url("/InterDisplay-Italic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 500;
-  src: url("InterDisplay-Medium.woff2") format("woff2");
+  src: url("/InterDisplay-Medium.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 500;
-  src: url("InterDisplay-MediumItalic.woff2") format("woff2");
+  src: url("/InterDisplay-MediumItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 600;
-  src: url("InterDisplay-SemiBold.woff2") format("woff2");
+  src: url("/InterDisplay-SemiBold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 600;
-  src: url("InterDisplay-SemiBoldItalic.woff2") format("woff2");
+  src: url("/InterDisplay-SemiBoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 700;
-  src: url("InterDisplay-Bold.woff2") format("woff2");
+  src: url("/InterDisplay-Bold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 700;
-  src: url("InterDisplay-BoldItalic.woff2") format("woff2");
+  src: url("/InterDisplay-BoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 800;
-  src: url("InterDisplay-ExtraBold.woff2") format("woff2");
+  src: url("/InterDisplay-ExtraBold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 800;
-  src: url("InterDisplay-ExtraBoldItalic.woff2") format("woff2");
+  src: url("/InterDisplay-ExtraBoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: normal;
   font-weight: 900;
-  src: url("InterDisplay-Black.woff2") format("woff2");
+  src: url("/InterDisplay-Black.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "InterDisplay";
   font-style: italic;
   font-weight: 900;
-  src: url("InterDisplay-BlackItalic.woff2") format("woff2");
+  src: url("/InterDisplay-BlackItalic.woff2") format("woff2");
 }

data/app/controllers/{pages_core → admin}/admin_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-# All admin controllers inherit Admin::AdminController, which provides layout,
-# authorization and other common code for the Admin set of controllers.
-module PagesCore
+module Admin
   class AdminController < ::ApplicationController
     protect_from_forgery with: :exception
 

data/app/controllers/attachments_controller.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class AttachmentsController < ApplicationController
+  include PagesCore::RangedResponse
+
+  before_action :verify_signed_params
+  before_action :find_attachment, only: %i[show download]
+
+  static_cache :show, permanent: true
+
+  def show
+    send_attachment
+  end
+
+  def download
+    send_attachment disposition: "attachment"
+  end
+
+  private
+
+  def find_attachment
+    @attachment = Attachment.find(params[:id])
+  end
+
+  def send_attachment(disposition: "inline")
+    unless stale?(etag: @attachment, last_modified: @attachment.updated_at)
+      return
+    end
+
+    send_ranged_data(@attachment.data,
+                     filename: @attachment.filename,
+                     type: @attachment.content_type,
+                     disposition:)
+  end
+
+  def verify_signed_params
+    key = params[:id].to_i.to_s
+    Attachment.verifier.verify(key, params[:digest])
+  end
+end

data/app/controllers/concerns/pages_core/document_title_controller.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module DocumentTitleController
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :document_title
+    end
+
+    def document_title(*args)
+      @document_title = args.first if args.any?
+      @document_title
+    end
+  end
+end

data/app/controllers/concerns/pages_core/page_parameters.rb

@@ -23,7 +23,7 @@ module PagesCore
     def page_static_attributes
       %i[template user_id status feed_enabled published_at redirect_to
          news_page unique_name pinned parent_page_id serialized_tags
-         meta_image_id starts_at ends_at all_day]
+         meta_image_id starts_at ends_at all_day skip_index]
     end
   end
 end

data/app/controllers/concerns/pages_core/pages/preview_controller.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Pages
+    module PreviewController
+      extend ActiveSupport::Concern
+      include PagesCore::PageParameters
+
+      included do
+        before_action :disable_xss_protection, only: %i[preview]
+      end
+
+      def preview?
+        @preview || false
+      end
+
+      def preview
+        render_error 403 unless logged_in?
+
+        @preview = true
+        @page = Page.find_by(id: params[:page_id]) || Page.new
+        @page.readonly!
+        @page.assign_attributes(preview_page_params)
+
+        render_page
+      end
+
+      private
+
+      def disable_xss_protection
+        # Disabling this is probably not a good idea,
+        # but the header causes Chrome to choke when being
+        # redirected back after a submit and the page contains an iframe.
+        response.headers["X-XSS-Protection"] = "0"
+      end
+
+      def preview_page_params
+        ActionController::Parameters.new(
+          JSON.parse(params.require(:preview_page))
+        ).permit(:id, page_content_attributes).merge(
+          status: 2,
+          published_at: Time.zone.now,
+          locale: content_locale,
+          redirect_to: nil
+        )
+      end
+    end
+  end
+end