simple_discussion 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834ccd97ab1cd0bbbe2aeade6fd0ca57dbbb9239
-  data.tar.gz: cdba66f70c1574b9cfca22c31d97f8004994ffd8
+  metadata.gz: a3254bbe940b1d74626469b008b0189eff8b48e6
+  data.tar.gz: 15d14fde5ff8912b9f70c207dd42a80f66305776
 SHA512:
-  metadata.gz: 2efe0ca3c21542774ee8398cfaec7c5e3c03674c0976c42146769bc1762237f8d2d70dbd9700f25f6d11663665b8423e15903e2e4ef8a6d87b9fb75495514f4d
-  data.tar.gz: 0bd0377abdf023db1527498d353d819d30de644f19ff909cc6b3e74d774aa53119418f0677fd77cf64c13b83e817060b398511a13143dbeda7c9d74258405924
+  metadata.gz: 4df44f369de7e7aced89967bc5cf9d4aba9cbcd1f02cf301c0c3a2238f43d21897153741e78e0db60c22b82410824e6d9b225d03ba803d5495479a7f972c0ed9
+  data.tar.gz: 716f93eb02108af2ba09ad8a98fe5ab7885cb4f931d73db438eddf357be886d3c64120fa0e7ef68b07e2777e67805f49fd27ebed389cbbbeab499fce7208faf1

data/app/assets/stylesheets/simple_discussion.scss

@@ -20,8 +20,28 @@
 
 /* Formatting for the forum threads */
 .forum-thread {
-  h4 a {
-    color: #222;
+  margin-bottom: -20px;
+
+  h4 {
+    margin-bottom: 4px;
+
+    a {
+      color: #222;
+      font-size: 16px;
+      font-weight: normal;
+      line-height: 1.1;
+    }
+  }
+}
+
+.forum-thread-filters a {
+  color: #555555;
+  display: block;
+
+  &:hover {
+    color: #222222;
+    font-weight: bold;
+    text-decoration: none
   }
 }
 
@@ -45,6 +65,11 @@
     font-weight: 300;
     line-height: 1em;
   }
+
+  &:hover {
+    color: #222;
+    text-decoration: none;
+  }
 }
 
 /* Formatting for the forum posts themselves */
@@ -64,3 +89,16 @@
     border: 2px solid #5cb85c;
   }
 }
+
+/* Formatting for the forum hr to match card border */
+.simple_discussion hr {
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  margin: 24px -20px;
+}
+
+.simple_discussion .text-muted {
+  color: #999;
+  margin-top: 6px;
+  font-size: 13px;
+}

data/app/controllers/simple_discussion/application_controller.rb

@@ -17,9 +17,21 @@ class SimpleDiscussion::ApplicationController < ::ApplicationController
   end
   helper_method :is_moderator?
 
-  def require_moderator_or_author!
+  def require_mod_or_author_for_post!
+    unless is_moderator_or_owner?(@forum_post)
+      redirect_to_root
+    end
+  end
+
+  def require_mod_or_author_for_thread!
     unless is_moderator_or_owner?(@forum_thread)
-      redirect_to simple_discussion.root_path, alert: "You aren't allowed to do that."
+      redirect_to_root
     end
   end
+
+  private
+
+  def redirect_to_root
+    redirect_to simple_discussion.root_path, alert: "You aren't allowed to do that."
+  end
 end

data/app/controllers/simple_discussion/forum_posts_controller.rb

@@ -2,7 +2,8 @@ class SimpleDiscussion::ForumPostsController < SimpleDiscussion::ApplicationCont
   before_action :authenticate_user!
   before_action :set_forum_thread
   before_action :set_forum_post, only: [:edit, :update]
-  before_action :require_moderator_or_author!, only: [:edit, :update, :solved, :unsolved]
+  before_action :require_mod_or_author_for_post!, only: [:edit, :update]
+  before_action :require_mod_or_author_for_thread!, only: [:solved, :unsolved]
 
   def create
     @forum_post = @forum_thread.forum_posts.new(forum_post_params)

data/app/controllers/simple_discussion/forum_threads_controller.rb

@@ -1,7 +1,7 @@
 class SimpleDiscussion::ForumThreadsController < SimpleDiscussion::ApplicationController
   before_action :authenticate_user!, only: [:mine, :participating, :new, :create]
   before_action :set_forum_thread, only: [:show, :edit, :update]
