simple_discussion 0.9.4 → 1.3.0

data/app/jobs/simple_discussion/forum_post_notification_job.rb

@@ -8,7 +8,7 @@ class SimpleDiscussion::ForumPostNotificationJob < ApplicationJob
 
   def send_emails(forum_post)
     forum_thread = forum_post.forum_thread
-    users        = forum_thread.subscribed_users - [forum_post.user]
+    users = forum_thread.subscribed_users - [forum_post.user]
     users.each do |user|
       SimpleDiscussion::UserMailer.new_post(forum_post, user).deliver_later
     end
@@ -31,8 +31,8 @@ class SimpleDiscussion::ForumPostNotificationJob < ApplicationJob
         {
           title: "Posted By",
           value: forum_post.user.name,
-          short: true,
-        },
+          short: true
+        }
       ],
       ts: forum_post.created_at.to_i
     }

data/app/jobs/simple_discussion/forum_thread_notification_job.rb

@@ -29,8 +29,8 @@ class SimpleDiscussion::ForumThreadNotificationJob < ApplicationJob
         {
           title: "Posted By",
           value: forum_post.user.name,
-          short: true,
-        },
+          short: true
+        }
       ],
       ts: forum_post.created_at.to_i
     }

data/app/mailers/simple_discussion/user_mailer.rb

@@ -6,8 +6,8 @@ class SimpleDiscussion::UserMailer < ApplicationMailer
 
   def new_thread(forum_thread, recipient)
     @forum_thread = forum_thread
