pages_core 3.11.3 → 3.12.0

data/app/assets/stylesheets/pages/admin/components/header.scss

@@ -12,7 +12,7 @@ header {
     color: $c-text-invert;
   }
 
-  #logo {
+  .logo {
     position: absolute;
     z-index: 2;
     top: 11px;
@@ -21,7 +21,7 @@ header {
     height: 27px;
   }
 
-  #site-name {
+  .site-name {
     color: $c-text-invert;
     position: absolute;
     top: 15px;
@@ -100,7 +100,7 @@ header {
   }
 }
 
-#content-tabs {
+.content-tabs {
   list-style-type: none;
   margin: 24px 0px -11px -18px;
   padding: 0;
@@ -126,7 +126,7 @@ header {
   }
 }
 
-#page-description {
+.page-description {
   @include vertical-gradient(#dceef6, #e7f3f9);
   margin: 0;
   padding: 16px 32px;

data/app/assets/stylesheets/pages/admin/components/modal.scss

@@ -84,23 +84,3 @@ body.modal {
     opacity: 1.0;
   }
 }
-
-
-
-/* Old rules */
-
-#modal-container {
-  z-index:20;
-  border: 1px solid #555;
-  position: absolute;
-  background: #f8f8f8;
-  padding:20px;
-  padding-top: 10px;
-}
-
-#modal-container h2 {
-  padding: 0 0 8px 0;
-  color: #27495e;
-  font-size: 1.45em;
-  border-bottom: 1px solid #e0e0e0;
-}

data/app/assets/stylesheets/pages/admin.scss

@@ -49,26 +49,6 @@ td {
   padding: 2px 16px 2px 0;
 }
 
-#flash-error,
-#flash-notice {
-  padding: 16px 32px;
-  font-size: 12px;
-}
-
-#flash-error {
-  @include vertical-gradient(#970002, $c-red);
-  border-bottom: 1px solid #9c0002;
-  color: #fff299;
-  font-weight: bold;
-}
-
-#flash-notice {
-  background: #f5f3bc;
-  border-bottom: 1px solid #dad88a;
-  color: #3d3b00;
-  font-weight: normal;
-}
-
 .errorExplanation {
   background-color: #ffd;
   border-bottom:  1px solid #dda;

data/app/assets/stylesheets/pages/errors.css

@@ -11,7 +11,7 @@ body {
   line-height:         1.5;
 }
 
-#content {
+main {
   width:               600px;
   margin:              150px auto;
 }

data/app/controllers/admin/calendars_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Admin
+  class CalendarsController < Admin::AdminController
+    before_action :find_year_and_month
+
+    require_authorization object: Page
+
+    def show
+      unless @year
+        redirect_to(admin_calendar_path(@locale, Time.zone.now.year))
+        return
+      end
+      @pages = if @month
+                 calendar_items.in_year_and_month(@year, @month)
+               else
+                 calendar_items.in_year(@year)
+               end
+    end
+
+    private
+
+    def calendar_items
+      Page.with_dates
+          .order("starts_at DESC")
+          .in_locale(@locale)
+          .visible
+          .paginate(per_page: 50, page: params[:page])
+    end
+
+    def find_year_and_month
+      @year = params[:year]&.to_i
+      @month = params[:month]&.to_i
+    end
+  end
+end

data/app/controllers/admin/categories_controller.rb

@@ -16,6 +16,8 @@ module Admin
       @category = Category.new
     end
 
+    def edit; end
+
     def create
       @category = Category.create(category_params)
       if @category.valid?
@@ -26,8 +28,6 @@ module Admin
       end
     end
 
-    def edit; end
-
     def update
       if @category.update(category_params)
         flash[:notice] = t("pages_core.categories_controller.updated")

data/app/controllers/admin/news_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Admin
+  class NewsController < Admin::AdminController
+    before_action :require_news_pages
+    before_action :find_news_pages
+    before_action :find_year_and_month
+
+    require_authorization object: Page
+
+    def index
+      @archive_finder = archive_finder(@news_pages, @locale)
+      unless @year
+        redirect_to(admin_news_index_path(@locale,
+                                          (@archive_finder.latest_year ||
+                                           Time.zone.now.year)))
+        return
+      end
+      @pages = @archive_finder.by_year_and_maybe_month(@year, @month)
+                              .paginate(per_page: 50, page: params[:page])
+    end
+
+    private
+
+    def archive_finder(parents, locale)
+      Page.where(parent_page_id: parents)
+          .visible
+          .order("published_at DESC")
+          .in_locale(locale)
+          .archive_finder
+    end
+
+    def find_news_pages
+      @news_pages = Page.news_pages
+                        .in_locale(@locale)
+                        .reorder("parent_page_id ASC, position ASC")
+      return if @news_pages.any?
+
+      redirect_to(admin_pages_url(@locale))
+    end
+
+    def find_year_and_month
+      @year = params[:year]&.to_i
+      @month = params[:month]&.to_i
+    end
+
+    # Redirect away if no news pages has been configured
+    def require_news_pages
+      return if Page.news_pages.any?
+
+      redirect_to(admin_pages_url(@locale))
+    end
+
+    def latest_year
+      archive_finder.latest_year_and_month.first || Time.zone.now.year
+    end
+  end
+end

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,6 @@
 module Admin
   class PagesController < Admin::AdminController
     include PagesCore::Admin::PageJsonHelper
-    include PagesCore::Admin::NewsPageController
 
     before_action :find_categories
     before_action :find_page, only: %i[show edit update destroy move]
@@ -34,6 +33,8 @@ module Admin
                      end
     end
 
+    def edit; end
+
     def create
       @page = build_page(@locale, page_params, param_categories)
       if @page.valid?
@@ -46,8 +47,6 @@ module Admin
       end
     end
 
-    def edit; end
-
     def update
       if @page.update(page_params)
         @page.categories = param_categories

data/app/controllers/admin/password_resets_controller.rb

@@ -8,6 +8,10 @@ module Admin
 
     layout "admin"
 
+    def show
+      @user = @password_reset_token.user
+    end
+
     def create
       @user = find_user_by_email(params[:email])
       if @user
@@ -20,10 +24,6 @@ module Admin
       redirect_to login_admin_users_url
     end
 
-    def show
-      @user = @password_reset_token.user
-    end
-
     def update
       @user = @password_reset_token.user
       if user_params[:password].present? && @user.update(user_params)

data/app/controllers/admin/users_controller.rb

@@ -25,10 +25,14 @@ module Admin
       redirect_to admin_default_url
     end
 
+    def show; end
+
     def new
       @user = User.new
     end
 
+    def edit; end
+
     def create
       @user = PagesCore::CreateUserService.call(user_params)
       if @user.valid?
@@ -39,10 +43,6 @@ module Admin
       end
     end
 
-    def show; end
-
-    def edit; end
-
     def update
       if @user.update(user_params_with_roles)
         flash[:notice] = "Your changed to #{@user.name} were saved."

data/app/controllers/errors_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ErrorsController < ::ApplicationController
+class ErrorsController < ApplicationController
   layout "errors"
 
   def show

data/app/controllers/sessions_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class SessionsController < ::ApplicationController
+class SessionsController < ApplicationController
   def create
     user = find_user(params[:email], params[:password])
     authenticate!(user) if user

data/app/helpers/admin/calendars_helper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Admin
+  module CalendarsHelper
+    def calendar_pages(locale)
+      Page.where(
+        id: Page.with_dates.visible.pluck(:parent_page_id).uniq.compact
+      ).in_locale(locale)
+    end
+
+    def calendar_years_with_count
+      calendar_counts.each_with_object({}) do |entry, obj|
+        obj[entry[:year]] ||= 0
+        obj[entry[:year]] += entry[:count]
+      end
+    end
+
+    def calendar_months_count(year)
+      calendar_counts.filter { |e| e[:year] == year }
+                     .map { |e| [e[:month], e[:count]] }
+    end
+
+    private
+
+    def calendar_counts
+      @calendar_counts ||= Page.count_by_month
+    end
+  end
+end

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

@@ -23,6 +23,7 @@ module PagesCore
         tag.div(content,
                 class: "content-tab",
                 id: "content-tab-#{key}",
+                role: "tabpanel",
                 data: { tab: key,
                         "main-target" => "tab" })
       end

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

@@ -53,7 +53,7 @@ module PagesCore
 
       def labelled_field_label(label, options = {})
         tag.label do
-          label + labelled_field_errors(options[:errors])
+          safe_join([label, labelled_field_errors(options[:errors])])
         end
       end
 

data/app/helpers/pages_core/application_helper.rb

@@ -28,7 +28,7 @@ module PagesCore
         output = capture(page.localize(locale), &block)
         concat(output)
       end
-      page ? page.localize(locale) : nil
+      page&.localize(locale)
     end
 
     private

data/app/javascript/components/PageTreeNode.jsx

@@ -328,7 +328,6 @@ export default class PageTreeNode extends React.Component {
     let index = this.props.index;
     let node = index.node;
 
-    var dateLabel = "";
     var pageName = <span className="name">{this.pageName()}</span>;
     var className = "page";
 
@@ -344,12 +343,6 @@ export default class PageTreeNode extends React.Component {
       </a>;
     }
 
-    if (node.id && node.starts_at) {
-      dateLabel = <span className="date">
-        {node.starts_at}
-      </span>;
-    }
-
     if (node.news_page) {
       iconClass = "fa fa-newspaper-o icon";
     } else if (node.pinned) {
@@ -360,7 +353,6 @@ export default class PageTreeNode extends React.Component {
       <div className={className}>
         <i className={iconClass}></i>
         {pageName}
-        {dateLabel}
         {this.statusLabel()}
         {this.collapsedLabel()}
         {this.actions()}

data/app/javascript/components/Toast.jsx

@@ -55,7 +55,7 @@ export default class Toast extends React.Component {
     }
 
     return (
-      <div className="toast-wrapper">
+      <div className="toast-wrapper" aria-live="polite">
         {toast && (
           <div className={classNames.join(" ")}>
             {toast.message}

data/app/models/category.rb

@@ -15,7 +15,7 @@ class Category < ApplicationRecord
   def set_slug
     self.slug = name.downcase
                     .gsub(/[^\w\s]/, "")
-                    .split(/[^\w\d\-]+/)
+                    .split(/[^\w\d-]+/)
                     .compact
                     .join("-")
   end

data/app/models/concerns/pages_core/page_model/dated_page.rb

@@ -11,9 +11,47 @@ module PagesCore
 
         scope :upcoming, -> { where("ends_at > ?", Time.zone.now) }
         scope :past, -> { where("ends_at <= ?", Time.zone.now) }
+        scope :with_dates, -> { where.not(starts_at: nil) }
       end
 
       module ClassMethods
+        def count_by_month
+          connection.select_all(count_by_month_query).map(&:symbolize_keys)
+        end
+
+        def in_year(year)
+          time = Date.new(year.to_i).to_time
+          where("ends_at >= ? AND starts_at <= ?",
+                time.beginning_of_year,
+                time.end_of_year)
+        end
+
+        def in_year_and_month(year, month)
+          time = Date.new(year.to_i, month.to_i).to_time
+          where("ends_at >= ? AND starts_at <= ?",
+                time.beginning_of_month,
+                time.end_of_month)
+        end
+
+        private
+
+        def count_by_month_query
+          <<-SQL.squish
+            SELECT extract('year' FROM s.d)::integer AS year,
+                   extract('month' FROM s.d)::integer AS month,
+                   count(p.id) AS count
+            FROM (SELECT generate_series(
+                    date_trunc('month', min(starts_at)::date),
+                    max(ends_at)::date,
+                    '1 month'::interval)::date AS d FROM pages) s
+            RIGHT JOIN pages p
+              ON p.ends_at::date >= s.d
+              AND p.starts_at::date <= (s.d + interval '1 month - 1 day')::date
+            WHERE p.starts_at IS NOT NULL
+            GROUP BY s.d
+            ORDER BY s.d DESC
+          SQL
+        end
       end
 
       # Finds the page's next sibling by date. Returns nil if there

data/app/models/page.rb

@@ -29,7 +29,7 @@ class Page < ApplicationRecord
   has_many :categories, through: :page_categories
 
   validates(:unique_name,
-            format: { with: /\A[\w\d_\-]+\z/,
+            format: { with: /\A[\w\d_-]+\z/,
                       allow_blank: true },
             uniqueness: { allow_blank: true })
 

data/app/policies/page_policy.rb

@@ -5,8 +5,8 @@ class PagePolicy < Policy
     true
   end
 
-  def news?
-    true
+  def calendar?
+    index?
   end
 
   def deleted?
@@ -17,10 +17,6 @@ class PagePolicy < Policy
     user.role?(:pages)
   end
 
-  def new_news?
-    create?
-  end
-
   def show?
     true
   end

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

@@ -0,0 +1,83 @@
+<%
+  month_names = %w{January February March April May June July August September October November December}
+  page_title "Calendar"
+  page_description "Calendar"
+
+  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 :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>
+<% end %>
+
+<% if @pages.any? %>
+  <table class="list calendar-item-list">
+    <tr>
+      <th>Name</th>
+      <th>Date</th>
+      <th>Published</th>
+      <th>Section</th>
+    </tr>
+    <% @pages.each do |page| %>
+      <%= render(partial: "admin/pages/list_item",
+                 locals: {
+                   page: page,
+                   date: true,
+                   section: true,
+                   sections: @parents
+                 }) %>
+    <% end %>
+  </table>
+
+  <%= will_paginate @pages %>
+<% else %>
+  <div class="content">
+    <p>
+      No calendar items have been posted yet.
+    </p>
+  </div>
+<% end %>

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

@@ -12,10 +12,12 @@
 <%= form_for(@user,
              url: accept_admin_invite_path(@invite, token: @invite.token),
              builder: PagesCore::FormBuilder) do |f| %>
-  <%= f.labelled_text_field :name %>
-  <%= f.labelled_text_field :email %>
-  <%= f.labelled_password_field :password %>
-  <%= f.labelled_password_field :confirm_password %>
+  <%= f.labelled_text_field :name, autocomplete: "name" %>
+  <%= f.labelled_text_field :email, autocomplete: "email" %>
+  <%= f.labelled_password_field(:password,
+                                autocomplete: "new-password") %>
+  <%= f.labelled_password_field(:confirm_password,
+                                autocomplete: "new-password") %>
   <p>
     <button type="submit">
       Sign up

data/app/views/admin/{pages/news.html.erb → news/index.html.erb}

@@ -4,15 +4,15 @@
   page_description "<em>News: #{month_names[@month - 1] if @month} #{@year}</em>"
 
   if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, news_admin_pages_path(l) }.join(link_separator)
+    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 :sidebar do %>
-  <% if policy(Page).new_news? %>
+  <% if policy(Page).new? %>
     <h2>New article</h2>
     <p>
-      <%= form_tag new_news_admin_pages_path, method: :get do %>
+      <%= 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] })) %>
@@ -24,7 +24,7 @@
     <% @archive_finder.years_with_count.reverse.each do |year, year_count| %>
       <h2>
         <%= link_to_unless_current(year,
-                                   news_admin_pages_path(
+                                   admin_news_index_path(
                                      @locale,
                                      year: year,
                                      category: @category&.slug)
@@ -44,7 +44,7 @@
               (<%= page_count %>)
             <% else %>
               <%= link_to(month_names[month-1],
-                          news_admin_pages_path(@locale,
+                          admin_news_index_path(@locale,
                                                 month: month,
                                                 year: year,
                                                 category: @category&.slug)) %>
@@ -68,8 +68,13 @@
       <th>Section</th>
     </tr>
     <% @pages.each do |page| %>
-      <%= render(partial: "list_item",
-                 locals: { page: page, author: true, section: true }) %>
+      <%= render(partial: "admin/pages/list_item",
+                 locals: {
+                   page: page,
+                   author: true,
+                   section: true,
+                   sections: @news_pages
+                 }) %>
     <% end %>
   </table>
 

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

@@ -2,6 +2,7 @@
   author ||= false
   date ||= false
   section ||= false
+  sections ||= []
 %>
 <tr class="<%= [page.status_label.downcase,((page.autopublish?) ? 'autopublish' : nil), ((page.pinned?) ? 'pinned' : nil)].join(' ') %>">
   <td class="name">
@@ -44,7 +45,7 @@
   <% end %>
   <% if section %>
     <td>
-      <%= news_section_name(page.parent, @news_pages) %>
+      <%= news_section_name(page.parent, sections) %>
     </td>
   <% end %>
 </tr>

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

@@ -9,8 +9,10 @@
                url: admin_password_reset_path(@password_reset_token, token: @password_reset_token.token),
                builder: PagesCore::Admin::FormBuilder,
                class: 'form') do |f| %>
-    <%= f.labelled_password_field :password %>
-    <%= f.labelled_password_field :confirm_password %>
+    <%= f.labelled_password_field(:password,
+                                  autocomplete: "new-password") %>
+    <%= f.labelled_password_field(:confirm_password,
+                                  autocomplete: "new-password") %>
     <p>
       <button type="submit">
         Change Password