pages_core 3.12.4 → 3.12.5

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

@@ -7,9 +7,9 @@ form {
     margin: 16px 0;
     padding: 0;
 
-    & input[type=text],
-    & input[type=password],
-    & input[type=email],
+    & input[type="text"],
+    & input[type="password"],
+    & input[type="email"],
     & textarea {
       transition: border-color 150ms ease-out;
     }
@@ -41,9 +41,9 @@ form {
   }
 
   & .field-with-warning {
-    & input[type=text],
-    & input[type=password],
-    & input[type=email],
+    & input[type="text"],
+    & input[type="password"],
+    & input[type="email"],
     & textarea {
       border-color: var(--red-light);
     }
@@ -79,8 +79,8 @@ form {
       }
     }
 
-    & input[type=text],
-    & input[type=password] {
+    & input[type="text"],
+    & input[type="password"] {
       width: 100%;
       max-width: none;
     }
@@ -96,7 +96,7 @@ form {
         display: inline-block;
       }
 
-      & input[type=text] {
+      & input[type="text"] {
         display: inline;
         width: auto;
         min-width: auto;
@@ -139,11 +139,12 @@ form {
   display: table;
   padding: 1px;
   padding-right: 22px;
-  background: transparent url("pages/admin/warning-icon.gif") right 5px no-repeat;
+  background: transparent url("pages/admin/warning-icon.gif") right 5px
+    no-repeat;
 }
 
-input[type=text],
-input[type=password],
+input[type="text"],
+input[type="password"],
 textarea {
   width: 100%;
   max-width: 450px;
@@ -165,10 +166,10 @@ textarea {
   }
 }
 
-main .login-form input[type=text],
-main .login-form input[type=password],
-input[type=text].large,
-input[type=password].large {
+main .login-form input[type="text"],
+main .login-form input[type="password"],
+input[type="text"].large,
+input[type="password"].large {
   font-size: 1.4em;
 }
 

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

@@ -2,7 +2,7 @@
   cursor: pointer;
   display: block;
   transition: transform 200ms, box-shadow 200ms, border-color 200ms ease-out;
-  box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.0);
+  box-shadow: 0px 2px 5px rgba(0, 0, 0, 0);
   border: 1px solid #fff;
   position: relative;
   -webkit-perspective: 1000;
@@ -13,7 +13,7 @@
     right: 6px;
     font-size: 14px;
     color: var(--background-warning-color);
-    text-shadow: 0px 0px 5px rgba(0, 0, 0, 1.0);
+    text-shadow: 0px 0px 5px rgba(0, 0, 0, 1);
     z-index: 100;
   }
 
@@ -56,7 +56,10 @@
     width: 100%;
     height: 100%;
     background: #e5e5e5;
-    background-image: linear-gradient(45deg, #fff 25%, transparent 25%), linear-gradient(135deg, #fff 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #fff 75%), linear-gradient(135deg, transparent 75%, #fff 75%);
+    background-image: linear-gradient(45deg, #fff 25%, transparent 25%),
+      linear-gradient(135deg, #fff 25%, transparent 25%),
+      linear-gradient(45deg, transparent 75%, #fff 75%),
+      linear-gradient(135deg, transparent 75%, #fff 75%);
     background-size: 12px 12px;
     background-position: 0 0, 6px 0, 6px -6px, 0px 6px;
     display: flex;
@@ -187,7 +190,8 @@
       touch-action: none;
       user-select: none;
       cursor: pointer;
-      transition: border-radius 200ms, margin 200ms, width 200ms, height 200ms, border-color 200ms ease-out;
+      transition: border-radius 200ms, margin 200ms, width 200ms, height 200ms,
+        border-color 200ms ease-out;
 
       &:hover {
         &:after {

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

@@ -7,7 +7,7 @@
     flex-direction: column;
   }
 
-  & input[type=file] {
+  & input[type="file"] {
     display: none;
   }
 

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

@@ -11,7 +11,11 @@ table.list {
   }
 
   & th {
-    background: linear-gradient(to bottom, var(--background-color) 0%, var(--background-disabled-color) 100%);
+    background: linear-gradient(
+      to bottom,
+      var(--background-color) 0%,
+      var(--background-disabled-color) 100%
+    );
     color: var(--text-light-color);
     font-weight: bold;
     border-bottom: 1px solid var(--border-color);
@@ -44,12 +48,16 @@ table.list {
   }
 
   & tr.disabled td:first-child {
-    background: transparent radial-gradient(ellipse at center, #bdbdbd 50%, transparent 50%) no-repeat left 12px top 50%;
+    background: transparent
+      radial-gradient(ellipse at center, #bdbdbd 50%, transparent 50%) no-repeat
+      left 12px top 50%;
     background-size: 10px 10px;
   }
 
   & tr.active td:first-child {
-    background: transparent radial-gradient(ellipse at center, #92b6c4 50%, transparent 50%) no-repeat left 12px top 50%;
+    background: transparent
+      radial-gradient(ellipse at center, #92b6c4 50%, transparent 50%) no-repeat
+      left 12px top 50%;
     background-size: 10px 10px;
   }
 

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

@@ -15,7 +15,11 @@ body.modal {
   justify-content: center;
 
   & .background {
-    background: radial-gradient(rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.9) 50%, rgba(80, 80, 80, 0.9));
+    background: radial-gradient(
+      rgba(255, 255, 255, 0.9),
+      rgba(255, 255, 255, 0.9) 50%,
+      rgba(80, 80, 80, 0.9)
+    );
     cursor: pointer;
     position: absolute;
     top: 0px;
@@ -68,17 +72,17 @@ body.modal {
   }
 
   100% {
-    opacity: 1.0;
-    transform: scale(1.0);
+    opacity: 1;
+    transform: scale(1);
   }
 }
 
 @keyframes modal-background-appear {
   0% {
-    opacity: 0.0;
+    opacity: 0;
   }
 
   100% {
-    opacity: 1.0;
+    opacity: 1;
   }
 }

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

@@ -49,7 +49,11 @@
 
     &:hover {
       border: 1px solid var(--border-color-light);
-      background: linear-gradient(to bottom, var(--background-color) 0%, var(--background-disabled-color) 100%);
+      background: linear-gradient(
+        to bottom,
+        var(--background-color) 0%,
+        var(--background-disabled-color) 100%
+      );
     }
 
     & .date {

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

@@ -17,7 +17,7 @@
     text-align: left;
     animation-duration: 500ms;
     animation-name: toast-appear;
-    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     animation-fill-mode: forwards;
 
     &.error {
@@ -27,7 +27,7 @@
     &.fadeout {
       animation-duration: 300ms;
       animation-name: toast-disappear;
-      animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+      animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
     }
   }
 }

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

@@ -136,7 +136,9 @@ td.drag-handle {
   }
 
   & .pinned .name {
-    background: transparent radial-gradient(ellipse at center, #92b6c4 50%, transparent 50%) no-repeat left 12px top 50%;
+    background: transparent
+      radial-gradient(ellipse at center, #92b6c4 50%, transparent 50%) no-repeat
+      left 12px top 50%;
     background-size: 10px 10px;
   }
 }
@@ -162,7 +164,7 @@ td.drag-handle {
     }
   }
 
-  & main input[type=text],
+  & main input[type="text"],
   & main textarea {
     width: 100%;
     max-width: 100%;

data/app/assets/stylesheets/pages_core/admin/vars.css

@@ -2,7 +2,8 @@
 @custom-media --narrow screen and (max-width: 1150px);
 
 :root {
-  --font-os-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
+  --font-os-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
+    Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
 
   --red: #c00007;
   --red-transparent: #c0000740;

data/app/controllers/admin/calendars_controller.rb

@@ -8,7 +8,7 @@ module Admin
 
     def show
       unless @year
-        redirect_to(admin_calendar_path(@locale, Time.zone.now.year))
+        redirect_to(admin_calendar_path(content_locale, Time.zone.now.year))
         return
       end
       @pages = if @month
@@ -23,7 +23,7 @@ module Admin
     def calendar_items
       Page.with_dates
           .order("starts_at DESC")
-          .in_locale(@locale)
+          .in_locale(content_locale)
           .visible
           .paginate(per_page: 50, page: params[:page])
     end

data/app/controllers/admin/categories_controller.rb

@@ -22,7 +22,7 @@ module Admin
       @category = Category.create(category_params)
       if @category.valid?
         flash[:notice] = t("pages_core.categories_controller.created")
-        redirect_to admin_pages_url(@locale)
+        redirect_to admin_pages_url(content_locale)
       else
         render action: :new
       end
@@ -31,7 +31,7 @@ module Admin
     def update
       if @category.update(category_params)
         flash[:notice] = t("pages_core.categories_controller.updated")
-        redirect_to admin_pages_url(@locale)
+        redirect_to admin_pages_url(content_locale)
       else
         render action: :edit
       end
@@ -40,7 +40,7 @@ module Admin
     def destroy
       @category.destroy
       flash[:notice] = t("pages_core.categories_controller.deleted")
-      redirect_to admin_pages_url(@locale)
+      redirect_to admin_pages_url(content_locale)
     end
 
     protected

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