pages_core 3.11.3 → 3.12.1

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/_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

@@ -0,0 +1,45 @@
+<% content_for :page_title, "Calendar" %>
+<% content_for(:page_description) do %>
+  Calendar:
+  <em>
+    <% if @month %>
+      <%= month_name(@month) %>
+    <% end %>
+    <%= @year %>
+  </em>
+<% end %>
+
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| admin_calendar_path(l, @year) } %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <%= render(partial: "sidebar", locals: { locale: @locale }) %>
+<% 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, renderer: PagesCore::LinkRenderer %>
+<% else %>
+  <div class="content">
+    <p>
+      No calendar items have been posted yet.
+    </p>
+  </div>
+<% end %>

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>
@@ -12,10 +10,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/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

@@ -0,0 +1,53 @@
+<% content_for(:page_title, "News") %>
+
+<% 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 %>
+  <%= render(partial: "sidebar",
+             locals: {
+               locale: @locale,
+               category: @category,
+               news_pages: @news_pages,
+               archive_finder: @archive_finder
+             }) %>
+<% end %>
+
+<% if @pages.length > 0 %>
+  <table class="list news-item-list">
+    <tr>
+      <th>Name</th>
+      <th>Published</th>
+      <th>Author</th>
+      <th>Section</th>
+    </tr>
+    <% @pages.each do |page| %>
+      <%= render(partial: "admin/pages/list_item",
+                 locals: {
+                   page: page,
+                   author: true,
+                   section: true,
+                   sections: @news_pages
+                 }) %>
+    <% end %>
+  </table>
+
+  <%= will_paginate @pages, renderer: PagesCore::LinkRenderer %>
+<% else %>
+  <div class="content">
+    <p>
+      No news items have been posted yet.
+    </p>
+  </div>
+<% end %>

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/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">

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