-    @forum_post   = forum_thread.forum_posts.first
-    @recipient    = recipient
+    @forum_post = forum_thread.forum_posts.first
+    @recipient = recipient
 
     mail(
       to: "#{@recipient.name} <#{@recipient.email}>",
@@ -16,9 +16,9 @@ class SimpleDiscussion::UserMailer < ApplicationMailer
   end
 
   def new_post(forum_post, recipient)
-    @forum_post   = forum_post
+    @forum_post = forum_post
     @forum_thread = forum_post.forum_thread
-    @recipient    = recipient
+    @recipient = recipient
 
     mail(
       to: "#{@recipient.name} <#{@recipient.email}>",

data/app/models/forum_category.rb

@@ -2,7 +2,7 @@ class ForumCategory < ApplicationRecord
   extend FriendlyId
   friendly_id :name, use: :slugged
 
-  scope :sorted, ->{ order(name: :asc) }
+  scope :sorted, -> { order(name: :asc) }
 
   validates :name, :slug, :color, presence: true
 

data/app/models/forum_post.rb

@@ -1,11 +1,10 @@
 class ForumPost < ApplicationRecord
   belongs_to :forum_thread, counter_cache: true, touch: true
   belongs_to :user
-  has_many :reactions, as: :reactable
 
   validates :user_id, :body, presence: true
 
-  scope :sorted, ->{ order(:created_at) }
+  scope :sorted, -> { order(:created_at) }
 
   after_update :solve_forum_thread, if: :solved?
 

data/app/models/forum_subscription.rb

@@ -2,11 +2,11 @@ class ForumSubscription < ApplicationRecord
   belongs_to :forum_thread
   belongs_to :user
 
-  scope :optin, ->{ where(subscription_type: :optin) }
-  scope :optout, ->{ where(subscription_type: :optout) }
+  scope :optin, -> { where(subscription_type: :optin) }
+  scope :optout, -> { where(subscription_type: :optout) }
 
-  validates :subscription_type, presence: true, inclusion: { in: %w{ optin optout } }
-  validates :user_id, uniqueness: { scope: :forum_thread_id }
+  validates :subscription_type, presence: true, inclusion: {in: %w[optin optout]}
+  validates :user_id, uniqueness: {scope: :forum_thread_id}
 
   def toggle!
     case subscription_type

data/app/models/forum_thread.rb

@@ -6,8 +6,8 @@ class ForumThread < ApplicationRecord
   belongs_to :user
   has_many :forum_posts
   has_many :forum_subscriptions
-  has_many :optin_subscribers,  ->{ where(forum_subscriptions: { subscription_type: :optin }) },  through: :forum_subscriptions, source: :user
-  has_many :optout_subscribers, ->{ where(forum_subscriptions: { subscription_type: :optout }) }, through: :forum_subscriptions, source: :user
+  has_many :optin_subscribers, -> { where(forum_subscriptions: {subscription_type: :optin}) }, through: :forum_subscriptions, source: :user
+  has_many :optout_subscribers, -> { where(forum_subscriptions: {subscription_type: :optout}) }, through: :forum_subscriptions, source: :user
   has_many :users, through: :forum_posts
 
   accepts_nested_attributes_for :forum_posts
@@ -16,11 +16,11 @@ class ForumThread < ApplicationRecord
   validates :user_id, :title, presence: true
   validates_associated :forum_posts
 
-  scope :pinned_first, ->{ order(pinned: :desc) }
-  scope :solved,       ->{ where(solved: true) }
-  scope :sorted,       ->{ order(updated_at: :desc) }
-  scope :unpinned,     ->{ where.not(pinned: true) }
-  scope :unsolved,     ->{ where.not(solved: true) }
+  scope :pinned_first, -> { order(pinned: :desc) }
+  scope :solved, -> { where(solved: true) }
+  scope :sorted, -> { order(updated_at: :desc) }
+  scope :unpinned, -> { where.not(pinned: true) }
+  scope :unsolved, -> { where.not(solved: true) }
 
   def subscribed_users
     (users + optin_subscribers).uniq - optout_subscribers
@@ -56,20 +56,20 @@ class ForumThread < ApplicationRecord
   end
 
   def subscribed_reason(user)
-    return "You’re not receiving notifications from this thread." if user.nil?
+    return I18n.t(".not_receiving_notifications") if user.nil?
 
     subscription = subscription_for(user)
 
     if subscription.present?
       if subscription.subscription_type == "optout"
-        "You're ignoring this thread."
+        I18n.t(".ignoring_thread")
       elsif subscription.subscription_type == "optin"
-        "You're receiving notifications because you've subscribed to this thread."
+        I18n.t(".receiving_notifications_because_subscribed")
       end
     elsif forum_posts.where(user_id: user.id).any?
-      "You're receiving notifications because you've posted in this thread."
+      I18n.t(".receiving_notifications_because_posted")
     else
-      "You're not receiving notifications from this thread."
+      I18n.t(".not_receiving_notifications")
     end
   end
 

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

@@ -1,30 +1,68 @@
-<div class="row">
-  <div class="col-sm-3">
+<div class="row col-md-12">
+  <h1>
+    <%= t('community') %>
+  </h1>
+</div>
+
+<div class="row simple_discussion">
+  <div class="col-md-3 mb-3">
 
-    <div class="card card-block">
-      <%= link_to 'Ask A Question', simple_discussion.new_forum_thread_path, class: "btn btn-outline-primary btn-block" %>
+    <div class="card card-body">
+      <%= link_to t('ask_a_question'), simple_discussion.new_forum_thread_path, class: "btn btn-outline-primary btn-block" %>
       <hr />
 
       <div class="forum-thread-filters">
-        <h5><strong>Filters</strong></h5>
-        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "bars" %> All Threads <% end %></div>
+        <h5>
+          <strong>
+            <%= t('filters') %>
+          </strong>
+        </h5>
+        <div>
+          <%= forum_link_to simple_discussion.forum_threads_path, exact: true do %>
+            <%= icon "fa-fw fas", "bars" %>
+            <%= t('.all_threads') %>
+          <% end %>
+        </div>
         <% if user_signed_in? %>
-          <div><%= forum_link_to simple_discussion.mine_forum_threads_path do %><%= icon "user-circle-o" %> My Questions<% end %></div>
-          <div><%= forum_link_to simple_discussion.participating_forum_threads_path do %><%= icon "comments-o" %> Participating<% end %></div>
+          <div>
+            <%= forum_link_to simple_discussion.mine_forum_threads_path do %><%= icon "fa-fw far", "user-circle" %>
+              <%= t('.my_questions') %>
+            <% end %>
+          </div>
+          <div>
+            <%= forum_link_to simple_discussion.participating_forum_threads_path do %>
+              <%= icon "fa-fw far", "comments" %>
+              <%= t('.participating') %>
+            <% end %>
+          </div>
         <% end %>
-        <div><%= forum_link_to simple_discussion.answered_forum_threads_path do %><%= icon "check" %> Answered<% end %></div>
-        <div><%= forum_link_to simple_discussion.unanswered_forum_threads_path do %><%= icon "question" %> Unanswered<% end %></div>
+        <div>
+          <%= forum_link_to simple_discussion.answered_forum_threads_path do %>
+            <%= icon "fa-fw fas", "check" %>
+            <%= t('.answered') %>
+          <% end %>
+        </div>
+        <div>
+          <%= forum_link_to simple_discussion.unanswered_forum_threads_path do %>
+            <%= icon "fa-fw fas", "question" %>
+            <%= t('.unanswered') %>
+          <% end %>
+        </div>
       </div>
 
       <hr />
 
       <div class="forum-thread-filters">
-        <p><strong>By Category</strong></p>
-        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "circle" %> All<% end %></div>
+        <h6>
+          <strong>
+            <%= t('.by_category') %>
+          </strong>
+        </h6>
+        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "fa-fw fas", "circle" %> All<% end %></div>
         <% ForumCategory.sorted.each do |category| %>
           <div>
             <%= forum_link_to simple_discussion.forum_category_forum_threads_path(category) do %>
-              <%= icon "circle", style: "color: #{category.color}" %>
+              <%= icon "fa-fw fas", "circle", style: "color: #{category.color}" %>
               <%= category.name %>
             <% end %>
           </div>
@@ -35,13 +73,14 @@
         <hr />
 
         <%# User has not posted in the thread or subscribed %>
-        <h5>Notifications</h5>
+        <h5><%= t('.notifications') %></h5>
 
         <%= link_to simple_discussion.forum_thread_notifications_path(@forum_thread), method: :post, class: "btn btn-secondary btn-sm btn-block mb-2" do %>
           <% if @forum_thread.subscribed? current_user %>
-            <%= icon "bell-slash" %> Unsubscribe
+            <%= icon "fa-fw fas", "bell-slash" %> <%= t('.unsubscribe') %>
           <% else %>
-            <%= icon "bell" %> Subscribe
+            <%= icon "fa-fw fas", "bell" %>
+            <%= t('.suscribe') %>
           <% end %>
         <% end %>
 
@@ -51,8 +90,12 @@
 
   </div>
 
-  <div class="col">
-    <%= yield %>
+  <div class="col-md-9 mb-3">
+
+    <div class="card card-body">
+      <%= yield %>
+    </div>
+
   </div>
 </div>
 

data/app/views/simple_discussion/forum_posts/_form.html.erb

@@ -15,7 +15,7 @@
   <% end %>
 
   <div class="form-group">
-    <%= f.text_area :body, placeholder: "Add a comment", rows: 8, class: "form-control simplemde", data: { behavior: "comment-body" } %>
+    <%= f.text_area :body, placeholder: t('add_a_comment'), rows: 8, class: "form-control simplemde", data: { behavior: "comment-body" } %>
   </div>
 
   <div class="text-right">
@@ -26,7 +26,7 @@
       </small>
     </div>
 
-    <%= f.button "#{"Update" unless f.object.new_record?} Comment", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving comment..."} %>
+    <%= f.button "#{f.object.new_record? ? t('comment') : t('update_comment')  }", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving_comment')}"} %>
   </div>
 
 <% end %>

data/app/views/simple_discussion/forum_posts/_forum_post.html.erb

@@ -4,11 +4,18 @@
   <div class="card-header">
 
     <% if is_moderator_or_owner?(forum_post) %>
-      <div class="pull-right">
-        <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_forum_post_path(@forum_thread, forum_post),
+      <div class="float-right">
+        <%= link_to icon("fas","edit"), simple_discussion.edit_forum_thread_forum_post_path(@forum_thread, forum_post),
           class: "text-muted",
           data: { toggle: "tooltip", placement: "left" },
-          title: "Edit this post"
+          title: t('edit_this_post')
+        %>
+        &nbsp;
+        <%= link_to icon("fas","trash"), simple_discussion.forum_thread_forum_post_path(@forum_thread, forum_post),
+          class: "text-muted",
+          method: :delete, 
+          data: { toggle: "tooltip", placement: "left", confirm: "Are you sure you want to delete this post?" },
+          title: t('delete_this_post')
         %>
       </div>
     <% end %>
@@ -20,24 +27,24 @@
         <%= forum_post.user.name %> <%= forum_user_badge(forum_post.user) %>
       </strong>
       <small>
-        commented on
+        <%= t('commented_on') %>
         <%= link_to forum_post.created_at.strftime("%b %d, %Y"), simple_discussion.forum_thread_path(@forum_thread, anchor: "forum_post_#{forum_post.id}") %>:
       </small>
     </div>
   </div>
 
-  <div class="card-block">
+  <div class="card-body">
     <%= formatted_content forum_post.body %>
   </div>
 
   <% if @forum_thread.solved? && forum_post.solved? %>
     <div class="card-footer">
       <div class="pull-right">
-        <strong class="text-success"><%= icon("check") %> Solved</strong>
+        <strong class="text-success"><%= icon("fas","check") %> <%= t('solved') %></strong>
 
         <% if is_moderator_or_owner?(@forum_thread) %>
           <small>
-            <%= link_to "Undo", simple_discussion.unsolved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put %>
+            <%= link_to t('undo'), simple_discussion.unsolved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put %>
           </small>
         <% end %>
       </div>
@@ -48,8 +55,8 @@
       <div class="pull-right">
         <small>
           <%= link_to simple_discussion.solved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put do %>
-            <%= icon("check") %>
-            This solved my question
+            <%= icon("fas","fas","check") %>
+            <%= t('this_solved_my_question') %>
           <% end %>
         </small>
       </div>

data/app/views/simple_discussion/forum_posts/edit.html.erb

@@ -4,7 +4,8 @@
 
 <p class="thread-details">
   <strong><%= category_link(@forum_thread.forum_category) %></strong>
-  • Asked <%= time_ago_in_words @forum_thread.created_at %> by <%= @forum_thread.user.name %>
+  • <%= t('asked_time_ago', time: time_ago_in_words(@forum_thread.created_at), author: @forum_thread.user.name) %>
+</p>
 </p>
 
 <br />
@@ -14,11 +15,14 @@
     <div>
       <%= avatar_tag(@forum_post.user.email) %>
       <strong class="forum-post-user"><%= @forum_post.user.name %></strong>
-      <small> commented on <%= link_to @forum_post.created_at.strftime("%b %d, %Y"), simple_discussion.forum_thread_url(@forum_thread, anchor: "forum_post_#{@forum_post.id}") %>:</small>
+      <small>
+        <%= t('commented_on')%>
+        <%= link_to @forum_post.created_at.strftime("%b %d, %Y"), simple_discussion.forum_thread_url(@forum_thread, anchor: "forum_post_#{@forum_post.id}") %>:
+      </small>
     </div>
   </div>
 
-  <div class="card-block">
+  <div class="card-body">
     <%= render "form" %>
   </div>
 <% end %>

data/app/views/simple_discussion/forum_threads/_form.html.erb

@@ -15,29 +15,29 @@
   <% end %>
 
   <div class="form-group">
-    <%= f.label :forum_category_id, "Choose a Category" %>
-    <%= f.collection_select :forum_category_id, ForumCategory.sorted, :id, :name, {include_blank: "Pick a category..."}, {autofocus: true, class: "form-control"} %>
+    <%= f.label :forum_category_id, t('choose_a_category') %>
+    <%= f.collection_select :forum_category_id, ForumCategory.sorted, :id, :name, {include_blank: t('pick_a_category')}, {autofocus: true, class: "form-control"} %>
   </div>
 
   <div class="form-group">
-    <%= f.label :title %>
-    <%= f.text_field :title, placeholder: "How do I...?", class: "form-control" %>
+    <%= f.label t('title') %>
+    <%= f.text_field :title, placeholder: t('how_do_i'), class: "form-control" %>
   </div>
 
   <% if local_assigns.fetch(:posts, true) %>
     <%= f.fields_for :forum_posts do |p| %>
       <div class="form-group">
-        <%= p.label :body, "What do you need help with?" %>
-        <%= p.text_area :body, placeholder: "Add a comment", rows: 10, class: "form-control simplemde", data: { behavior: "comment-body" } %>
+        <%= p.label :body, t('what_help_needed') %>
+        <%= p.text_area :body, placeholder: t('add_a_comment'), rows: 10, class: "form-control simplemde", data: { behavior: "comment-body" } %>
       </div>
     <% end %>
   <% end %>
 
   <div class="form-group text-right">
     <% if f.object.new_record? %>
-      <%= f.button "Ask Your Question", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving..."} %>
+      <%= f.button t('ask_your_question'), class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving')}"} %>
     <% else %>
-      <%= f.button "Update Thread", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Saving..."} %>
+      <%= f.button "Update Thread", class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving')}"} %>
     <% end %>
   </div>
 

data/app/views/simple_discussion/forum_threads/_forum_thread.html.erb

@@ -9,26 +9,26 @@
       <div class="col">
         <h4>
           <% if forum_thread.solved? %>
-            <span class="text-success"><%= icon "check-circle" %></span>
+            <span class="text-success"><%= icon "fas", "check-circle" %></span>
           <% end %>
 
           <%= link_to simple_discussion.forum_thread_path(forum_thread) do %>
-            <%= icon "thumb-tack", class: "text-muted" if forum_thread.pinned? %> <%= forum_thread.title %>
+            <%= icon "fas", "thumb-tack", class: "text-muted" if forum_thread.pinned? %> <%= forum_thread.title %>
           <% end %>
         </h4>
 
         <div class="thread-details">
           <strong><%= category_link(forum_thread.forum_category) %></strong>
-          • Asked <%= time_ago_in_words forum_thread.created_at %> by <%= forum_thread.user.name %>
+          • <%= t('asked_time_ago', time: time_ago_in_words(forum_thread.created_at), author: forum_thread.user.name) %>
         </div>
 
         <p class="text-muted"><%= truncate(forum_thread.forum_posts.first.body, length: 200) %></p>
       </div>
 
-      <div class="col-sm-1 text-center">
+      <div class="col-sm-2 text-center">
         <%= link_to simple_discussion.forum_thread_path(forum_thread), class: "thread-posts-count" do %>
           <span class="count"><%= forum_thread.forum_posts_count %></span>
-          <small><%= "post".pluralize(forum_thread.forum_posts_count) %></small>
+          <small><%= t("post", count: forum_thread.forum_posts_count) %></small>
         <% end %>
       </div>
 

data/app/views/simple_discussion/forum_threads/edit.html.erb

@@ -1,6 +1,6 @@
 <%= content_for :title, "Edit Thread" %>
 
-<h1>Edit Thread</h1>
+<h1><%= t('edit_thread') %></h1>
 
 <div class="forum_post">
   <%= render 'form', posts: false %>