commontator 0.5.12 → 0.5.13

data/app/assets/stylesheets/commontator/comments.css

@@ -15,6 +15,8 @@
   color: #000;
   border-color: #ddd;
   background-color: #fff;
+  
+  clear: both;
 }
 
 .comment_actions {

data/app/assets/stylesheets/commontator/comments.css~

@@ -35,7 +35,7 @@
   padding: 8px;
 }
 
-.comment_profile_picture img {
+.comment_gravatar_image img {
   margin-top: 5px;
 }
 

data/app/assets/stylesheets/commontator/threads.css

@@ -1,3 +1,7 @@
+.thread {
+  display: block !important;
+}
+
 .thread_actions {
   float: right;
 }

data/app/assets/stylesheets/commontator/threads.css~

@@ -0,0 +1,21 @@
+.thread {
+  display: block;
+}
+
+.thread_actions {
+  float: right;
+}
+
+.thread_header {
+  font-size: 16px;
+  font-weight: bold;
+  font-style: normal;
+}
+
+.thread_new_comment {
+  display: none;
+}
+
+.thread_new_comment textarea {
+	width: 100%;
+}

data/app/controllers/commontator/threads_controller.rb

@@ -22,6 +22,7 @@ module Commontator
 
       respond_to do |format|
         format.html { redirect_to @thread }
+        format.js { render :show }
       end
     end
     
@@ -33,6 +34,7 @@ module Commontator
 
       respond_to do |format|
         format.html { redirect_to @thread }
+        format.js { render :show }
       end
     end
   end

data/app/controllers/commontator/threads_controller.rb~

@@ -5,7 +5,7 @@ module Commontator
 
     # GET /threads/1
     def show
-      commontator_thread_show(@thread.commontable, @user)
+      commontator_thread_show(@thread.commontable)
 
       respond_to do |format|
         format.html { redirect_to @commontable_url }
@@ -22,6 +22,7 @@ module Commontator
 
       respond_to do |format|
         format.html { redirect_to @thread }
+        format.js { render :show }
       end
     end
     

data/app/views/commontator/comments/_show.html.erb

@@ -3,7 +3,7 @@
    # user
 %>
   
-<div id="comment_<%= comment.id.to_s %>_div" class="comment" style="clear:both">                 
+<div id="comment_<%= comment.id.to_s %>_div" class="comment">
   <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
     <% if !user.nil? && user.commontator_config.user_name_clickable %>
       <%= link_to commontator_name(comment.creator), main_app.polymorphic_path(comment.creator) %>

data/app/views/commontator/comments/_show.html.erb~

@@ -24,7 +24,7 @@
   
   <br clear="all"/>
   
-  <span id="comment_<%= comment.id.to_s %>_gravatar_image_span" class="comment_profile_picture">
+  <span id="comment_<%= comment.id.to_s %>_gravatar_image_span" class="comment_gravatar_image">
     <%= commontator_gravatar_image comment.creator %>
   </span>
   

data/app/views/commontator/shared/_thread.html.erb

@@ -6,7 +6,7 @@
 <% if thread.can_be_read_by?(user) %>
   <%= stylesheet_link_tag "commontator/application", :media => "all" %>
 
-  <div id="thread_<%= thread.id %>_div" class="thread">
+  <div id="thread_<%= thread.id %>_div" class="thread" style="display: none;">
     <% if @commontator_thread_show %>
       <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread,
                                                                      :user => user} %>

data/app/views/commontator/shared/_thread.html.erb~

@@ -8,7 +8,8 @@
 
   <div id="thread_<%= thread.id %>_div" class="thread">
     <% if @commontator_thread_show %>
-      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread} %>
+      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread,
+                                                                     :user => user} %>
     <% else %>
       <%= link_to "Show #{thread.config.comment_name.pluralize} (#{thread.comments.count})", commontator.thread_path(thread), :remote => true %>
     <% end %>

data/app/views/commontator/threads/_show.html.erb

@@ -30,7 +30,8 @@
                               'Are you sure you want to close this thread?' : nil),
                 :method => :put,
                 :id => "thread_#{thread.id.to_s}_#{close_string}_link",
-                :class => "thread_#{close_string}_link" %>
+                :class => "thread_#{close_string}_link",
+                :remote => true %>
   <% end %>
 </span>
 

data/app/views/commontator/threads/_show.html.erb~

@@ -7,7 +7,7 @@
 <% can_edit = thread.can_be_edited_by?(user) %>
 
 <span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
-  <%= thread.config.comment_name.capitalize.pluralize %>
+  <%= thread.config.comment_name.capitalize.pluralize + (thread.is_closed? ? ' (closed)' : '') %>
 </span>
 
 <span id="thread_<%= thread.id.to_s %>_actions_span" class="thread_actions">

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.5.12"
+  VERSION = "0.5.13"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.5.11"
+  VERSION = "0.5.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -70,6 +70,7 @@ files:
 - app/assets/stylesheets/commontator/comments.css
 - app/assets/stylesheets/commontator/comments.css~
 - app/assets/stylesheets/commontator/threads.css
+- app/assets/stylesheets/commontator/threads.css~
 - app/assets/images/commontator/upvote.png
 - app/assets/images/commontator/downvote_hover.png
 - app/assets/images/commontator/upvote_hover.png