pages_core 3.12.1 → 3.12.3

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

@@ -83,10 +83,11 @@ a {
  */
 
 abbr[title] {
-  border-bottom: none; /* 1 */ /* 2 */
+  border-bottom: none; /* 1 */
+  -webkit-text-decoration: underline; /* 2 */
   text-decoration: underline;
-  -webkit-text-decoration: underline dotted currentColor;
-          text-decoration: underline dotted currentColor; /* 2 */
+  -webkit-text-decoration: underline dotted;
+          text-decoration: underline dotted; /* 2 */
 }
 
 /**
@@ -7454,6 +7455,7 @@ header .site-name h1 {
 
 header .site-name h1 a {
         font-weight: bold;
+        -webkit-text-decoration: none;
         text-decoration: none;
         padding-right: 6px;
       }
@@ -7517,6 +7519,7 @@ header .tabs a,
       line-height: 32px;
       height: 32px;
       margin: 0 2px 0 0;
+      -webkit-text-decoration: none;
       text-decoration: none;
     }
 
@@ -7553,6 +7556,7 @@ header .tabs a:hover,
 
 .content-tabs li.current a,
     .content-tabs li.current a:visited {
+      -webkit-text-decoration: none;
       text-decoration: none;
       color: #444;
     }
@@ -7590,6 +7594,7 @@ header .tabs a:hover,
 
 .page-description .links a.current {
         font-weight: bold;
+        -webkit-text-decoration: none;
         text-decoration: none;
         color: #111;
         color: var(--text-color);
@@ -7778,18 +7783,6 @@ main .page-description h3 {
     overflow: hidden;
   }
 
-.image-editor .focal-editor .focal-point:after {
-        content: "";
-        display: block;
-        width: 32px;
-        height: 32px;
-        border-radius: 16px;
-        border: 1px solid rgba(0, 0, 0, 0.3);
-        margin-left: -4px;
-        margin-top: -4px;
-        transition: all 200ms ease-out;
-      }
-
 .image-editor .focal-editor .focal-point {
       position: absolute;
       width: 30px;
@@ -7808,11 +7801,17 @@ main .page-description h3 {
       transition: border-radius 200ms, margin 200ms, width 200ms, height 200ms, border-color 200ms ease-out;
     }
 
-.image-editor .focal-editor .focal-point:hover:after {
-          width: 42px;
-          height: 42px;
-          border-radius: 21px;
-        }
+.image-editor .focal-editor .focal-point:after {
+        content: "";
+        display: block;
+        width: 32px;
+        height: 32px;
+        border-radius: 16px;
+        border: 1px solid rgba(0, 0, 0, 0.3);
+        margin-left: -4px;
+        margin-top: -4px;
+        transition: all 200ms ease-out;
+      }
 
 .image-editor .focal-editor .focal-point:hover {
         border-color: rgba(222, 255, 255, 0.9);
@@ -7823,6 +7822,12 @@ main .page-description h3 {
         margin-top: -20px;
       }
 
+.image-editor .focal-editor .focal-point:hover:after {
+          width: 42px;
+          height: 42px;
+          border-radius: 21px;
+        }
+
 .image-grid {
   --image-padding: 7px;
   margin-bottom: 40px;
@@ -8197,6 +8202,7 @@ a,
 a:visited {
   color: #1d7195;
   color: var(--link-color);
+  -webkit-text-decoration: underline;
   text-decoration: underline;
 }
 
@@ -8241,6 +8247,7 @@ button a {
 
 button a {
   padding: 5px 0;
+  -webkit-text-decoration: none;
   text-decoration: none;
 }
 
@@ -8543,11 +8550,13 @@ body.modal > .wrapper {
     .page-tree .page a:visited {
       color: #111;
       color: var(--text-color);
+      -webkit-text-decoration: none;
       text-decoration: none;
     }
 
 .page-tree .page a:hover,
     .page-tree .page a:focus {
+      -webkit-text-decoration: underline;
       text-decoration: underline;
     }
 
@@ -8652,6 +8661,7 @@ body.modal > .wrapper {
     display: inline-block;
     font-style: normal;
     margin: 0px 1px;
+    -webkit-text-decoration: none;
     text-decoration: none;
     padding: 2px;
     border-radius: 12px;
@@ -8661,6 +8671,7 @@ body.modal > .wrapper {
 
 .pagination a:hover,
   .pagination a:focus {
+    -webkit-text-decoration: underline;
     text-decoration: underline;
   }
 
@@ -8690,6 +8701,38 @@ body.modal > .wrapper {
   margin: 20px -2px;
 }
 
+.search-bar {
+  display: flex;
+}
+
+.search-bar input {
+    flex: 1 1 auto;
+    border-right: none;
+    max-width: 600px;
+    min-width: 50px;
+  }
+
+.search-bar input:focus {
+      z-index: 20;
+    }
+
+.search-bar button {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    white-space: nowrap;
+  }
+
+main .search-bar {
+  background: #f8f8f8;
+  background: var(--background-disabled-color);
+  padding: 16px 32px;
+  margin: 0px 0px 16px 0px;
+}
+
+.sidebar .search-bar {
+  margin-top: 16px;
+}
+
 .sidebar {
   background: #f8f8f8;
   background: var(--background-disabled-color);
@@ -9065,11 +9108,13 @@ td.drag-handle {
 
 .page-list .page a.page-name,
     .page-list .page a.page-name:visited {
+      -webkit-text-decoration: none;
       text-decoration: none;
       color: #222;
     }
 
 .page-list .page a.page-name:hover {
+      -webkit-text-decoration: underline;
       text-decoration: underline;
     }
 
@@ -9131,6 +9176,13 @@ td.drag-handle {
       font-weight: normal;
     }
 
+.news-item-list .autopublish-notice, .calendar-item-list .autopublish-notice {
+    font-size: 0.75rem;
+    font-weight: normal;
+    color: #666;
+    color: var(--text-light-color);
+  }
+
 .news-item-list .draft,
   .calendar-item-list .draft,
   .news-item-list .hidden,

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

@@ -105,7 +105,7 @@
   width: 60vw;
   min-height: 450px;
 
-  @media --mobile {
+  @media (--mobile) {
     width: 100%;
     height: 100%;
   }

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

@@ -33,7 +33,7 @@
   height: 80vh;
   display: flex;
 
-  @media --mobile {
+  @media (--mobile) {
     width: 100%;
     height: 100%;
     flex-direction: column;
@@ -145,7 +145,7 @@
       }
     }
 
-    @media --mobile {
+    @media (--mobile) {
       width: 100%;
       margin-left: 0px;
       padding-bottom: 20px;

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

@@ -3,7 +3,7 @@
   margin-bottom: 40px;
   display: flex;
 
-  @media --mobile {
+  @media (--mobile) {
     flex-direction: column;
   }
 
@@ -87,7 +87,7 @@
       flex-direction: row;
       visibility: hidden;
 
-      @media --mobile {
+      @media (--mobile) {
         visibility: visible;
       }
 
@@ -106,7 +106,7 @@
   & .primary-image {
     width: 33.33%;
 
-    @media --mobile {
+    @media (--mobile) {
       width: 100%;
     }
 
@@ -147,11 +147,11 @@
         justify-content: flex-end;
         width: 16.66%;
 
-        @media --narrow {
+        @media (--narrow) {
           width: 50%;
         }
 
-        @media --mobile {
+        @media (--mobile) {
           width: 50%;
         }
       }
@@ -185,7 +185,7 @@
     & .grid {
       width: 66.67%;
 
-      @media --mobile {
+      @media (--mobile) {
         width: 100%;
       }
     }
@@ -193,11 +193,11 @@
     & .images .grid-image {
       width: 25%;
 
-      @media --narrow {
+      @media (--narrow) {
         width: 50%;
       }
 
-      @media --mobile {
+      @media (--mobile) {
         width: 50%;
       }
     }

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

@@ -9,7 +9,7 @@
   box-shadow: inset 0px 0px 1px rgba(0, 0, 0, 0.1);
   padding: 1px;
 
-  @media --mobile {
+  @media (--mobile) {
     flex-direction: column;
   }
 
@@ -29,7 +29,7 @@
       max-height: 400px;
     }
 
-    @media --mobile {
+    @media (--mobile) {
       max-width: 100%;
     }
   }

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

@@ -28,7 +28,7 @@ body {
   display: flex;
   flex-flow: row nowrap;
 
-  @media --mobile {
+  @media (--mobile) {
     flex-flow: column nowrap;
   }
 
@@ -42,7 +42,7 @@ body {
     width: 20%;
     padding: 0px 16px;
 
-    @media --mobile {
+    @media (--mobile) {
       width: 100%;
     }
   }

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

@@ -3,7 +3,7 @@ body.modal {
     transition: filter 1000ms linear;
     filter: blur(10px);
 
-    @media --mobile {
+    @media (--mobile) {
       filter: none;
     }
   }
@@ -41,7 +41,7 @@ body.modal {
     animation-fill-mode: forwards;
     z-index: 2;
 
-    @media --mobile {
+    @media (--mobile) {
       max-width: 100%;
       width: 100vw;
       height: 100vh;

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

@@ -0,0 +1,27 @@
+.search-bar {
+  display: flex;
+  & input {
+    flex: 1 1 auto;
+    border-right: none;
+    max-width: 600px;
+    min-width: 50px;
+    &:focus {
+      z-index: 20;
+    }
+  }
+  & button {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    white-space: nowrap;
+  }
+}
+
+main .search-bar {
+  background: var(--background-disabled-color);
+  padding: 16px 32px;
+  margin: 0px 0px 16px 0px;
+}
+
+.sidebar .search-bar {
+  margin-top: 16px;
+}

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

@@ -122,6 +122,12 @@ td.drag-handle {
     }
   }
 
+  & .autopublish-notice {
+    font-size: 0.75rem;
+    font-weight: normal;
+    color: var(--text-light-color);
+  }
+
   & .draft,
   & .hidden,
   & .autopublish,

data/app/controllers/admin/pages_controller.rb

@@ -9,8 +9,6 @@ module Admin
 
     require_authorization
 
-    helper_method :page_json
-
     def index
       @pages = Page.admin_list(@locale)
     end
@@ -19,6 +17,15 @@ module Admin
       @pages = Page.deleted.by_updated_at.in_locale(@locale)
     end
 
+    def search
+      return if search_query.blank?
+
+      @search_documents =
+        SearchDocument.where(searchable_type: "Page")
+                      .search(search_query, locale: @locale)
+                      .paginate(per_page: 50, page: params[:page])
+    end
+
     def show
       redirect_to edit_admin_page_url(@locale, @page)
     end
@@ -26,19 +33,14 @@ module Admin
     def new
       build_params = params[:page] ? page_params : nil
       @page = build_page(@locale, build_params)
-      @page.parent = if params[:parent]
-                       Page.find(params[:parent])
-                     elsif @news_pages
-                       @news_pages.first
-                     end
+      @page.parent = Page.find_by(id: params[:parent])
     end
 
     def edit; end
 
     def create
-      @page = build_page(@locale, page_params, param_categories)
+      @page = build_page(@locale, page_params, param_categories).tap(&:save)
       if @page.valid?
-        @page.save
         respond_with_page(@page) do
           redirect_to(edit_admin_page_url(@locale, @page))
         end
@@ -103,8 +105,7 @@ module Admin
     def param_categories
       return [] unless params[:category]
 
-      params.permit(category: {})[:category]
-            .to_hash
+      params.permit(category: {})[:category].to_hash
             .map { |id, _| Category.find(id) }
     end
 

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

@@ -11,10 +11,26 @@ module PagesCore
       Page.where(parent_page_id: feeds)
           .order("published_at DESC")
           .published
-          .limit(20)
           .localized(locale)
     end
 
+    def per_page_rss_param(default = 20, max = 1000)
+      return default unless params[:per_page].is_a?(String)
+
+      params[:per_page].to_i.clamp(1, max)
+    end
+
+    def render_page_rss(page, pagination_page = 1)
+      if page.feed_enabled?
+        render_rss(page.pages.paginate(per_page: per_page_rss_param,
+                                       page: pagination_page)
+                       .includes(:image, :author),
+                   title: page.name)
+      else
+        render_error 404
+      end
+    end
+
     def render_rss(items, title: nil)
       @title = PagesCore.config.site_name
       @title += ": #{title}" if title

data/app/controllers/pages_core/admin_controller.rb

@@ -13,6 +13,8 @@ module PagesCore
 
     layout "admin"
 
+    helper_method :search_query
+
     class << self
       # Get name of class with in lowercase, with underscores.
       def underscore
@@ -30,6 +32,10 @@ module PagesCore
 
     protected
 
+    def search_query
+      params[:q] || ""
+    end
+
     def set_i18n_locale
       I18n.locale = :en
     end

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -20,7 +20,10 @@ module PagesCore
       def index
         respond_to do |format|
           format.html { render_published_page(root_pages.try(&:first)) }
-          format.rss { render_rss(all_feed_items) }
+          format.rss do
+            render_rss(all_feed_items.paginate(per_page: per_page_rss_param,
+                                               page: page_param))
+          end
         end
       end
 
@@ -28,10 +31,7 @@ module PagesCore
         respond_to do |format|
           format.html { render_published_page(@page) }
           format.json { render json: PageResource.new(@page) }
-          format.rss do
-            render_rss(@page.pages.limit(20).includes(:image, :author),
-                       title: @page.name)
-          end
+          format.rss { render_page_rss(@page, page_param) }
         end
       end
 
@@ -64,6 +64,10 @@ module PagesCore
         super
       end
 
+      def page_param
+        params[:page].is_a?(String) ? params[:page] : 1
+      end
+
       def page_template(page)
         if PagesCore::Templates.names.include?(page.template)
           page.template

data/app/controllers/pages_core/sitemaps_controller.rb

@@ -20,10 +20,8 @@ module PagesCore
     end
 
     def format_record(record)
-      {
-        loc: record_url(record),
-        lastmod: format_time(record.updated_at)
-      }
+      { loc: record_url(record),
+        lastmod: format_time(record.updated_at) }
     end
 
     def formatted_entries
@@ -46,7 +44,7 @@ module PagesCore
       ([Page.root.try(:localize, I18n.default_locale)] +
        locales.flat_map do |locale|
          Page.published.localized(locale).includes(:parent)
-       end).compact.uniq
+       end).compact
     end
 
     def page_record_url(record)

data/app/helpers/admin/pages_helper.rb

@@ -4,6 +4,15 @@ module Admin
   module PagesHelper
     include PagesCore::Admin::PageBlocksHelper
 
+    def autopublish_notice(page)
+      return unless page.autopublish?
+
+      tag.div(class: "autopublish-notice") do
+        safe_join(["This page will be published",
+                   tag.b(publish_time(page.published_at))], " ")
+      end
+    end
+
     def available_templates_for_select
       PagesCore::Templates.names.collect do |template|
         if template == "index"
@@ -30,6 +39,14 @@ module Admin
       ([page.author] + User.activated).uniq
     end
 
+    def page_list_row(page, &block)
+      classes = [page.status_label.downcase]
+      classes << "autopublish" if page.autopublish?
+      classes << "pinned" if page.pinned?
+
+      tag.tr(capture(&block), class: classes.join(" "))
+    end
+
     def page_name(page, options = {})
       page_names = if options[:include_parents]
                      page.self_and_ancestors.reverse
@@ -42,6 +59,21 @@ module Admin
       )
     end
 
+    def page_published_status(page)
+      return page_published_date(page) if page.published?
+      return tag.em("Not published") if page.status_label == "Published"
+
+      tag.em(page.status_label)
+    end
+
+    def page_published_date(page)
+      if page.published_at.year == Time.zone.now.year
+        l(page.published_at, format: :pages_date)
+      else
+        l(page.published_at, format: :pages_full)
+      end
+    end
+
     def publish_time(time)
       if time.year != Time.zone.now.year
         time.strftime("on %b %d %Y at %H:%M")

data/app/helpers/pages_core/images_helper.rb

@@ -20,13 +20,22 @@ module PagesCore
       tag.figcaption(caption)
     end
 
-    def image_figure(image, size: nil, class_name: nil, link: nil, caption: nil)
-      class_name = ["image", image_class_name(image), class_name].compact
-      size ||= default_image_size
-      image_tag = dynamic_image_tag(image,
-                                    size: size, crop: false, upscale: false)
-      tag.figure((link ? image_link_to(image_tag, link) : image_tag) +
-                 image_caption(image, caption: caption),
+    # Renders an image figure tag with caption.
+    #
+    # ==== Options
+    # * <tt>:caption</tt>: Override caption with a string, or set to false to
+    #   disable captions.
+    # * <tt>:class_name</tt>: Class name to add to figure tag.
+    # * <tt>:link</tt>: Link target for image.
+    # * <tt>:ratio</tt>: Ratio to constrain image by.
+    # * <tt>:size</tt>: Max size for image.
+    def image_figure(image, opts = {})
+      class_name = ["image", image_class_name(image), opts[:class_name]].compact
+      image_tag = image_figure_image_tag(image,
+                                         size: opts[:size], ratio:
+                                         opts[:ratio])
+      content = opts[:link] ? image_link_to(image_tag, opts[:link]) : image_tag
+      tag.figure(content + image_caption(image, caption: opts[:caption]),
                  class: class_name)
     end
 
@@ -57,6 +66,11 @@ module PagesCore
       { alt: record.alternative }
     end
 
+    def fit_ratio(size, ratio)
+      v = Vector2d(size)
+      Vector2d.new(v.y * ratio, v.y).fit(v)
+    end
+
     def image_class_name(image)
       if image.size.x == image.size.y
         "square"
@@ -67,6 +81,13 @@ module PagesCore
       end
     end
 
+    def image_figure_image_tag(image, size: nil, ratio: nil)
+      size ||= default_image_size
+      size = fit_ratio(size, ratio) if ratio
+
+      dynamic_image_tag(image, size: size, crop: ratio && true, upscale: false)
+    end
+
     def image_link_to(content, href)
       tag.a(content, href: href)
     end

data/app/javascript/admin-dist.ts

@@ -0,0 +1,2 @@
+import startPages from "./index";
+startPages();