commontator 1.0.4 → 1.0.5

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

@@ -23,12 +23,6 @@
   float: right;
 }
 
-.comment_body p {
-	margin: 0px;
-	
-	overflow: hidden;
-}
-
 .comment_body {
   margin-left: 55px;
   margin-top: -60px;
@@ -37,6 +31,20 @@
   padding: 8px;
 }
 
+.comment_body p {
+	margin: 0px;
+	
+	overflow: hidden;
+}
+
+.comment_body textarea {
+	width: 100%;
+}
+
+.comment_form_actions {
+  margin-top: 10px;
+}
+
 .comment_gravatar_image img {
   margin-top: 5px;
 }

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

@@ -23,12 +23,6 @@
   float: right;
 }
 
-.comment_body p {
-	margin: 0px;
-	
-	overflow: hidden;
-}
-
 .comment_body {
   margin-left: 55px;
   margin-top: -60px;
@@ -37,6 +31,16 @@
   padding: 8px;
 }
 
+.comment_body p {
+	margin: 0px;
+	
+	overflow: hidden;
+}
+
+.comment_body textarea {
+	width: 100%;
+}
+
 .comment_gravatar_image img {
   margin-top: 5px;
 }
@@ -59,6 +63,6 @@
   margin: 0px;
 }
 
-.comment_count p {
+.comment_vote_count p {
   margin: 0px;
 }

data/app/controllers/commontator/comments_controller.rb

@@ -27,17 +27,17 @@ module Commontator
       
       raise SecurityTransgression unless @comment.can_be_created_by?(@user)
       
-      if @comment.save
-        @thread.subscribe(@user) if @thread.config.auto_subscribe_on_comment
-        @thread.add_unread_except_for(@user)
-        SubscriptionsMailer.comment_created_email(@comment, @commontable_url)
-      else
-        @errors = @comment.errors
-      end
-
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        if @comment.save
+          @thread.subscribe(@user) if @thread.config.auto_subscribe_on_comment
+          @thread.add_unread_except_for(@user)
+          SubscriptionsMailer.comment_created_email(@comment, @commontable_url)
+          format.html { redirect_to @thread }
+          format.js
+        else
+          format.html { redirect_to @thread }
+          format.js { render :new }
+        end
       end
     end
 
@@ -55,11 +55,14 @@ module Commontator
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
 
-      @comment.update_attributes(params[:comment])
-
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        if @comment.update_attributes(params[:comment])
+          format.html { redirect_to @thread }
+          format.js
+        else
+          format.html { redirect_to @thread }
+          format.js { render :edit }
+        end
       end
     end
 

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

@@ -27,17 +27,17 @@ module Commontator
       
       raise SecurityTransgression unless @comment.can_be_created_by?(@user)
       
-      if @comment.save
-        @thread.subscribe(@user) if @thread.config.auto_subscribe_on_comment
-        @thread.add_unread_except_for(@user)
-        SubscriptionsMailer.comment_created_email(@comment, @commontable_url)
-      else
-        @errors = @comment.errors
-      end
-
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        if @comment.save
+          @thread.subscribe(@user) if @thread.config.auto_subscribe_on_comment
+          @thread.add_unread_except_for(@user)
+          SubscriptionsMailer.comment_created_email(@comment, @commontable_url)
+          format.html { redirect_to @thread }
+          format.js
+        else
+          format.html { redirect_to @thread }
+          format.js { render :new }
+        end
       end
     end
 
@@ -55,11 +55,13 @@ module Commontator
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
 
-      @comment.update_attributes(params[:comment])
-
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        if @comment.update_attributes(params[:comment])
+          format.html { redirect_to @thread }
+          format.js
+        else
+          format.html { render action: "edit" }
+        end
       end
     end
 
@@ -81,7 +83,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
       @comment.errors.add(:base, 'This comment is not deleted.') \
-        unless @comment.undelete(@user)
+        unless @comment.undelete
 
       respond_to do |format|
         format.html { redirect_to @thread }

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

@@ -8,18 +8,31 @@
 
 <% config = comment.thread.config %>
 
+<% if comment.errors.any? %>
+  <div class="comment_error_explanation">
+    <h3>This <%= config.comment_name %> could not be
+          <%= comment.id.blank? ? config.comment_create_verb_past : 'updated' %> because of the following error<%= comment.errors.count == 1 ? '' : 's' %>:</h3>
+
+    <ul>
+      <% comment.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
 <%= form_for([commontator, thread, comment],
              :remote => !no_remote) do |f| %>
-             
-  <p>
+  
+  <div class="comment_form_field">
     <%= f.text_area :body, :rows => '7' %>
-  </p>
+  </div>
   
-  <p>
+  <div class="comment_form_actions">
     <%= f.submit (comment.id.blank? ? \
                    config.comment_create_verb_present : \
                    'update').capitalize + \
           ' ' + config.comment_name %>
-  </p>
+  </div>
   
 <% end %>

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

@@ -8,17 +8,29 @@
 
 <% config = comment.thread.config %>
 
+<% if comment.errors.any? %>
+  <div class="comment_error_explanation">
+    <h3>This <%= config.comment_name %> could not be
+          <%= comment.id.blank? ? config.comment_create_verb_past : 'updated' %> because of the following error<%= comment.errors.count == 1 ? '' : 's' %>:</h3>
+
+    <ul>
+      <% comment.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
 <%= form_for([commontator, thread, comment],
              :remote => !no_remote) do |f| %>
-             
-  <p>
-    <%= f.text_area :body, :rows => '7' %>
-  </p>
+  
+  <%= f.text_area :body, :rows => '7' %>
   
   <p>
     <%= f.submit (comment.id.blank? ? \
                    config.comment_create_verb_present : \
-                   'update').capitalize + ' ' + config.comment_name %>
+                   'update').capitalize + \
+          ' ' + config.comment_name %>
   </p>
   
 <% end %>

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails