pages_core 3.12.3 → 3.12.5

data/app/controllers/admin/news_controller.rb

@@ -9,9 +9,9 @@ module Admin
     require_authorization object: Page
 
     def index
-      @archive_finder = archive_finder(@news_pages, @locale)
+      @archive_finder = archive_finder(@news_pages, content_locale)
       unless @year
-        redirect_to(admin_news_index_path(@locale,
+        redirect_to(admin_news_index_path(content_locale,
                                           (@archive_finder.latest_year ||
                                            Time.zone.now.year)))
         return
@@ -32,11 +32,11 @@ module Admin
 
     def find_news_pages
       @news_pages = Page.news_pages
-                        .in_locale(@locale)
-                        .reorder("parent_page_id ASC, position ASC")
+                        .in_locale(content_locale)
+                        .sort { |a, b| b.children.count <=> a.children.count }
       return if @news_pages.any?
 
-      redirect_to(admin_pages_url(@locale))
+      redirect_to(admin_pages_url(content_locale))
     end
 
     def find_year_and_month
@@ -48,7 +48,7 @@ module Admin
     def require_news_pages
       return if Page.news_pages.any?
 
-      redirect_to(admin_pages_url(@locale))
+      redirect_to(admin_pages_url(content_locale))
     end
 
     def latest_year

data/app/controllers/admin/pages_controller.rb

@@ -10,11 +10,11 @@ module Admin
     require_authorization
 
     def index
-      @pages = Page.admin_list(@locale)
+      @pages = Page.admin_list(content_locale)
     end
 
     def deleted
-      @pages = Page.deleted.by_updated_at.in_locale(@locale)
+      @pages = Page.deleted.by_updated_at.in_locale(content_locale)
     end
 
     def search
@@ -22,27 +22,28 @@ module Admin
 
       @search_documents =
         SearchDocument.where(searchable_type: "Page")
-                      .search(search_query, locale: @locale)
+                      .search(search_query, locale: content_locale)
                       .paginate(per_page: 50, page: params[:page])
     end
 
     def show
-      redirect_to edit_admin_page_url(@locale, @page)
+      redirect_to edit_admin_page_url(content_locale, @page)
     end
 
     def new
       build_params = params[:page] ? page_params : nil
-      @page = build_page(@locale, build_params)
+      @page = build_page(content_locale, build_params)
       @page.parent = Page.find_by(id: params[:parent])
     end
 
     def edit; end
 
     def create
-      @page = build_page(@locale, page_params, param_categories).tap(&:save)
+      @page = build_page(content_locale, page_params,
+                         param_categories).tap(&:save)
       if @page.valid?
         respond_with_page(@page) do
-          redirect_to(edit_admin_page_url(@locale, @page))
+          redirect_to(edit_admin_page_url(content_locale, @page))
         end
       else
         render action: :new
@@ -54,7 +55,7 @@ module Admin
         @page.categories = param_categories
         respond_with_page(@page) do
           flash[:notice] = t("pages_core.changes_saved")
-          redirect_to edit_admin_page_url(@locale, @page)
+          redirect_to edit_admin_page_url(content_locale, @page)
         end
       else
         render action: :edit
@@ -64,12 +65,12 @@ module Admin
     def move
       parent = params[:parent_id] ? Page.find(params[:parent_id]) : nil
       @page.update(parent: parent, position: params[:position])
-      respond_with_page(@page) { redirect_to admin_pages_url(@locale) }
+      respond_with_page(@page) { redirect_to admin_pages_url(content_locale) }
     end
 
     def destroy
       Page.find(params[:id]).flag_as_deleted!
-      redirect_to admin_pages_url(@locale)
+      redirect_to admin_pages_url(content_locale)
     end
 
     private
@@ -110,7 +111,7 @@ module Admin
     end
 
     def find_page
-      @page = Page.find(params[:id]).localize(@locale)
+      @page = Page.find(params[:id]).localize(content_locale)
     end
 
     def find_categories

data/app/controllers/admin/users_controller.rb

@@ -48,7 +48,7 @@ module Admin
         flash[:notice] = "Your changed to #{@user.name} were saved."
         redirect_to admin_users_url
       else
-        flash.now[:error] = "There were problems saving your changes."
+        flash.now[:error] = t("pages_core.problems_saving")
         render action: :edit
       end
     end

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

@@ -4,23 +4,6 @@ module PagesCore
   module PreviewPagesController
     extend ActiveSupport::Concern
 
-    included do
-      before_action :disable_xss_protection, only: [:preview]
-    end
-
-    def preview
-      redirect_to(page_url(@locale, @page)) && return unless logged_in?
-
-      @preview = true
-      @page.attributes = page_params.merge(
-        status: 2,
-        published_at: Time.zone.now,
-        locale: @locale,
-        redirect_to: nil
-      )
-      render_page
-    end
-
     def preview?
       @preview || false
     end
@@ -45,5 +28,20 @@ module PagesCore
         Page.localized_attributes + permitted_page_attributes
       )
     end
+
+    def preview_page(page)
+      redirect_to(page_url(content_locale, page)) && return unless logged_in?
+
+      disable_xss_protection
+
+      @preview = true
+      page.attributes = page_params.merge(
+        status: 2,
+        published_at: Time.zone.now,
+        locale: content_locale,
+        redirect_to: nil
+      )
+      render_page
+    end
   end
 end

data/app/controllers/pages_core/admin_controller.rb

@@ -24,9 +24,9 @@ module PagesCore
 
     def redirect
       if Page.news_pages.any?
-        redirect_to news_admin_pages_url(@locale)
+        redirect_to news_admin_pages_url(content_locale)
       else
-        redirect_to admin_pages_url(@locale)
+        redirect_to admin_pages_url(content_locale)
       end
     end
 

data/app/controllers/pages_core/base_controller.rb

@@ -5,11 +5,11 @@ module PagesCore
     include PagesCore::Authentication
     include PagesCore::ErrorRenderer
     include PagesCore::ErrorReporting
+    include PagesCore::LocalesHelper
     include PagesCore::ProcessTitler
     include PagesCore::PoliciesHelper
     include PagesCore::StaticCacheController
 
-    before_action :set_locale
     after_action :set_content_language_header
 
     protected
@@ -20,13 +20,6 @@ module PagesCore
       payload.merge!(current_user_context)
     end
 
-    # Sets @locale from params[:locale], with I18n.default_locale as fallback
-    def set_locale
-      legacy_locales = { "nor" => "nb", "eng" => "en" }
-      @locale = params[:locale] || I18n.default_locale.to_s
-      @locale = legacy_locales[@locale] if legacy_locales[@locale]
-    end
-
     def set_content_language_header
       return unless locale
 

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

@@ -27,6 +27,10 @@ module PagesCore
         end
       end
 
+      def preview
+        preview_page(@page)
+      end
+
       def show
         respond_to do |format|
           format.html { render_published_page(@page) }
@@ -64,10 +68,6 @@ 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
@@ -98,7 +98,7 @@ module PagesCore
 
       def find_page
         @page ||= Page.find_by(id: params[:id]) || unique_page(params[:id])
-        @page.locale = @locale || I18n.default_locale.to_s if @page
+        @page.locale = content_locale if @page
       end
 
       def render_published_page(page)
@@ -110,6 +110,14 @@ module PagesCore
         end
       end
 
+      def redirect_to_parent_or_root(page)
+        if page.parent
+          redirect_to page_url(locale, page.parent)
+        else
+          redirect_to root_url
+        end
+      end
+
       def redirect_page(page)
         return false unless page.redirects?
 

data/app/controllers/pages_core/frontend_controller.rb

@@ -6,6 +6,7 @@ module PagesCore
     include ApplicationHelper
 
     before_action :set_i18n_locale
+    helper_method :page_param
 
     # Loads @root_pages and @rss_feeds. To automatically load these in your
     # own controllers, add the following line to your controller definition:
@@ -13,21 +14,25 @@ module PagesCore
     #   before_action :load_root_pages
     #
     def load_root_pages
-      @root_pages = Page.roots.localized(@locale).published
-      @rss_feeds = Page.where(feed_enabled: true).localized(@locale).published
+      @root_pages = Page.roots.localized(content_locale).published
+      @rss_feeds = Page.where(feed_enabled: true)
+                       .localized(content_locale)
+                       .published
     end
 
     private
 
     def legacy_locales
-      {
-        "nor" => "nb",
-        "eng" => "en"
-      }
+      { "nor" => "nb",
+        "eng" => "en" }
+    end
+
+    def page_param
+      params[:page].is_a?(String) ? params[:page] : 1
     end
 
     def set_i18n_locale
-      locale_param = params[:locale] || I18n.default_locale
+      locale_param = content_locale
       if legacy_locales[locale_param]
         locale_param = legacy_locales[locale_param]
       end

data/app/helpers/admin/menu_helper.rb

@@ -2,6 +2,8 @@
 
 module Admin
   module MenuHelper
+    include PagesCore::LocalesHelper
+
     def header_tabs(group)
       tag.ul(class: group.to_s) do
         safe_join(menu_items_for(group).map do |item|

data/app/helpers/admin/pages_helper.rb

@@ -53,10 +53,7 @@ module Admin
                    else
                      [page]
                    end
-      safe_join(
-        page_names.map { |p| page_name_with_fallback(p) },
-        raw(" » ")
-      )
+      safe_join(page_names.map { |p| page_name_with_fallback(p) }, " » ")
     end
 
     def page_published_status(page)

data/app/helpers/pages_core/admin/admin_helper.rb

@@ -4,7 +4,6 @@ module PagesCore
   module Admin
     module AdminHelper
       include PagesCore::Admin::ContentTabsHelper
-      include PagesCore::Admin::DeprecatedAdminHelper
       include PagesCore::Admin::DateRangeHelper
       include PagesCore::Admin::ImageUploadsHelper
       include PagesCore::Admin::LocalesHelper

data/app/helpers/pages_core/admin/content_tabs_helper.rb

@@ -3,8 +3,15 @@
 module PagesCore
   module Admin
     module ContentTabsHelper
-      def content_tab(name, options = {}, &block)
+      def content_tabs
         @content_tabs ||= []
+      end
+
+      def content_tabs?
+        content_tabs.any?
+      end
+
+      def content_tab(name, options = {}, &block)
         return unless block_given?
 
         tab = {
@@ -13,7 +20,7 @@ module PagesCore
           options: options,
           content: capture(&block)
         }
-        @content_tabs << tab
+        content_tabs.push(tab)
         content_tab_tag(tab[:key], tab[:content])
       end
 

data/app/helpers/pages_core/application_helper.rb

@@ -22,13 +22,12 @@ module PagesCore
     end
 
     def unique_page(page_name, &block)
-      locale = @locale || I18n.default_locale.to_s
       page = Page.where(unique_name: page_name).first
       if page && block_given?
-        output = capture(page.localize(locale), &block)
+        output = capture(page.localize(content_locale), &block)
         concat(output)
       end
-      page&.localize(locale)
+      page&.localize(content_locale)
     end
 
     private

data/app/helpers/pages_core/frontend_helper.rb

@@ -3,7 +3,7 @@
 module PagesCore
   module FrontendHelper
     def root_pages
-      @root_pages ||= Page.roots.localized(@locale).published
+      @root_pages ||= Page.roots.localized(content_locale).published
     end
 
     def root_page

data/app/helpers/pages_core/head_tags_helper.rb

@@ -10,13 +10,10 @@ module PagesCore
       if args.any?
         @document_title = args.first
       else
-        safe_join(
-          [@document_title, PagesCore.config(:site_name)].compact.uniq,
-          " - "
-        )
+        safe_join([@document_title, PagesCore.config(:site_name)].compact.uniq,
+                  " - ")
       end
     end
-    alias page_title document_title
 
     # Returns true if document title has been set.
     def document_title?
@@ -30,28 +27,19 @@ module PagesCore
     #  feed_tags include_hidden: true
     #
     def feed_tags(options = {})
-      feeds = Page.enabled_feeds(@locale, options)
+      feeds = Page.enabled_feeds(content_locale, options)
       return unless feeds.any?
 
       feed_tags = [
         rss_link_tag(PagesCore.config(:site_name),
-                     pages_url(@locale, format: :rss))
+                     pages_url(content_locale, format: :rss))
       ] + feeds.map do |page|
         rss_link_tag("#{PagesCore.config(:site_name)}: #{page.name}",
-                     page_url(@locale, page, format: :rss))
+                     page_url(content_locale, page, format: :rss))
       end
       safe_join(feed_tags, "\n")
     end
 
-    # Outputs Google Analytics tracking code.
-    #
-    #  google_analytics_tags "UA-12345678-1"
-    #
-    def google_analytics_tags(account_id)
-      render(partial: "pages_core/google_analytics",
-             locals: { account_id: account_id })
-    end
-
     # Outputs a HTML5 doctype and head tags, with document title
     # and relevant meta tags. Takes a block which will be placed
     # inside <head>.
@@ -66,14 +54,7 @@ module PagesCore
       # The block output must be captured first
       block_output = block_given? ? capture(&block) : nil
 
-      safe_join(
-        [
-          "<!doctype html>\n<html lang=\"#{I18n.locale}\">".html_safe,
-          tag.head do
-            safe_join(head_tag_contents(block_output), "\n")
-          end
-        ]
-      )
+      tag.head { safe_join(head_tag_contents(block_output), "\n") }
     end
 
     # Generates a link to an RSS feed.
@@ -87,30 +68,18 @@ module PagesCore
                href: href)
     end
 
-    # Outputs Typekit tags.
-    #
-    #  typekit_tags "aadgrag"
-    #
-    def typekit_tags(kit_id)
-      safe_join([
-                  javascript_include_tag("http://use.typekit.com/#{kit_id}.js"),
-                  javascript_tag("try{Typekit.load();}catch(e){}")
-                ], "\n")
-    end
-
     private
 
     def head_tag_contents(block_output)
-      [
-        tag.meta(charset: "utf-8"),
-        tag.meta("http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
-        tag.title(document_title),
-        meta_description_tag, meta_keywords_tag,
-        (tag.link(rel: "image_src", href: meta_image) if meta_image?),
-        open_graph_tags,
-        csrf_meta_tags,
-        block_output
-      ]
+      [tag.meta(charset: "utf-8"),
+       tag.meta("http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
+       tag.title(document_title),
+       meta_description_tag,
+       meta_keywords_tag,
+       (tag.link(rel: "image_src", href: meta_image) if meta_image?),
+       open_graph_tags,
+       csrf_meta_tags,
+       block_output]
     end
 
     def meta_description_tag

data/app/helpers/pages_core/images_helper.rb

@@ -5,10 +5,8 @@ module PagesCore
     include DynamicImage::Helper
 
     def dynamic_image_tag(record_or_array, options = {})
-      super(
-        record_or_array,
-        extract_alt_text(record_or_array).merge(options)
-      )
+      super(record_or_array,
+            extract_alt_text(record_or_array).merge(options))
     end
 
     def image_caption(image, caption: nil)
@@ -32,25 +30,51 @@ module PagesCore
     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])
+                                         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
 
+    # 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>:sizes</tt>: Sizes attribute for image tag, default: "100vw".
+    def picture(image, opts = {})
+      class_name = ["image", image_class_name(image), opts[:class_name]].compact
+      pict = picture_tag(image, ratio: opts[:ratio], sizes: opts[:sizes])
+      content = opts[:link] ? image_link_to(pict, opts[:link]) : pict
+      tag.figure(content + image_caption(image, caption: opts[:caption]),
+                 class: class_name)
+    end
+
+    def picture_tag(image, ratio: nil, sizes: "100vw")
+      tag.picture do
+        safe_join(
+          [webp_source(image, ratio: ratio, sizes: sizes || "100vw"),
+           dynamic_image_tag(image,
+                             size: image_size(1050, ratio),
+                             crop: (ratio ? true : false),
+                             sizes: sizes,
+                             srcset: srcset(image, ratio: ratio))]
+        )
+      end
+    end
+
     def original_dynamic_image_tag(record_or_array, options = {})
-      super(
-        record_or_array,
-        extract_alt_text(record_or_array).merge(options)
-      )
+      super(record_or_array,
+            extract_alt_text(record_or_array).merge(options))
     end
 
     def uncropped_dynamic_image_tag(record_or_array, options = {})
-      super(
-        record_or_array,
-        extract_alt_text(record_or_array).merge(options)
-      )
+      super(record_or_array,
+            extract_alt_text(record_or_array).merge(options))
     end
 
     private
@@ -72,13 +96,10 @@ module PagesCore
     end
 
     def image_class_name(image)
-      if image.size.x == image.size.y
-        "square"
-      elsif image.size.x > image.size.y
-        "landscape"
-      else
-        "portrait"
-      end
+      return "square" if image.size.x == image.size.y
+      return "landscape" if image.size.x > image.size.y
+
+      "portrait"
     end
 
     def image_figure_image_tag(image, size: nil, ratio: nil)
@@ -91,5 +112,39 @@ module PagesCore
     def image_link_to(content, href)
       tag.a(content, href: href)
     end
+
+    def image_size(width, ratio)
+      return "#{width}x" unless ratio
+
+      "#{width}x#{(width / ratio).round}"
+    end
+
+    def image_widths(image)
+      [233, 350, 700, 1050, 1400, 2100, 2800].select do |w|
+        image.size.x >= w
+      end
+    end
+
+    def srcset(image, ratio: nil, format: nil)
+      image_widths(image).map do |width|
+        options = { size: image_size(width, ratio),
+                    crop: (ratio ? true : false) }
+        options[:format] = format if format
+
+        "#{dynamic_image_path(image, options)} #{width}w"
+      end.join(", ")
+    end
+
+    def webp_source(image, ratio: nil, sizes: "100vw")
+      return unless webp_compatible?(image)
+
+      tag.source(type: "image/webp",
+                 srcset: srcset(image, ratio: ratio, format: :webp),
+                 sizes: sizes)
+    end
+
+    def webp_compatible?(image)
+      image.content_type != "image/gif"
+    end
   end
 end

