effective_posts 2.6.2 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2b29680fd67771e07107f6fc283581b317593e18bec35916ca2e99ff7f7a21
-  data.tar.gz: 395b803b93e46491d74e9965702e2f50b019ce36410e57f5e0472ac5ed9524ca
+  metadata.gz: 3a1c81f231ae730f44dcbbfb64bead77d9a2530a3b6f4e2bdea6455f5ea78ca2
+  data.tar.gz: 0ef00c73d74471e23a06c322444f209ab58fd21fce475a9783ecc93e8dadc011
 SHA512:
-  metadata.gz: a0908054fb05b30f5e45f4f0bfc9b58597c59dd2f3b9eddee0cac8a51fcfc2ef4a81bf83c1af487d228c648acca09734db53a5b3bde4a40b1fac943f9a7075de
-  data.tar.gz: 21e8a107beba7055c689209ad068f9dfef739e8581eaf3be2b71c21cf252b42dfdf7d3f3fb63ae13661c0b69805718fe4fc1094158ff1a8f9e8f0766c43272cb
+  metadata.gz: 4eb6a0e3530b97ba6cd1679c4bb137dfe91937806ca6284a016a930509e416e49fed55ec489af4753aec4d0fcd783e5bcf88ca9bc62c6f629fddaa3c4f2fc442
+  data.tar.gz: 600dec645eb265e938d44315ecf2299755bbc678d8d0e8535fc690eff63867a0b884d3612b1b56c70403b6afeb844cf34c0b918be07020ae825458462598d8de

data/app/controllers/effective/posts_controller.rb

@@ -27,9 +27,15 @@ module Effective
         @posts = @posts.where(search) if search.present?
       end
 
+      if @category.present?
+        @page_title = @category.to_s
+      else
+        @page_title ||= view_context.posts_name_label
+      end
+
       EffectiveResources.authorize!(self, :index, Effective::Post)
 
-      @page_title ||= [(@category || 'Blog').to_s.titleize, (" - Page #{params[:page]}" if params[:page])].compact.join
+      @page_title ||= [(@category || view_context.posts_name_label).to_s.titleize, (" - Page #{params[:page]}" if params[:page])].compact.join
       @canonical_url ||= helpers.effective_post_category_url(params[:category], page: params[:page])
     end
 
@@ -52,13 +58,12 @@ module Effective
           'Hi Admin!',
           ('You are viewing a hidden post.' unless @post.published?),
           ('You are viewing an archived post.' if @post.archived?),
-          'Click here to',
-          ("<a href='#{effective_posts.edit_admin_post_path(@post)}' class='alert-link'>edit post settings</a>.")
+          ("<a href='#{effective_posts.edit_admin_post_path(@post)}' class='alert-link'>Edit this post</a>.")
         ].compact.join(' ')
       end
 
       @page_title ||= @post.title
-      @meta_description ||= @post.description
+      @meta_description ||= (@post.description.presence || @post.title)
       @canonical_url ||= effective_posts.post_url(@post)
     end
 

data/app/datatables/effective_posts_datatable.rb

@@ -26,12 +26,12 @@ class EffectivePostsDatatable < Effective::Datatable
 
     col :draft?, as: :boolean, visible: false
     col :published?, as: :boolean
-    col :published_start_at
-    col :published_end_at
+    col :published_start_at, label: "Published start"
+    col :published_end_at, label: "Published end"
 
     col :archived
 
-    col :start_at
+    col :start_at, visible: EffectivePosts.categories.include?('Events')
     col :end_at, visible: false
     col :location, visible: false
     col :created_at, label: 'Submitted at', visible: false

data/app/helpers/effective_posts_helper.rb

@@ -2,6 +2,21 @@ require 'cgi'
 
 module EffectivePostsHelper
 
+  # Posts
+  def posts_name_label
+    et('effective_posts.name')
+  end
+
+  # Post
+  def post_label
+    et(Effective::Post)
+  end
+
+  # Posts
+  def posts_label
+    ets(Effective::Post)
+  end
+
   def effective_posts_header_tags
     return unless @post && @post.kind_of?(Effective::Post) && @post.persisted? && @post.published?
 
