pages_core 3.12.4 → 3.12.5

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_description do %>
   All pages /
-  <%= link_to("Deleted pages", deleted_admin_pages_path(@locale)) %>
+  <%= link_to("Deleted pages", deleted_admin_pages_path(content_locale)) %>
 <% end %>
 
 <% content_for :page_description_links do %>
@@ -13,12 +13,12 @@
            locals: { query: search_query }) %>
 
 <div class="content">
-  <% cache Page.visible.roots.to_a + [current_user, @locale] do %>
+  <% cache Page.visible.roots.to_a + [current_user, content_locale] do %>
     <%= react_component(
       "PageTree", {
         pages: @pages.map { |p| page_json(p) },
-        locale: @locale,
-        dir: locale_direction(@locale),
+        locale: content_locale,
+        dir: locale_direction(content_locale),
         permissions: [(:create if policy(Page).create?)] }
     ) %>
   <% end %>

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

@@ -9,7 +9,7 @@
 
 <% content_for :main_wrapper do %>
   <%= form_for(@page,
-               url: admin_pages_url(@locale),
+               url: admin_pages_url(content_locale),
                builder: PagesCore::Admin::FormBuilder,
                html: {
                  class: "edit-page main-wrapper",

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

@@ -11,7 +11,7 @@
 <%= render(partial: "admin/pages/search_bar",
            locals: { query: search_query }) %>
 
-<% if @search_documents.any? %>
+<% if @search_documents&.any? %>
   <table class="list calendar-item-list">
     <tr>
       <th>Name</th>
@@ -24,7 +24,7 @@
         <td class="name">
           <%= link_to_if(policy(page).edit?,
                          page_name(page),
-                         edit_admin_page_url(@locale, page),
+                         edit_admin_page_url(content_locale, page),
                          class: 'name_link') %>
           <%= autopublish_notice(page) %>
         </td>
@@ -45,7 +45,7 @@
     <% end %>
   </table>
   <%= will_paginate(@search_documents, renderer: PagesCore::LinkRenderer) %>
-<% else %>
+<% elsif @search_documents %>
   <div class="content">
     <p>
       Found no results for your search query.

data/app/views/feeds/pages.rss.builder

@@ -12,11 +12,11 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
     @items.each do |item|
       xml.item do
         xml.title { xml.cdata! item.name.to_s }
-        xml.link page_url(@locale, item, only_path: false)
+        xml.link page_url(content_locale, item, only_path: false)
         xml.description do
           xml.cdata! item.excerpt.to_html + item.body.to_html
         end
-        xml.guid page_url(@locale, item, only_path: false)
+        xml.guid page_url(content_locale, item, only_path: false)
         xml.pubDate item.published_at.to_fs(:rfc822)
         xml.tag!("dc:creator", item.author.name)
         if item.image

data/app/views/layouts/admin/_page_header.html.erb

@@ -1,5 +1,5 @@
-<% if content_for?(:page_description) || @content_tabs %>
-  <div class="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
+<% if content_for?(:page_description) || content_tabs? %>
+  <div class="page-description"<% if content_tabs? %> class="with_content_tabs"<% end %>>
     <% if content_for?(:page_description_links) %>
       <div class="links">
         <%= content_for(:page_description_links) %>
@@ -8,10 +8,10 @@
     <h3>
       <%= content_for(:page_description) || content_for(:page_title) %>
     </h3>
-    <% if @content_tabs %>
+    <% if content_tabs? %>
       <ul class="content-tabs"
           role="tablist">
-        <% @content_tabs.map do |t| %>
+        <% content_tabs.map do |t| %>
           <li id="content-tab-link-<%= t[:key] %>"
               data-tab="<%= t[:key] %>"
               data-main-target="link">

data/app/views/layouts/admin.html.erb

@@ -31,13 +31,12 @@
     <%= csrf_meta_tag %>
     <meta name="viewport"
           content="width=device-width, initial-scale=1, user-scalable=no">
-    <%= google_analytics_tags "UA-5468672-21" %>
   </head>
 
   <body class="<%= content_for(:body_class) %>"
         data-controller="<%= controller.class.to_s %>"
         data-action="<%= controller.action_name %>"
-        data-locale="<%= @locale %>">
+        data-locale="<%= content_locale %>">
 
     <div class="wrapper">
       <%= render partial: "layouts/admin/header" %>

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
       invalid_request: Invalid password reset request
       not_found: Couldn't find a user with that email address
       sent: An email with further instructions has been sent
+      problems_saving: There were problems saving your changes
   templates:
     default:
       blocks:

data/lib/pages_core/pages_plugin.rb

@@ -15,15 +15,17 @@ module PagesCore
 
     paths["db/migrate"] = "db/migrate"
 
-    admin_menu_item "News",  proc { admin_news_index_path(@locale) }, :pages,
+    admin_menu_item "News", proc { admin_news_index_path(content_locale) },
+                    :pages,
                     if: proc { Page.news_pages.any? },
                     current: proc { @page && @page.parent.try(&:news_page?) }
 
-    admin_menu_item "Calendar", proc { admin_calendar_path(@locale) }, :pages,
+    admin_menu_item "Calendar", proc { admin_calendar_path(content_locale) },
+                    :pages,
                     if: proc { Page.with_dates.any? },
                     current: proc { @page && @page.starts_at? }
 
-    admin_menu_item "Pages", proc { admin_pages_path(@locale) }, :pages
+    admin_menu_item "Pages", proc { admin_pages_path(content_locale) }, :pages
 
     admin_menu_item "Users", proc { admin_users_path }, :account
   end

data/lib/rails/generators/pages_core/frontend/templates/application.html.erb

@@ -1,14 +1,16 @@
-<%= head_tag do %>
-  <%# default_meta_image "/images/facebook-share.png" %>
-  <%= stylesheet_link_tag "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= feed_tags %>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-<% end %>
-<body>
-  <% if Rails.env.development? %>
-    <div class="grid-overlay"></div>
+<!doctype html>
+<%= tag.html(lang: locale) do %>
+  <%= head_tag do %>
+    <%# default_meta_image "/images/facebook-share.png" %>
+    <%= stylesheet_link_tag "application" %>
+    <%= javascript_include_tag "application" %>
+    <%= feed_tags %>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
   <% end %>
-  <%= yield %>
-</body>
-</html>
+  <body>
+    <% if Rails.env.development? %>
+      <div class="grid-overlay"></div>
+    <% end %>
+    <%= yield %>
+  </body>
+<% end %>

data/lib/tasks/pages/reports.rake

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "tty-table"
+
+namespace :pages do
+  namespace :reports do
+    desc "Template usage report"
+    task templates: :environment do
+      pastel = Pastel.new
+      files = PagesCore::Templates.names
+      rows = (Page.pluck(:template).to_a + files).uniq.sort.map do |t|
+        [t,
+         Page.published.where(template: t).count,
+         Page.where(template: t).count,
+         files.include?(t) ? pastel.green("Yes") : pastel.red("No")]
+      end
+
+      table = TTY::Table.new(
+        %w[Name Published Total File],
+        rows
+      )
+      puts table.render(:unicode, padding: [0, 1, 0, 1])
+      puts "  Total: #{rows.length} templates"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.12.4
+  version: 3.12.5
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.2
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -444,7 +472,6 @@ files:
 - app/helpers/pages_core/admin/admin_helper.rb
 - app/helpers/pages_core/admin/content_tabs_helper.rb
 - app/helpers/pages_core/admin/date_range_helper.rb
-- app/helpers/pages_core/admin/deprecated_admin_helper.rb
 - app/helpers/pages_core/admin/form_builder.rb
 - app/helpers/pages_core/admin/image_uploads_helper.rb
 - app/helpers/pages_core/admin/labelled_field_helper.rb
@@ -460,6 +487,7 @@ files:
 - app/helpers/pages_core/head_tags_helper.rb
 - app/helpers/pages_core/images_helper.rb
 - app/helpers/pages_core/labelled_form_builder.rb
+- app/helpers/pages_core/locales_helper.rb
 - app/helpers/pages_core/meta_tags_helper.rb
 - app/helpers/pages_core/open_graph_tags_helper.rb
 - app/helpers/pages_core/page_path_helper.rb
@@ -621,7 +649,6 @@ files:
 - app/views/layouts/admin/_header.html.erb
 - app/views/layouts/admin/_page_header.html.erb
 - app/views/layouts/errors.html.erb
-- app/views/pages_core/_google_analytics.html.erb
 - app/views/sitemaps/show.xml.builder
 - config/locales/en.yml
 - config/routes.rb
@@ -695,6 +722,7 @@ files:
 - lib/tasks/pages/cache.rake
 - lib/tasks/pages/export.rake
 - lib/tasks/pages/page_paths.rake
+- lib/tasks/pages/reports.rake
 - template.rb
 homepage: ''
 licenses: []

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

@@ -1,40 +0,0 @@
-# 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/views/pages_core/_google_analytics.html.erb

@@ -1,8 +0,0 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= account_id %>"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-  gtag('config', '<%= account_id %>', { 'anonymize_ip': true });
-</script>