pages_core 3.12.0 → 3.12.1

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

@@ -4,6 +4,7 @@ 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
@@ -11,20 +12,6 @@ module PagesCore
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
-      attr_writer :page_title, :page_description, :page_description_class,
-                  :page_description_links
-
-      def add_body_class(class_name)
-        @body_classes ||= []
-        @body_classes << class_name
-      end
-
-      def body_classes
-        classes = @body_classes || []
-        classes << "with_notice" if flash[:notice]
-        classes
-      end
-
       def rich_text_area_tag(name, content = nil, options = {})
         react_component("RichTextArea",
                         options.merge(id: sanitize_to_id(name),
@@ -32,50 +19,20 @@ module PagesCore
                                       value: content))
       end
 
-      def link_separator
-        safe_join [" ", tag.span("|", class: "separator"), " "]
-      end
-
-      def deprecate_page_description_args(string = nil, class_name = nil)
-        if class_name
-          ActiveSupport::Deprecation.warn("Setting class through " \
-                                          "page_description is deprecated, " \
-                                          "use page_description_class=")
-        end
-        return unless string
+      def locale_links(&block)
+        return unless PagesCore.config.localizations?
 
-        ActiveSupport::Deprecation.warn("Setting description with " \
-                                        "page_description is deprecated, " \
-                                        "use page_description=")
-      end
-
-      def page_description(string = nil, class_name = nil)
-        deprecate_page_description_args(string, class_name)
-        @page_description_class = class_name if class_name
-        if string
-          @page_description = string
-        else
-          @page_description
-        end
-      end
-
-      def page_description_links(links = nil)
-        return @page_description_links unless links
-
-        ActiveSupport::Deprecation.warn(
-          "Setting page description_links with page_description_links " \
-          "is deprecated, use page_description_links="
+        safe_join(
+          PagesCore.config.locales.map do |locale, name|
+            link_to(name, block.call(locale),
+                    class: ("current" if locale == params[:locale].to_sym))
+          end
         )
-        @page_description_links = links
       end
 
-      def page_title(title = nil)
-        return @page_title unless title
-
-        ActiveSupport::Deprecation.warn(
-          "Setting page title with page_title is deprecated, use page_title="
-        )
-        @page_title = title
+      def month_name(month)
+        %w[January February March April May June July August September October
+           November December][month - 1]
       end
     end
   end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module DeprecatedAdminHelper
+      def link_separator
+        ActiveSupport::Deprecation.warn("link_separator is deprecated")
+
+        safe_join [" ", tag.span("|", class: "separator"), " "]
+      end
+
+      def page_description=(description)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_description, description.html_safe)
+      end
+      alias page_description page_description=
+
+      def page_description_links=(links)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_description_links, links.html_safe)
+      end
+      alias page_description_links page_description_links=
+
+      def page_title=(title)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_title, title)
+      end
+      alias page_title page_title=
+
+      private
+
+      def content_helper_deprecation
+        name = caller_locations(1, 1)[0].label
+        replacement = name.gsub(/=$/, "")
+
+        "The #{name} helper is deprecated, use content_for(:#{replacement})"
+      end
+    end
+  end
+end

data/app/helpers/pages_core/images_helper.rb

@@ -11,6 +11,25 @@ module PagesCore
       )
     end
 