@@ -54,17 +69,20 @@ module EffectivePostsHelper
     link_to(category.to_s.titleize, effective_post_category_path(category), title: category.to_s.titleize)
   end
 
+  def badge_to_post_category(category, options = {})
+    category = category.to_s.downcase
+    link_to(category.to_s.titleize, effective_post_category_path(category), title: category.to_s.titleize, class: "badge badge-primary badge-post mb-2 effective-posts-#{category.parameterize}")
+  end
+
   def render_post(post)
     render(partial: 'effective/posts/post', locals: { post: post })
   end
 
   def post_meta(post, date: true, datetime: false, category: true, author: true)
     [
-      'Published',
-      ("on #{post.published_start_at.strftime('%B %d, %Y')}" if date && post.published_start_at),
-      ("on #{post.published_start_at.strftime('%B %d, %Y at %l:%M %p')}" if datetime && post.published_start_at),
-      ("to #{link_to_post_category(post.category)}" if category && Array(EffectivePosts.categories).length > 1),
-      ("by #{post.user.to_s.presence || 'Unknown'}" if author && EffectivePosts.post_meta_author && post.user.present?)
+      ("#{post.published_start_at.strftime('%A, %B %d, %Y')}" if date && post.published_start_at),
+      ("#{post.published_start_at.strftime('%A, %B %d, %Y · %l:%M%P')}" if datetime && post.published_start_at),
+      ("#{post.user.to_s.presence || 'Unknown'}" if author && EffectivePosts.post_meta_author && post.user.present?)
     ].compact.join(' ').html_safe
   end
 
@@ -82,7 +100,8 @@ module EffectivePostsHelper
 
   # All other options are passed to the link_to 'Read more'
   def post_excerpt(post, label: 'Continue reading')
-    (post.excerpt.to_s + readmore_link(post, label: label)).html_safe
+    content = post.excerpt.presence || post.body.presence
+    (content.to_s + readmore_link(post, label: label)).html_safe
   end
 
   def read_more_link(post, options = {})

data/app/models/effective/post.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Effective
   class Post < ActiveRecord::Base
     self.table_name = (EffectivePosts.posts_table_name || :posts).to_s
 
     if defined?(PgSearch)
       include PgSearch::Model
-
       multisearchable against: [:body]
     end
 
@@ -55,8 +56,8 @@ module Effective
       self.user ||= current_user
     end
 
-    validates :title, presence: true, length: { maximum: 255 }
-    validates :description, presence: true, length: { maximum: 150 }
+    validates :title, presence: true
+    validates :description, length: { maximum: 150 }
     validates :category, presence: true
     validates :start_at, presence: true, if: -> { category == 'events' }
 

data/app/views/admin/posts/_form_post.html.haml

@@ -1,51 +1,48 @@
 = effective_form_with(model: [:admin, post], engine: true) do |f|
   = f.text_field :title, hint: 'The title of your post.'
 
+  - if Array(EffectivePosts.categories).length > 1
+    = f.select :category, EffectivePosts.categories
+  - else
+    = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
+
   -# acts_as_published
   = f.hide_if(:save_as_draft, true) do
     .row
       .col-md-6
-        = f.datetime_field :published_start_at, hint: 'The page will be available starting on this date and time.'
+        = f.datetime_field :published_start_at, label: 'Published start', hint: 'The page will appear on the website after this date and time. Leave blank to publish immediately'
       .col-md-6
-        = f.datetime_field :published_end_at, hint: 'The page will no longer be available after this date and time. Leave blank for no end date.', date_linked: false
+        = f.datetime_field :published_end_at, label: 'Published end', hint: 'The page will not appear on the website after this date and time. Leave blank for no end date.', date_linked: false
 
   = f.check_box :save_as_draft, label: "Save as a draft. It will not appear on the website and can only be accessed by admin users."
 
