0
@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
0
     end
0
     
0
     assigns.update 'site' => site.to_liquid
0
+  logger.warn "ASSIGNS: #{assigns.inspect}"
0
     render :text => site.templates.render_liquid_for(template_type, assigns, self)
0
   end
0
   

0
@@ -23,17 +23,16 @@ class CommentsController < ApplicationController
0
         :comment_content      => @comment.body
0
       logger.info "Checking Akismet (#{Akismet.api_key}) for new comment on Article #{@article.id}.  #{@comment.approved ? 'Approved' : 'Blocked'}"
0
     end
0
-    @comment.save
0
+
0
+    assigns = @comment.save ?
0
+      { 'message'  => 'Thank you for comment.  Your comment requires approval from the blog author before showing up.' } :
0
+      { 'errors'   => @comment.errors.full_messages }
0
+
0
+    @comments = @article.comments.reject(&:new_record?).collect(&:to_liquid)
0
+    @article  = @article.to_liquid(:single)
0
+    render_liquid_template_for(:single, assigns.merge('articles' => [@article], 
0
+                                        'article'  => @article, 
0
+                                        'comments' => @comments))
0
     
0
-    if @comment.new_record?
0
-      @comments = @article.comments.reject(&:new_record?).collect(&:to_liquid)
0
-      @article  = @article.to_liquid(:single)
0
-      render_liquid_template_for(:single, 'articles' => [@article], 
0
-                                          'article'  => @article, 
0
-                                          'comments' => @comments, 
0
-                                          'errors'   => @comment.errors.full_messages)
0
-    else
0
-      redirect_to article_url(@article.hash_for_permalink(:anchor => "comment_#{@comment.id}"))
0
-    end
0
   end
0
 end

0
@@ -6,17 +6,21 @@ module Mephisto
0
       def render(context)
0
         result = []
0
         context.stack do
0
-          errors = context['errors'] ? %Q{<ul id="comment_errors"><li>#{context['errors'].join('</li><li>')}</li></ul>} : ''
0
-        
0
-          context['form'] = {
0
-            'body'   => %(<textarea id="comment_body" name="comment[body]"></textarea>),
0
-            'name'   => %(<input type="text" id="comment_author" name="comment[author]" />),
0
-            'email'  => %(<input type="text" id="comment_author_email" name="comment[author_email]" />),
0
-            'url'    => %(<input type="text" id="comment_author_url" name="comment[author_url]" />),
0
-            'submit' => %(<input type="submit" value="Send" />)
0
-          }
0
-
0
-          result << %(<form method="post" action="#{context['article']['url']}/comment">#{[errors]+render_all(@nodelist, context)}</form>)
0
+          if context['message'].blank? 
0
+            errors = context['errors'].blank? ? '' : %Q{<ul id="comment_errors"><li>#{context['errors'].join('</li><li>')}</li></ul>}
0
+            
0
+            context['form'] = {
0
+              'body'   => %(<textarea id="comment_body" name="comment[body]"></textarea>),
0
+              'name'   => %(<input type="text" id="comment_author" name="comment[author]" />),
0
+              'email'  => %(<input type="text" id="comment_author_email" name="comment[author_email]" />),
0
+              'url'    => %(<input type="text" id="comment_author_url" name="comment[author_url]" />),
0
+              'submit' => %(<input type="submit" value="Send" />)
0
+            }
0
+            
0
+            result << %(<form method="post" action="#{context['article']['url']}/comment">#{[errors]+render_all(@nodelist, context)}</form>)
0
+          else
0
+            result << %(<p id="comment-message">#{context['message']}</p>)
0
+          end
0
         end
0
         result
0
       end