+    def image_caption(image, caption: nil)
+      return if caption == false
+
+      caption = image.caption unless caption.is_a?(String)
+      return if caption.blank?
+
+      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),
+                 class: class_name)
+    end
+
     def original_dynamic_image_tag(record_or_array, options = {})
       super(
         record_or_array,
@@ -27,11 +46,29 @@ module PagesCore
 
     private
 
+    def default_image_size
+      "2000x2000"
+    end
+
     def extract_alt_text(record_or_array)
       record = extract_dynamic_image_record(record_or_array)
       return {} unless record.alternative?
 
       { alt: record.alternative }
     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
+    end
+
+    def image_link_to(content, href)
+      tag.a(content, href: href)
+    end
   end
 end

data/app/javascript/components/Attachments/Attachment.jsx

@@ -62,7 +62,7 @@ export default function Attachment(props) {
     classes.push("uploading");
   }
 
-  const icon = uploading ? "cloud-upload" : "paperclip";
+  const icon = uploading ? "cloud-arrow-up" : "paperclip";
 
   const localeDir = (locales && locales[locale] && locales[locale].dir) || "ltr";
 
@@ -95,7 +95,7 @@ export default function Attachment(props) {
     {attachment &&
      <div className="attachment-info">
        <h3>
-         <i className={`fa fa-${icon} icon`} />
+         <i className={`fa-solid fa-${icon} icon`} />
          {name() || <em>Untitled</em>}<br />
        </h3>
        {!uploading &&

data/app/javascript/components/EditableImage.jsx

@@ -40,7 +40,7 @@ export default function EditableImage(props) {
     <div className="editable-image">
       {altWarning &&
        <span className="alt-warning" title="Alternative text is missing">
-         <i className="fa fa-exclamation-triangle icon" />
+         <i className="fa-solid fa-triangle-exclamation icon" />
        </span>}
       <img src={src}
            width={props.width}

data/app/javascript/components/ImageCropper/Toolbar.jsx

@@ -30,12 +30,12 @@ export default function Toolbar(props) {
         <button title="Crop image"
                 onClick={props.toggleCrop}
                 className={cropping ? "active" : ""}>
-          <i className="fa fa-crop" />
+          <i className="fa-solid fa-crop" />
         </button>
         <button disabled={cropping}
                 title="Toggle focal point"
                 onClick={props.toggleFocal}>
-          <i className="fa fa-bullseye" />
+          <i className="fa-solid fa-bullseye" />
         </button>
         <a href={props.image.original_url}
            className="button"
@@ -43,7 +43,7 @@ export default function Toolbar(props) {
            disabled={cropping}
            download={props.image.filename}
            onClick={evt => cropping && evt.preventDefault()}>
-          <i className="fa fa-download" />
+          <i className="fa-solid fa-download" />
         </a>
       </div>
       {cropping && (

data/app/javascript/components/PageTreeNode.jsx

@@ -54,7 +54,7 @@ export default class PageTreeNode extends React.Component {
           <button type="button"
                   className="add"
                   onClick={() => this.props.addChild(this.props.index)}>
-            <i className="fa fa-plus icon" />
+            <i className="fa-solid fa-plus icon" />
             Add child
           </button>
         </span>
@@ -113,7 +113,7 @@ export default class PageTreeNode extends React.Component {
   }
 
   button(label, options) {
-    let icon = "fa fa-" + options.icon + " icon";
+    let icon = "fa-solid fa-" + options.icon + " icon";
     return (
       <button type="button"
               className={options.className}
@@ -182,9 +182,9 @@ export default class PageTreeNode extends React.Component {
       var classnames = null;
 
       if (collapsed) {
-        classnames = "collapse fa fa-caret-right";
+        classnames = "collapse fa-solid fa-caret-right";
       } else {
-        classnames = "collapse fa fa-caret-down";
+        classnames = "collapse fa-solid fa-caret-down";
       }
 
       return (
@@ -302,7 +302,7 @@ export default class PageTreeNode extends React.Component {
 
     return (
       <div className="page edit">
-        <i className="fa fa-file-o icon"></i>
+        <i className="fa-regular fa-file icon"></i>
         <form onSubmit={performEdit}>
           <input type="text"
                  value={this.state.newName}
@@ -311,7 +311,7 @@ export default class PageTreeNode extends React.Component {
                  autoFocus
                  onChange={handleNameChange} />
           <button className="save" type="submit">
-            <i className="fa fa-cloud icon"></i>
+            <i className="fa-solid fa-cloud icon"></i>
             Save
           </button>
           {this.button("Cancel", {
@@ -331,7 +331,7 @@ export default class PageTreeNode extends React.Component {
     var pageName = <span className="name">{this.pageName()}</span>;
     var className = "page";
 
-    var iconClass = "fa fa-file-o icon";
+    var iconClass = "fa-regular fa-file icon";
 
     if (typeof(node.status) != "undefined") {
       className = `page status-${this.node().status}`;
@@ -344,9 +344,9 @@ export default class PageTreeNode extends React.Component {
     }
 
     if (node.news_page) {
-      iconClass = "fa fa-newspaper-o icon";
+      iconClass = "fa-regular fa-file-lines icon";
     } else if (node.pinned) {
-      iconClass = "fa fa-flag-o icon";
+      iconClass = "fa-regular fa-flag icon";
     }
 
     return (

data/app/javascript/components/RichTextToolbarButton.jsx

@@ -7,7 +7,7 @@ export default class RichTextToolbarButton extends React.Component {
       <a title={this.props.name}
          className={"button " + this.props.className}
          onClick={this.props.onClick}>
-        <i className={"fa fa-" + this.props.className} />
+        <i className={"fa-solid fa-" + this.props.className} />
       </a>
     );
   }

data/app/mailers/admin_mailer.rb

@@ -2,6 +2,7 @@
 
 class AdminMailer < ApplicationMailer
   default from: proc { "\"Pages\" <no-reply@anyone.no>" }
+  layout false
 
   def password_reset(user, url)
     @user = user

data/app/models/invite.rb

@@ -15,9 +15,17 @@ class Invite < ApplicationRecord
 
   validates :token, presence: true
 
+  validate :user_already_exists
+
   private
 
   def ensure_token
     self.token ||= SecureRandom.hex(32)
   end
+
+  def user_already_exists
+    return unless User.find_by_email(email)
+
+    errors.add(:email, :taken)
+  end
 end

data/app/views/admin/calendars/_sidebar.html.erb

@@ -0,0 +1,47 @@
+<% if policy(Page).new? %>
+  <h2>
+    New entry
+  </h2>
+  <p>
+    <%= form_tag new_admin_page_path, method: :get do %>
+      In
+      <%= select_tag("parent", calendar_page_options(locale)) %>
+      <button type="submit">
+        Go
+      </button>
+    <% end %>
+  </p>
+<% end %>
+
+<div class="archive-index">
+  <% calendar_years_with_count.each do |year, year_count| %>
+    <h2>
+      <%= link_to_unless_current(
+        year,
+        admin_calendar_path(locale, year: year)
+      ) %>
+      <span class="count">
+        (<%= year_count %>)
+      </span>
+    </h2>
+    <ul>
+      <% calendar_months_count(year).each do |month, month_count| %>
+        <li>
+          <% if year == @year && month == @month %>
+            <strong>
+              <%= month_name(month) %>
+            </strong>
+          <% else %>
+            <%= link_to_unless_current(
+              month_name(month),
+              admin_calendar_path(locale, month: month, year: year)
+            ) %>
+          <% end %>
+          <span class="count">
+            (<%= month_count %>)
+          </span>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

data/app/views/admin/calendars/show.html.erb

@@ -1,57 +1,20 @@
-<%
-  month_names = %w{January February March April May June July August September October November December}
-  page_title "Calendar"
-  page_description "Calendar"
+<% content_for :page_title, "Calendar" %>
+<% content_for(:page_description) do %>
+  Calendar:
+  <em>
+    <% if @month %>
+      <%= month_name(@month) %>
+    <% end %>
+    <%= @year %>
+  </em>
+<% end %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, calendar_admin_pages_path(l) }.join(link_separator)
-  end
-%>
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| admin_calendar_path(l, @year) } %>
+<% end %>
 
 <% content_for :sidebar do %>
-  <h2>New entry</h2>
-  <p>
-    <%= form_tag new_admin_page_path, method: :get do %>
-      In <%= select_tag('parent',
-                        options_for_select(calendar_pages(@locale).map{|p| [page_name(p, include_parents: true).gsub("&raquo;", "»"), p.id] })) %>
-      <%= submit_tag "Go", name: nil %>
-    <% end %>
-  </p>
-
-  <div class="archive-index">
-    <% calendar_years_with_count.each do |year, year_count| %>
-      <h2>
-        <%= link_to_unless_current(year,
-                                   admin_calendar_path(
-                                     @locale,
-                                     year: year)
-        ) %>
-        <span class="count">
-          (<%= year_count %>)
-        </span>
-      </h2>
-      <ul>
-        <% calendar_months_count(year).each do |month, month_count| %>
-          <li>
-            <% if year == @year && month == @month %>
-              <strong>
-                <%= month_names[month-1] %>
-              </strong>
-            <% else %>
-              <%= link_to_unless_current(
-                month_names[month-1],
-                admin_calendar_path(@locale,
-                                    month: month,
-                                    year: year)) %>
-            <% end %>
-            <span class="count">
-              (<%= month_count %>)
-            </span>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </div>
+  <%= render(partial: "sidebar", locals: { locale: @locale }) %>
 <% end %>
 
 <% if @pages.any? %>
@@ -72,8 +35,7 @@
                  }) %>
     <% end %>
   </table>
-
-  <%= will_paginate @pages %>
+  <%= will_paginate @pages, renderer: PagesCore::LinkRenderer %>
 <% else %>
   <div class="content">
     <p>

data/app/views/admin/invites/new.html.erb

@@ -1,11 +1,5 @@
-<%
-  self.page_title = "New invite"
-  self.page_description = "New invite"
-%>
-
-<% content_for(:sidebar) do %>
-  &nbsp;
-<% end %>
+<% content_for :page_title, "New invite" %>
+<% content_for :page_description, "New invite" %>
 
 <%= form_for [:admin, @invite], builder: PagesCore::FormBuilder do |f| %>
   <%= f.labelled_text_field :email %>

data/app/views/admin/invites/show.html.erb

@@ -1,7 +1,5 @@
-<%
-  self.page_title = "Welcome"
-  self.page_description = "Welcome to Pages"
-%>
+<% content_for :page_title, "Welcome" %>
+<% content_for :page_description, "Welcome to Pages" %>
 
 <div class="content">
   <p>

data/app/views/admin/news/_sidebar.html.erb

@@ -0,0 +1,48 @@
+<% if policy(Page).new? %>
+  <h2>New article</h2>
+  <p>
+    <%= form_tag new_admin_page_path, method: :get do %>
+      In
+      <%= select_tag("parent", news_page_options(news_pages)) %>
+      <button type="submit">
+        Go
+      </button>
+    <% end %>
+  </p>
+<% end %>
+
+<div class="archive-index">
+  <% archive_finder.years_with_count.reverse.each do |year, year_count| %>
+    <h2>
+      <%= link_to_unless_current(
+        year,
+        admin_news_index_path(locale, year: year, category: category&.slug)
+      ) %>
+      <%= ": #{@category.name}" if @category %>
+      <span class="count">
+        (<%= year_count %>)
+      </span>
+    </h2>
+    <ul>
+      <% archive_finder.months_in_year_with_count(year).reverse.each do |month, page_count| %>
+        <li>
+          <% if year == @year && month == @month %>
+            <strong>
+              <%= month_name(month) %>
+            </strong>
+            (<%= page_count %>)
+          <% else %>
+            <%= link_to(
+              month_name(month),
+              admin_news_index_path(locale, year: year, month: month,
+                                    category: category&.slug)
+            ) %>
+            <span class="count">
+              (<%= page_count %>)
+            </span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

data/app/views/admin/news/index.html.erb

@@ -1,62 +1,27 @@
-<%
-  month_names = %w{January February March April May June July August September October November December}
-  page_title "News"
-  page_description "<em>News: #{month_names[@month - 1] if @month} #{@year}</em>"
+<% content_for(:page_title, "News") %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, admin_news_path(l) }.join(link_separator)
-  end
-%>
+<% content_for(:page_description) do %>
+  News:
+  <em>
+    <% if @month %>
+      <%= month_name(@month) %>
+    <% end %>
+    <%= @year %>
+  </em>
+<% end %>
+
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| admin_news_index_path(l, @year) } %>
+<% end %>
 
 <% content_for :sidebar do %>
-  <% if policy(Page).new? %>
-    <h2>New article</h2>
-    <p>
-      <%= form_tag new_admin_page_path, method: :get do %>
-        In
-        <%= select_tag('parent',
-                       options_for_select(@news_pages.map{|p| [news_section_name(p, @news_pages).gsub("&raquo;", "»"), p.id] })) %>
-        <%= submit_tag "Go", name: nil %>
-      <% end %>
-    </p>
-  <% end %>
-  <div class="archive-index">
-    <% @archive_finder.years_with_count.reverse.each do |year, year_count| %>
-      <h2>
-        <%= link_to_unless_current(year,
-                                   admin_news_index_path(
-                                     @locale,
-                                     year: year,
-                                     category: @category&.slug)
-        ) %>
-        <%= ": #{@category.name}" if @category %>
-        <span class="count">
-          (<%= year_count %>)
-        </span>
-      </h2>
-      <ul>
-        <% @archive_finder.months_in_year_with_count(year).reverse.each do |month, page_count| %>
-          <li>
-            <% if year == @year && month == @month %>
-              <strong>
-                <%= month_names[month-1] %>
-              </strong>
-              (<%= page_count %>)
-            <% else %>
-              <%= link_to(month_names[month-1],
-                          admin_news_index_path(@locale,
-                                                month: month,
-                                                year: year,
-                                                category: @category&.slug)) %>
-              <span class="count">
-                (<%= page_count %>)
-              </span>
-            <% end %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </div>
+  <%= render(partial: "sidebar",
+             locals: {
+               locale: @locale,
+               category: @category,
+               news_pages: @news_pages,
+               archive_finder: @archive_finder
+             }) %>
 <% end %>
 
 <% if @pages.length > 0 %>

data/app/views/admin/pages/deleted.html.erb

@@ -1,11 +1,13 @@
-<%
-  self.page_title = "Pages"
-  self.page_description = link_to("All pages", admin_pages_path(@locale)) +
-                          " / Deleted pages"
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, deleted_admin_pages_path(l) }.join(link_separator)
-  end
-%>
+<% content_for :page_title, "Deleted pages" %>
+
+<% content_for :page_description do %>
+  <%= link_to("All pages", admin_pages_path(@locale)) %> /
+  Deleted pages
+<% end %>
+
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| deleted_admin_pages_path(l) } %>
+<% end %>
 
 <% if @pages.any? %>
   <table class="deleted-pages list">