effective_posts 2.7.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b560ca6e8b647ccb668b7c91edf4689995e3c238a639d90f1f8d6c61eb5cab5f
-  data.tar.gz: 6b60247bb9072eec7b7f6fe9b7991db47b305a271d79c5baddbde15db295e462
+  metadata.gz: 7535e6aaa66d07e7184ca26b3d747f2d5991f43ed8a1f69a2d3c43252262d845
+  data.tar.gz: a12c21200c2c4c1ce0cc1405effb3041b744eb95f4b5fbd6ad94bf0ad3cef4b5
 SHA512:
-  metadata.gz: 28412a0ad8153586d93042bc83aaa0c4fd844158e95269a8d76a12927d1ec0de5306a7e0de0295e73f84444269c6b7029d0f2be8c9935310ed281211bcaaebed
-  data.tar.gz: 97014b04d38f48179037a237a6f284c785c10ff1f5c03eabdb7e3d64e861c99109bafd3ff0e8d290d6372b078e665869ab15de4a0a75a24a5a6d65f387f10328
+  metadata.gz: d3bc4dc919c8534c7e58db16e468ae8a73d7aec620e05821e443b190768643752cad76bd2eab3826e44e74a5d809b966104574c29c88dbeefd9da70400f8773d
+  data.tar.gz: 1a213e13af145cbc11344c9cc354381d2db2813eb4b64c10424e1330c144c252f4cba6303e3e030152e237d4bc9edc548a3be61e5f90af03ab8412244dd1d1da

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,8 +58,7 @@ 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
 

data/app/datatables/effective_posts_datatable.rb

@@ -26,8 +26,8 @@ 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
 

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
 

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
 

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

@@ -6,29 +6,15 @@
   - 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. 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.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."
-
-  - # 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
+  = acts_as_published_fields(f)
+  = acts_as_slugged_fields(f, url: (effective_posts.post_url(f.object) rescue nil))
 
   - if EffectivePosts.use_description
-    = f.text_field :description, input_html: { maxlength: 150 },
-      hint: "150 character summary. Appears on Google search results underneath the post title. Leave blank to use post title."
+    = 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)
@@ -37,14 +23,12 @@
       = 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/_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.presence || post.body
+  %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/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.7.0'.freeze
+  VERSION = '2.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-08-01 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