pages_core 3.5.1 → 3.6.0

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

@@ -0,0 +1,50 @@
+<%
+  author ||= false
+  date ||= false
+  section ||= false
+%>
+<tr class="<%= [page.status_label.downcase,((page.autopublish?) ? 'autopublish' : nil), ((page.pinned?) ? 'pinned' : nil)].join(' ') %>">
+  <td class="name">
+    <%= link_to_if(policy(page).edit?,
+                   page_name(page),
+                   edit_admin_page_url(@locale, page),
+                   class: 'name_link') %>
+    <% if page.autopublish? %>
+      <br />
+      <small>
+        This page will be published
+        <strong><%= publish_time(page.published_at) %></strong>
+      </small>
+    <% end %>
+  </td>
+  <% if date %>
+    <td class="date">
+      <%= page_date_range(page) %>
+    </td>
+  <% end %>
+  <td>
+    <% if page.published? %>
+      <% if page.published_at.year == Time.zone.now.year %>
+        <%= l(page.published_at, format: :pages_date) %>
+      <% else %>
+        <%= l(page.published_at, format: :pages_full) %>
+      <% end %>
+    <% else %>
+      <% if page.status_label == 'Published' %>
+        <em>Not published</em>
+      <% else %>
+        <em><%= page.status_label %></em>
+      <% end %>
+    <% end %>
+  </td>
+  <% if author %>
+    <td>
+      <%= link_to(page.author.name, admin_user_path(page.author)) %>
+    </td>
+  <% end %>
+  <% if section %>
+    <td>
+      <%= news_section_name(page.parent, @news_pages) %>
+    </td>
+  <% end %>
+</tr>

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

@@ -0,0 +1,42 @@
+<%
+  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
+%>
+
+<% if @pages.any? %>
+  <table class="deleted-pages list">
+    <tr>
+      <th>Name</th>
+      <th>Last updated</th>
+      <th>Author</th>
+      <th>Location</th>
+    </tr>
+    <% @pages.each do |page| %>
+      <tr>
+        <td class="name">
+          <%= link_to_if(policy(page).edit?,
+                         page_name(page),
+                         edit_admin_page_url(@locale, page),
+                         class: 'name_link') %>
+        </td>
+        <td>
+          <%= l(page.updated_at, format: :short) %>
+        </td>
+        <td>
+          <%= link_to(page.author.name, admin_user_path(page.author)) %>
+        </td>
+        <td>
+          <% if page.parent %>
+            <%= page_name(page.parent, include_parents: true) %>
+          <% else %>
+            Top level
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

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

@@ -3,7 +3,11 @@
   self.page_description = "Editing " + [@page.ancestors.reverse,@page].flatten.map{|page| link_to((page.name rescue "(Untitled)"), edit_admin_page_path(@locale, page))}.join(" » ")
 
   if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, edit_admin_page_path(l, @page) }.join(link_separator)
+    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
 %>
 
@@ -14,7 +18,8 @@
 <% content_for :sidebar do %>
   <%= form_for(@page,
                url: admin_page_url(@locale, @page),
-               html: {class: "edit-page", id: 'page-form-sidebar'}) do |f| %>
+               html: {class: "edit-page", id: 'page-form-sidebar'},
+               builder: PagesCore::Admin::FormBuilder) do |f| %>
     <%= render partial: 'edit_options', locals: {f: f} %>
   <% end %>
 <% end %>
@@ -31,7 +36,7 @@
                method: :put,
                multipart: true
              },
-             builder: PagesCore::FormBuilder
+             builder: PagesCore::Admin::FormBuilder
 ) do |f| %>
 
   <div class="hidden-options">
@@ -54,43 +59,7 @@
   <%# #### FILES #### %>
   <% if @page.template_config.value(:files) %>
     <%= content_tab "Files" do %>
-      <% if @page.files.any? %>
-        <ul class="file-list" data-url="<%= reorder_admin_page_files_url(@locale, @page) %>">
-          <% @page.files.each do |file| %>
-            <li data-file-id="<%= file.id %>">
-              <span class="actions">
-                <span class="embed-code">
-                  <%= file_embed_code(file) %>
-                </span>
-                <%= link_to "Delete", admin_page_file_path(@locale, @page, file), class: :delete, method: :delete, data: {confirm: 'Are you sure? There is no undo.'} %>
-              </span>
-              <div class="drag-handle"></div>
-              <strong><%= file.name %></strong> &ndash; <%= link_to file.filename, page_file_path(@locale, @page, file) %>
-            </li>
-          <% end %>
-        </ul>
-      <% else %>
-        <p>No files added yet.</p>
-      <% end %>
-      <p>
-        <button type="button" class="upload-file-button">
-          Upload file
-        </button>
-      </p>
-    <% end %>
-  <% end %>
-
-
-  <%# #### COMMENTS #### %>
-  <% if @page.template_config.value(:comments) %>
-    <% if @page.comments.count > 0 %>
-      <%= content_tab "Comments" do %>
-        <%= render partial: 'edit_comments', locals: {f: f} %>
-      <% end %>
-    <% else %>
-      <%= content_tab "Comments", {disabled: true} do %>
-        <p>No comments added.</p>
-      <% end %>
+      <%= render partial: 'edit_files', locals: {f: f} %>
     <% end %>
   <% end %>
 