-  = f.text_field :description,
-    hint: "150 character summary. Appears on Google search results underneath the post title. ",
-    input_html: { maxlength: 150 }
-
+  - # acts_as_slugged
   - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = effective_posts.post_path(f.object)
 
     = f.text_field :slug, required: f.object.persisted?,
       hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url && f.object.slug.present? }".html_safe
 
-  - if defined?(EffectiveArticleEditor)
-    = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
-  - else
-    = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
-
-  - if Array(EffectivePosts.categories).length > 1
-    = f.select :category, EffectivePosts.categories
-  - else
-    = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
-
-  - if f.object.class.respond_to?(:acts_as_tagged?)
-    = render 'effective/tags/fields', f: f
+  - if EffectivePosts.use_description
+    = f.text_field :description, label: "Meta description", input_html: { maxlength: 150 },
+      hint: "150 character summary that appears on Google search result pages."
 
   - if EffectivePosts.use_active_storage
-    = f.file_field :image, hint: 'An image for your post'
+    = f.file_field :image, label: "Image preview", hint: "Optional. Shown on the posts index and post pages. Dimensions are 220px tall and 350px wide."
+
+  - if EffectivePosts.use_excerpt
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages. Leave blank to use the body instead.'
+    - else
+      = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages. Leave blank to use the body instead.'
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :body, hint: 'The main body of your post'
+    = f.article_editor :body
   - else
-    = f.rich_text_area :body, hint: 'The main body of your post'
+    = f.rich_text_area :body
 
   = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
 
-  = f.check_box :archived, label: 'Yes, this post is archived. It will not be displayed.'
-
   - if EffectivePosts.use_effective_roles
     = render partial: '/admin/posts/roles', locals: { post: post, form: f, f: f }
 

data/app/views/effective/posts/_form.html.haml

@@ -1,30 +1,35 @@
 = effective_form_with(model: post, engine: true) do |f|
   = f.text_field :title, hint: 'The title of your post.'
 
-  - if f.object.persisted? || f.object.errors.include?(:slug)
-    - current_url = effective_posts.post_path(f.object)
-  = f.text_field :slug, hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url && f.object.slug.present? }".html_safe
-
   - if Array(EffectivePosts.categories).length > 1
     = f.select :category, EffectivePosts.categories
   - else
     = f.hidden_field :category, value: (EffectivePosts.categories.first || 'posts')
 
-  - if EffectivePosts.use_active_storage
-    = f.file_field :image, hint: 'An image for your post'
+  - # acts_as_slugged
+  - if f.object.persisted? || f.object.errors.include?(:slug)
+    - current_url = effective_posts.post_path(f.object)
 
-  - if defined?(EffectiveArticleEditor)
-    = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
-  - else
-    = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
+    = f.text_field :slug, required: f.object.persisted?,
+      hint: "The slug controls this post's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This post is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url && f.object.slug.present? }".html_safe
 
-  = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
+  - if EffectivePosts.use_description
+    = f.text_field :description, hint: 'The content of the post meta tags.', maxlength: 150
 
-  = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
+  - if EffectivePosts.use_active_storage
+    = f.file_field :image, hint: 'An image for your post'
+
+  - if EffectivePosts.use_excerpt
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor :excerpt, hint: 'Will be used for the post excerpt on index pages.'
+    - else
+      = f.rich_text_area :excerpt, hint: 'Will be used for the post excerpt on index pages.'
 
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :body, hint: 'The main body of your post'
   - else
     = f.rich_text_area :body, hint: 'The main body of your post'
 
+  = render partial: '/effective/posts/additional_fields', locals: { post: post, form: f, f: f }
+
   = f.submit 'Save'

data/app/views/effective/posts/_layout.html.haml

@@ -1,3 +1,2 @@
-.row
-  .col-sm-8= yield
-  .col-sm-4= render 'sidebar'
+.effective-posts.mb-3
+  = yield

data/app/views/effective/posts/_post.html.haml

@@ -1,9 +1,18 @@
-.effective-post
-  %h2.post-title= link_to post, effective_post_path(post)
+.col.effective-post.mb-5
+  - if EffectivePosts.categories.length > 1 && post.category.present?
+    = badge_to_post_category(post.category)
 