@@ -1,15 +1,24 @@
-<%
-  self.page_title = "Editing “" + @page.name.to_s + "”"
-  self.page_description = "Editing " + [@page.ancestors.reverse,@page].flatten.map{|page| link_to((page.name rescue "(Untitled)"), edit_admin_page_path(@locale, page))}.join(" &raquo; ")
+<% content_for :page_title do %>
+  <% if @page.name? %>
+    Edit “<%= @page.name %>”
+  <% else %>
+    Edit page
+  <% end %>
+<% end %>
+<% content_for :page_description do %>
+  Editing
+  <% @page.ancestors.reverse.each do |page| %>
+    <%= link_to(page.name? ? page.name : tag.i("Untitled"),
+                edit_admin_page_path(@locale, page)) %>
+    &raquo;
+  <% end %>
+  <%= link_to(@page.name? ? @page.name : tag.i("Untitled"),
+              edit_admin_page_path(@locale, @page)) %>
+<% end %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = "In " + safe_join(
-      PagesCore.config.locales.map do |l, name|
-        link_to_unless((l == @locale.to_sym), name, edit_admin_page_path(l, @page.localize(l)))
-      end,
-      link_separator)
-  end
-%>
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| edit_admin_page_path(l, @page.localize(l)) } %>
+<% end %>
 
 <% content_for :main_wrapper do %>
   <%= form_for(@page,

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

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

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

@@ -1,15 +1,11 @@
-<%
-  if @page.parent
-    self.page_title = "New page"
-    self.page_description = "<em>#{@page.parent.name}</em> &raquo; New Page"
-  else
-    self.page_title = "Create new page"
-    self.page_description = "You are creating a new root page"
-  end
-
-  @url_options = { action: :new }
-  @url_options[:parent] = @page.parent if @page.parent
-%>
+<% content_for :page_title, "New page" %>
+<% content_for :page_description do %>
+  <% if @page.parent %>
+    <em><%= @page.parent.name %></em> &raquo; New Page
+  <% else %>
+    You are creating a new root page
+  <% end %>
+<% end %>
 
 <% content_for :main_wrapper do %>
   <%= form_for(@page,
@@ -25,7 +21,7 @@
 
     <% content_for :main do %>
       <div class="content">
-        <%= f.hidden_field 'parent_page_id' if @page.parent %>
+        <%= f.hidden_field "parent_page_id" if @page.parent %>
 
         <%= render(partial: "form", locals: { f: f }) %>
 
@@ -43,7 +39,7 @@
     </main>
 
     <aside class="sidebar" id="page-form-sidebar">
-      <%= render partial: 'edit_options', locals: { f: f } %>
+      <%= render partial: "edit_options", locals: { f: f } %>
     </aside>
   <% end %>
 <% end %>

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

@@ -1,16 +1,16 @@
-<%
-  self.page_title = "Reset password"
-  self.page_description = "Please choose a new password to proceed"
-  add_body_class "login"
--%>
+<% content_for :page_title, "Reset password" %>
+<% content_for :page_description, "Please choose a new password to proceed" %>
+<% content_for :body_class, "login" %>
 
 <div class="login-form">
   <%= form_for(@user,
                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

data/app/views/admin/users/deactivated.html.erb

@@ -1,12 +1,11 @@
-<%
-  self.page_title = "Deactivated users"
-  self.page_description = "Viewing deactivated users"
-  self.page_description_links = link_to("View active users", admin_users_path)
-%>
+<% content_for :page_title, "Deactivated users" %>
+<% content_for :page_description, "Viewing deactivated users" %>
 
+<% content_for(:page_description_links) do %>
+  <%= link_to("View active users", admin_users_path) %>
+<% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
-
-<%= render partial: 'list', locals: {users: @users} %>
+<%= render partial: "list", locals: { users: @users } %>

data/app/views/admin/users/edit.html.erb

@@ -1,12 +1,10 @@
-<%
-  self.page_title = "Editing user: #{@user.name}"
-  if @user == current_user
-    self.page_description = "You are editing " + link_to("your own", [:admin, @user]) + " profile."
-  else
-    self.page_description = "You are editing " + link_to("#{@user.name}", [:admin, @user]) + "'s profile."
-  end
-  self.page_description_links = link_to("View all users", admin_users_path)
-%>
+<% content_for :page_title, "Editing user: #{@user.name}" %>
+
+<% content_for :page_description do %>
+  You are editing
+  <%= link_to((@user == current_user ? "your own profile" : "#{@user.name}"),
+              [:admin, @user]) %>
+<% end %>
 
 <% content_for :sidebar do %>
   <% if @user != current_user %>

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

@@ -1,8 +1,5 @@
-<%
-  self.page_title = "Users"
-  self.page_description = "Viewing active users"
-%>
-
+<% content_for :page_title, "Users" %>
+<% content_for :page_description, "Viewing active users" %>
 
 <% content_for :sidebar do %>
   <% if policy(User).new? %>
@@ -24,4 +21,4 @@
 <% end %>
 
 
-<%= render partial: 'list', locals: {users: @users} %>
+<%= render partial: "list", locals: { users: @users } %>

data/app/views/admin/users/login.html.erb

@@ -1,8 +1,7 @@
-<%
-  self.page_title = "Sign in"
-  self.page_description = "Please enter your email address and password to sign in"
-  add_body_class "login"
--%>
+<% content_for :page_title, "Sign in" %>
+<% content_for(:page_description,
+               "Please enter your email address and password to sign in") %>
+<% content_for :body_class, "login" %>
 
 <% content_for :sidebar do %>
   <h2>Please note</h2>
@@ -19,11 +18,11 @@
     <%= form_tag session_path do %>
       <p>
         <label>Email address</label>
-        <%= text_field_tag :email, '' %>
+        <%= text_field_tag(:email, "", autocomplete: "email") %>
       </p>
       <p>
         <label>Password</label>
-        <%= password_field_tag :password, '' %>
+        <%= password_field_tag(:password, "", autocomplete: "current-password") %>
       </p>
       <p>
         <button type="submit">Sign in</button>
@@ -54,7 +53,7 @@
         and we'll send you a link where you can reset your password.
       </p>
       <p>
-        <%= text_field_tag :email, '' %>
+        <%= text_field_tag(:email, "", autocomplete: "email") %>
       </p>
       <p>
         <button type="submit">

data/app/views/admin/users/new.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>Welcome to Pages! Before you can log on, we need to create the first user account.</p>
@@ -9,10 +7,12 @@
 
 <%= form_for [:admin, @user], 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">

data/app/views/admin/users/new_password.html.erb

@@ -1,8 +1,7 @@
-<%
-  self.page_title = "Log in &raquo; Forgotten password"
-  self.page_description = "Creating a new password"
-  add_body_class = "login"
-%>
+<% content_for :page_title, "Log in &raquo; Forgotten password" %>
+<% content_for :page_description, "Creating a new password" %>
+<% content_for :body_class, "login" -%>
+
 <div class="content">
 <p>
   Did you lose your password? Don't worry, it happens.
@@ -13,7 +12,7 @@
 </div>
 <%= form_tag(reset_password_admin_users_path, method: :post) do %>
   <p>
-    <%= text_field_tag :email, '', size: 32 %>
+    <%= text_field_tag(:email, "", size: 32, autocomplete: "email") %>
     <%= submit_tag "Find" %>
   </p>
 </form>

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

@@ -1,12 +1,14 @@
-<%
-  self.page_title = "#{@user.name}"
-  if @user == current_user
-    self.page_description = "You are viewing " + link_to( "your own", admin_user_path( @user ) ) + " profile."
-  else
-    self.page_description = "You are viewing " + link_to( "#{@user.name}", admin_user_path( @user ) ) + "'s profile."
-  end
-  self.page_description_links = [ ( link_to( "Edit", edit_admin_user_path( @user ) ) if policy(@user).edit? ), link_to( "View all users", admin_users_path ) ].compact.join( link_separator )
-%>
+<% content_for :page_title, @user.name %>
+
+<% content_for :page_description do %>
+  You are viewing
+  <%= link_to((@user == current_user ? "your own profile" : "#{@user.name}"),
+              [:admin, @user]) %>
+<% end %>
+
+<% content_for(:page_description_links) do %>
+  <%= link_to("Edit", edit_admin_user_path(@user)) if policy(@user).edit? %>
+<% end %>
 
 <% content_for :sidebar do %>
   <h2>People</h2>

data/app/views/errors/401.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "Unauthorized" %>
+<% content_for :page_title, "Unauthorized" %>
+
 <p>
   You are not authorized to access this resource.
 </p>

data/app/views/errors/403.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "Forbidden" %>
+<% content_for :page_title, "Forbidden" %>
+
 <p>
   You are not authorized to access this resource.
 </p>

data/app/views/errors/404.html.erb

@@ -1,6 +1,4 @@
-<%
-  @page_title = "Page not found"
-%>
+<% content_for :page_title, "Page not found" %>
 
 <p>
   The page you were looking for could not be found. It might have been removed,

data/app/views/errors/405.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "405: Method Not Allowed" %>
+<% content_for :page_title, "405: Method Not Allowed" %>
+
 <p>This method has not been implemented.</p>
 
 <%= render partial: 'errors/generic_help' %>

data/app/views/errors/422.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "422: Unacceptable" %>
+<% content_for :page_title, "422: Unacceptable" %>
+
 <p>
   The change you wanted was rejected.
   Maybe you tried to change something you didn't have access to.

data/app/views/errors/500.html.erb

@@ -1,6 +1,5 @@
-<%
-  @page_title = "500 Internal Server Error"
-%>
+<% content_for :page_title, "500 Internal Server Error" %>
+
 <p>
   We're experiencing an internal server problem. Please try again later.
 </p>