From 8c01bcece45b0c132c595e5940ebcacc52fafaad Mon Sep 17 00:00:00 2001
From: Simon Hambly <simon.hambly@unclouded.co.uk>
Date: Sun, 20 Feb 2011 22:11:45 +0000
Subject: tidy up views, removing reference to comments when comments disable

---
 app/views/admin/blog/_submenu.html.erb | 49 +++++++++++++++++-----------------
 app/views/blog/posts/show.html.erb     |  1 -
 app/views/blog/shared/_post.html.erb   | 10 ++++---
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/views/admin/blog/_submenu.html.erb b/app/views/admin/blog/_submenu.html.erb
index e5343e1..f7b95dd 100644
--- a/app/views/admin/blog/_submenu.html.erb
+++ b/app/views/admin/blog/_submenu.html.erb
@@ -26,30 +26,31 @@
                    :class => 'page_add_icon' %>
     </li>
   </ul>
-
-  <ul class='collapsible_menu'>
-    <li>
-      <% if BlogComment.unmoderated.any? %>
-        <% title = t('.comments.title_with_count', :new_count => BlogComment.unmoderated.size) %>
-      <% else %>
-        <% title = t('.comments.title') %>
-      <% end %>
-      <%= link_to title, '#',
-                  :class => 'comments_icon' %>
-    </li>
-    <li>
-      <%= link_to t('.comments.new'), admin_blog_comments_path,
-                  :class => 'comment_icon' %>
-    </li>
-    <li>
-      <%= link_to t('.comments.approved'), approved_admin_blog_comments_path,
-                  :class => 'comment_tick_icon' %>
-    </li>
-    <li>
-      <%= link_to t('.comments.rejected'), rejected_admin_blog_comments_path,
-                  :class => 'comment_cross_icon' %>
-    </li>
-  </ul>
+  <% if BlogPost.comments_allowed? %>
+    <ul class='collapsible_menu'>
+      <li>
+        <% if BlogComment.unmoderated.any? %>
+          <% title = t('.comments.title_with_count', :new_count => BlogComment.unmoderated.size) %>
+        <% else %>
+          <% title = t('.comments.title') %>
+        <% end %>
+        <%= link_to title, '#',
+                    :class => 'comments_icon' %>
+      </li>
+      <li>
+        <%= link_to t('.comments.new'), admin_blog_comments_path,
+                    :class => 'comment_icon' %>
+      </li>
+      <li>
+        <%= link_to t('.comments.approved'), approved_admin_blog_comments_path,
+                    :class => 'comment_tick_icon' %>
+      </li>
+      <li>
+        <%= link_to t('.comments.rejected'), rejected_admin_blog_comments_path,
+                    :class => 'comment_cross_icon' %>
+      </li>
+    </ul>
+  <% end %>
 
   <ul class='collapsible_menu'>
     <li>
diff --git a/app/views/blog/posts/show.html.erb b/app/views/blog/posts/show.html.erb
index 5ac4c76..48ca0b8 100644
--- a/app/views/blog/posts/show.html.erb
+++ b/app/views/blog/posts/show.html.erb
@@ -6,7 +6,6 @@
   <% if BlogPost.comments_allowed? %>
     <aside id="comments">
       <h2><%= t('.comments.title') %></h2>
-
       <% if (comments = @blog_post.comments.approved).any? %>
         <%= render :partial => "comment", :collection => comments %>
       <% else %>
diff --git a/app/views/blog/shared/_post.html.erb b/app/views/blog/shared/_post.html.erb
index 16483a5..2bc71e0 100644
--- a/app/views/blog/shared/_post.html.erb
+++ b/app/views/blog/shared/_post.html.erb
@@ -26,10 +26,12 @@
         <%= link_to t('blog.shared.posts.read_more'), blog_post_url(post) %>
 
         <aside class='comment_count'>
-          <% if post.comments.any? %>
-             (<%= pluralize(post.comments.approved.count, t('blog.shared.comments.singular')) %>)
-          <% else %>
-            (<%= t('blog.shared.comments.none') %>)
+          <% if BlogPost.comments_allowed? %>
+            <% if post.comments.any? %>
+               (<%= pluralize(post.comments.approved.count, t('blog.shared.comments.singular')) %>)
+            <% else %>
+                  (<%= t('blog.shared.comments.none') %>)
+            <% end %>
           <% end %>
         </aside>
       </p>
-- 
cgit v1.2.3