@@ -110,57 +79,3 @@
   </div>
 
 <% end %>
-
-<%# #### UPLOAD IMAGE #### %>
-<div id="new-image">
-  <h2>Upload images</h2>
-  <%= form_for(@page.page_images.new, url: admin_page_images_url(@locale, @page), html: {multipart: true}) do |f| %>
-
-    <table>
-      <tr>
-        <th>File</th>
-        <th>Caption</th>
-      </tr>
-      <% 10.times do |i| %>
-        <tr class="">
-          <td>
-            <%= file_field_tag("page_images[#{i}][image]") %>
-          </td>
-          <td>
-            <%= text_field_tag("page_images[#{i}][image_attributes][caption]", '', size: 48) %>
-          </td>
-        </tr>
-      <% end %>
-    </table>
-
-    <p>
-      <%= submit_tag "Upload" %> or
-      <%= link_to "Cancel", "#", class: "cancel clear-modal" %>
-    </p>
-  <% end %>
-</div>
-
-
-<%# #### UPLOAD FILE #### %>
-<% if @page.template_config.value(:files) %>
-  <div id="new-file" class="page_new_file">
-    <h2>Upload new file</h2>
-    <%= form_for((@new_file = PageFile.new),
-                 url: admin_page_files_path(@locale, @page),
-                 html: {multipart: true}) do |f| %>
-      <%= labelled_field f.text_field( :name, size: 48 ), "Name",
-        errors: @new_file.errors[:name]
-      %>
-      <%= labelled_field f.text_field( :description, size: 48 ), "Description",
-        errors: @new_file.errors[:name]
-      %>
-      <%= labelled_field f.file_field( :file ), "File",
-        errors: @new_file.errors[:file]
-      %>
-      <p>
-        <%= submit_tag "Upload" %> or
-        <%= link_to "Cancel", "#", class: "cancel clear-modal" %>
-      </p>
-    <% end %>
-  </div>
-<% end %>

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

@@ -1,6 +1,6 @@
 <%
   self.page_title = "Pages"
-  self.page_description = "Viewing pages"
+  self.page_description = "All pages / " + link_to("Deleted pages", deleted_admin_pages_path(@locale))
 
   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)
@@ -11,16 +11,13 @@
 <% end %>
 
 <div class="content">
-  <%= react_component(
-    "PageTree", {
-      tree: {
-        name: "All Pages",
+  <% cache Page.visible.roots.to_a + [current_user, @locale] do %>
+    <%= react_component(
+      "PageTree", {
+        csrf_token: form_authenticity_token,
+        pages: @pages.map { |p| page_json(p) },
         locale: @locale,
-        children: ActiveModel::ArraySerializer.new(
-          @root_pages,
-          each_serializer: PageTreeSerializer
-        )
-      }
-    }
-  ) %>
+        permissions: [(:create if policy(Page).create?)] }
+    ) %>
+  <% end %>
 </div>

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

@@ -1,6 +1,6 @@
 <%
   if @page.parent
-    self.page_title = "#{@page.parent.name} &raquo; New Page".html_safe
+    self.page_title = "New page"
     self.page_description = "<em>#{@page.parent.name}</em> &raquo; New Page"
   else
     self.page_title = "Create new page"
@@ -21,6 +21,7 @@
 
 <%= form_for(@page,
              url: admin_pages_url(@locale),
+             builder: PagesCore::Admin::FormBuilder,
              html: {
                class: "edit-page",
                id: 'page-form',

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

@@ -1,7 +1,7 @@
 <%
   month_names = %w{January February March April May June July August September October November December}
-  self.page_title = "News"
-  self.page_description = "<em>#{month_names[@month - 1]} #{@year}</em>"
+  page_title "News"
+  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)
@@ -9,25 +9,54 @@
 %>
 
 <% content_for :sidebar do %>
-  <h2>New article</h2>
-  <p>
-    <%= form_tag new_news_admin_pages_path, method: :get do %>
-      In <%= select_tag 'parent', options_for_select(@news_pages.map{|p| [page_name(p, include_parents: true).gsub("&raquo;", "»"), p.id] }) %>
-      <%= submit_tag "Go", name: nil %>
-    <% end %>
-  </p>
-  <% @archive_finder.years.reverse.each do |year| %>
-    <h2><%= year %><%= ": #{@category.name}" if @category %></h2>
-    <ul>
-      <% @archive_finder.months_in_year_with_count(year).each do |month, page_count| %>
-        <li><% if year == @year && month == @month %>
-          <strong><%= month_names[month-1] %></strong> (<%= page_count %>)</strong>
-        <% else %>
-          <%= link_to month_names[month-1], news_admin_pages_path(@locale, month: month, year: year, category: ((@category) ? @category.slug : nil)) %> (<%= page_count %>)
-        <% end %></li>
+  <% if policy(Page).new_news? %>
+    <h2>New article</h2>
+    <p>
+      <%= form_tag new_news_admin_pages_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 %>
-    </ul>
+    </p>
   <% end %>
+  <div class="archive-index">
+    <% @archive_finder.years_with_count.reverse.each do |year, year_count| %>
+      <h2>
+        <%= link_to_unless_current(year,
+                                   news_admin_pages_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],
+                          news_admin_pages_path(@locale,
+                                                month: month,
+                                                year: year,
+                                                category: @category&.slug)) %>
+              <span class="count">
+                (<%= page_count %>)
+              </span>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
 <% end %>
 
 <% if @pages.any? %>