-  before_action :require_moderator_or_author!, only: [:edit, :update]
+  before_action :require_mod_or_author_for_thread!, only: [:edit, :update]
 
   def index
     @forum_threads = ForumThread.pinned_first.sorted.includes(:user, :forum_category).paginate(page: page_number)

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

@@ -1,7 +1,11 @@
-<div class="row">
-  <div class="col-sm-3">
+<div class="row col-md-12">
+  <h1>Community</h1>
+</div>
+
+<div class="row simple_discussion">
+  <div class="col-md-3 mb-3">
 
-    <div class="card card-block">
+    <div class="card card-body">
       <%= link_to 'Ask A Question', simple_discussion.new_forum_thread_path, class: "btn btn-outline-primary btn-block" %>
       <hr />
 
@@ -19,7 +23,7 @@
       <hr />
 
       <div class="forum-thread-filters">
-        <p><strong>By Category</strong></p>
+        <h6><strong>By Category</strong></h6>
         <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "circle" %> All<% end %></div>
         <% ForumCategory.sorted.each do |category| %>
           <div>
@@ -51,8 +55,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/_forum_post.html.erb

@@ -26,7 +26,7 @@
     </div>
   </div>
 
-  <div class="card-block">
+  <div class="card-body">
     <%= formatted_content forum_post.body %>
   </div>
 

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

@@ -4,7 +4,7 @@
 
 <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 %>
+  • Asked <%= time_ago_in_words(@forum_thread.created_at) + ' ago' %> by <%= @forum_thread.user.name %>
 </p>
 
 <br />
@@ -18,7 +18,7 @@
     </div>
   </div>
 
-  <div class="card-block">
+  <div class="card-body">
     <%= render "form" %>
   </div>
 <% end %>

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

@@ -19,7 +19,7 @@
 
         <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 %>
+          • Asked <%= time_ago_in_words(forum_thread.created_at) + ' ago' %> by <%= forum_thread.user.name %>
         </div>
 
         <p class="text-muted"><%= truncate(forum_thread.forum_posts.first.body, length: 200) %></p>

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

@@ -1,11 +1,13 @@
-<div class="card card-block mb-3">
-  <%= render partial: "simple_discussion/forum_threads/forum_thread", collection: @forum_threads, spacer_template: "shared/spacer" %>
+<% if @forum_threads.none? %>
 
-  <% if @forum_threads.none? %>
     <div>No results found for your search. Check out <%= link_to "the latest questions", simple_discussion.forum_threads_path %> instead?</div>
-  <% end %>
-</div>
 
-<div class="forum-threads-nav text-center">
-  <%= will_paginate @forum_threads, url_builder: simple_discussion, renderer: SimpleDiscussion::BootstrapLinkRenderer %>
-</div>
+<% else %>
+
+    <%= render partial: "simple_discussion/forum_threads/forum_thread", collection: @forum_threads, spacer_template: "shared/spacer" %>
+
+  <div class="forum-threads-nav text-center">
+    <%= will_paginate @forum_threads, url_builder: simple_discussion, renderer: SimpleDiscussion::BootstrapLinkRenderer %>
+  </div>
+
+<% end %>

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

@@ -1,17 +1,22 @@
-<h1><%= icon "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h1>
-
-<% if is_moderator_or_owner?(@forum_thread) %>
-  <div class="pull-right">
-    <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_path(@forum_thread),
-      class: "text-muted",
-      data: { toggle: "tooltip", placement: "left" },
-      title: "Edit this thread" %>
+<div class="row">
+  <div class="col-md-11">
+    <h1><%= icon "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h1>
   </div>
-<% end %>
+
+  <% if is_moderator_or_owner?(@forum_thread) %>
+    <div class="col-md-1">
+      <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_path(@forum_thread),
+        class: "text-muted",
+        data: { toggle: "tooltip", placement: "left" },
+        title: "Edit this thread" %>
+    </div>
+  <% end %>
+
+</div>
 
 <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 %>
+  • Asked <%= time_ago_in_words(@forum_thread.created_at) + ' ago' %> by <%= @forum_thread.user.name %>
 </p>
 
 <%= render partial: "simple_discussion/forum_posts/forum_post", collection: @forum_thread.forum_posts.includes(:user).sorted %>

data/lib/simple_discussion/version.rb

@@ -1,3 +1,3 @@
 module SimpleDiscussion
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_discussion
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple, extensible Rails forum