data/app/helpers/pages_core/locales_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module LocalesHelper
+    def content_locale
+      params[:locale] || I18n.default_locale.to_s
+    end
+  end
+end

data/app/helpers/pages_core/open_graph_tags_helper.rb

@@ -11,7 +11,7 @@ module PagesCore
       properties = default_open_graph_properties.merge(open_graph_properties)
       safe_join(
         properties
-          .delete_if { |_, content| content.nil? }
+          .compact
           .map do |name, content|
           tag.meta(property: "og:#{name}", content: content)
         end,
@@ -38,14 +38,12 @@ module PagesCore
     end
 
     def default_open_graph_properties
-      {
-        type: "website",
+      { type: "website",
         site_name: PagesCore.config(:site_name),
         title: default_open_graph_title,
         image: (meta_image if meta_image?),
         description: default_open_graph_description,
-        url: request.url
-      }
+        url: request.url }
     end
   end
 end

data/app/helpers/pages_core/page_path_helper.rb

@@ -54,7 +54,7 @@ module PagesCore
       ActiveSupport::Deprecation.warn(
         "Calling page_url without locale is deprecated"
       )
-      [(opts[:locale] || @locale), page_or_locale]
+      [(opts[:locale] || content_locale), page_or_locale]
     end
 
     def paginated_section(opts)