-  %p.post-meta.text-muted
+  - if EffectivePosts.use_active_storage && post.image && post.image.attached?
+    = link_to effective_posts.post_path(post) do
+      = image_tag url_for(post.image), class: "effective-posts-image d-none d-lg-flex align-self-start mb-2", alt: post.title, width: "350", height: "220"
+
+  .effective-posts-meta.mb-2
     = post_meta(post, author: false)
     = admin_post_status_badge(post)
 
-  .post-content.post-excerpt
-    = post.excerpt
+  %h2.effective-posts-title= link_to post, effective_post_path(post)
+
+  - if EffectivePosts.use_excerpt && post.excerpt.present?
+    .effective-posts-excerpt
+      = post.excerpt
+

data/app/views/effective/posts/index.html.haml

@@ -1,8 +1,8 @@
-%h1= @page_title
-
 = render 'layout' do
-  .effective-posts
-    = render partial: @posts, spacer_template: 'spacer'
+  %h1.effective-title.mb-4= @page_title
+
+  .row.row-cols-1.row-cols-lg-3.effective-posts
+    = render @posts
 
   %nav.d-flex.justify-content-center
     = bootstrap_paginate(@posts, per_page: EffectivePosts.per_page)

data/app/views/effective/posts/show.html.haml

@@ -1,12 +1,14 @@
 = render 'layout' do
   .effective-post
-    %h1.post-title= link_to @post, effective_post_path(@post)
-
-    %p.post-meta.text-muted
+    .effective-posts-meta.mb-2
       = post_meta(@post, author: false)
       = admin_post_status_badge(@post)
 
+    %h1.effective-post-title.mb-4= @page_title
+
     = render 'effective/posts/event', post: @post
 
-    .post-body.post-content
+    .effective-posts-body.mb-5
       = @post.body
+
+  = link_to("← #{posts_name_label}" .html_safe, effective_posts.posts_path, class: "btn btn-secondary my-4")

data/config/effective_posts.rb

@@ -41,6 +41,12 @@ EffectivePosts.setup do |config|
   # Display a file upload field when the admin creates a new post to collect a post.image
   config.use_active_storage = true
 
+  # Display the google search results description field on admin form
+  config.use_description = true
+
+  # Display the excerpt field on admin form
+  config.use_excerpt = true
+
   # Submissions
   # Allow users to submit posts (optionally for approval) to display on the website
   config.submissions_enabled = true

data/config/locales/effective_posts.en.yml

@@ -0,0 +1,7 @@
+en:
+  effective_posts:
+    name: 'Blog'
+
+  activerecord:
+    models:
+      effective/post: 'Post'

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '2.6.2'.freeze
+  VERSION = '2.7.1'.freeze
 end

data/lib/effective_posts.rb

@@ -10,7 +10,7 @@ module EffectivePosts
       :categories, :event_categories,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :use_category_routes, :use_blog_routes,
-      :use_effective_roles, :use_active_storage,
+      :use_effective_roles, :use_active_storage, :use_description, :use_excerpt,
       :per_page, :post_meta_author,
       :submissions_enabled, :submissions_require_current_user,
       :submissions_require_approval, :submissions_note

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,7 +196,6 @@ files:
 - app/views/effective/posts/_post.html.haml
 - app/views/effective/posts/_recent_posts.html.haml
 - app/views/effective/posts/_sidebar.html.haml
-- app/views/effective/posts/_spacer.html.haml
 - app/views/effective/posts/_upcoming_events.html.haml
 - app/views/effective/posts/edit.html.haml
 - app/views/effective/posts/index.html.haml
@@ -205,6 +204,7 @@ files:
 - app/views/effective/posts/submitted.html.haml
 - app/views/effective/posts_mailer/post_submitted.html.haml
 - config/effective_posts.rb
+- config/locales/effective_posts.en.yml
 - config/routes.rb
 - db/migrate/101_create_effective_posts.rb
 - lib/effective_posts.rb

data/app/views/effective/posts/_spacer.html.haml

@@ -1 +0,0 @@
-%hr