@@ -38,32 +67,17 @@
       <th>Author</th>
       <th>Section</th>
     </tr>
-    <% @pages.each do |page| %><tr class="<%= [page.status_label.downcase,((page.autopublish?) ? 'autopublish' : nil), ((page.pinned?) ? 'pinned' : nil)].join(' ') %>">
-      <td class="name">
-        <%= link_to_if(policy(page).edit?, page_name(page), edit_admin_page_url(@locale, page), class: 'name_link') %>
-        <% if page.autopublish? %>
-          <br /><small>This page will be published <strong><%= publish_time(page.published_at) %></strong></small>
-        <% end %>
-      </td>
-      <td>
-        <% if page.published? %>
-          <%= l(page.published_at, format: :short) %>
-        <% else %>
-          <% if page.status_label == 'Published' %>
-            <em>Not published</em>
-          <% else %>
-            <em><%= page.status_label %></em>
-          <% end %>
-        <% end %>
-      </td>
-      <td>
-        <%= link_to page.author.name, admin_user_path(page.author) %>
-      </td>
-      <td>
-        <%= link_to_if(policy(page.parent).edit?, page_name(page.parent, include_parents: true), news_admin_pages_path(section: page.parent.id)) %>
-      </td>
-    </tr><% end %>
+    <% @pages.each do |page| %>
+      <%= render(partial: "list_item",
+                 locals: { page: page, author: true, section: true }) %>
+    <% end %>
   </table>
+
+  <%= will_paginate @pages, renderer: PagesCore::LinkRenderer %>
 <% else %>
-  <div class="content"><p>No news items have been posted yet.</p></div>
+  <div class="content">
+    <p>
+      No news items have been posted yet.
+    </p>
+  </div>
 <% end %>

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

@@ -5,15 +5,12 @@
 -%>
 
 <div class="login-form">
-  <%= form_for(@user, url: admin_password_reset_path(@password_reset_token, token: @password_reset_token.token), class: 'form') do |f| %>
-    <p>
-      <%= f.label :password %>
-      <%= f.password_field :password %>
-    </p>
-    <p>
-      <%= f.label :confirm_password %>
-      <%= f.password_field :confirm_password %>
-    </p>
+  <%= 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 %>
     <p>
       <button type="submit">
         Change Password

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

@@ -7,7 +7,10 @@
       <%= f.check_box :activated %> The user account is activated<br />
     <% end %>
     <% Role.roles.each do |role| %>
-      <%= check_box_tag "#{model_name_from_record_or_class(f.object).param_key}[role_names][]", role.name, f.object.role?(role.name.to_sym) %>
+      <%= check_box_tag("#{model_name_from_record_or_class(f.object).param_key}[role_names][]",
+                        role.name,
+                        f.object.role?(role.name.to_sym),
+                        class: "role") %>
       <%= role.description %><br>
     <% end %>
   </p>

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

@@ -13,7 +13,7 @@
       <%= invite.email %>
     </td>
     <td>
-      <%= invite.roles.map(&:to_s).to_sentence %>
+      <%= invite.roles.map(&:to_s).sort.to_sentence %>
     </td>
     <td>
       <% if invite.sent_at? %>
@@ -22,15 +22,20 @@
       <% end %>
     </td>
     <td>
-      <%= link_to "Cancel invite", [:admin, invite], method: 'delete', data: {confirm: "Are you sure?"}, class: 'delete' %>
+      <% if current_user.role?(:users) %>
+        <%= link_to("View invite",
+                    admin_invite_with_token_url(invite, invite.token)) %> /
+        <%= link_to("Cancel invite",
+                    [:admin, invite],
+                    method: 'delete',
+                    data: { confirm: "Are you sure?" },
+                    class: 'delete') %>
+      <% end %>
     </td>
   </tr>
 <% end %>
 <% @users.each do |user| -%>
-  <tr class="<%=
-    classes = []
-    classes.join( " " )
-   %>">
+  <tr class="user-<%= user.id %>">
     <td>
       <strong><%= link_to user.name, admin_user_url( user ) %></strong>
       <% if policy(user).edit? %>
@@ -40,7 +45,7 @@
     <td>
       <%= user.email %>
     </td>
-    <td><%= user.roles.map(&:to_s).to_sentence %></td>
+    <td><%= user.roles.map(&:to_s).sort.to_sentence %></td>
     <td>
       <% if user.online? -%>
         <strong>Online now</strong>