Refactored everything (models, helpers) into proper namespace of Refinery::Blog. Requires refinery commit 25162b585b9c4023d39fd1a9796140bfa4ecb909

8 files changed, 16 insertions, 17 deletions

diff --git a/app/views/refinery/admin/blog/_submenu.html.erb b/app/views/refinery/admin/blog/_submenu.html.erb
index 799c101..2915610 100644
--- a/app/views/refinery/admin/blog/_submenu.html.erb
+++ b/app/views/refinery/admin/blog/_submenu.html.erb
@@ -26,11 +26,11 @@
                    :class => 'page_add_icon' %>
     </li>
   </ul>
-  <% if Refinery::BlogPost.comments_allowed? %>
+  <% if Refinery::Blog::Post.comments_allowed? %>
     <ul class='collapsible_menu'>
       <li class='not_a_link'>
-        <% if Refinery::BlogComment.unmoderated.any? %>
-          <% title = t('.comments.title_with_count', :new_count => Refinery::BlogComment.unmoderated.size) %>
+        <% if Refinery::Blog::Comment.unmoderated.any? %>
+          <% title = t('.comments.title_with_count', :new_count => Refinery::Blog::Comment.unmoderated.size) %>
         <% else %>
           <% title = t('.comments.title') %>
         <% end %>
@@ -74,11 +74,11 @@
     </li>
     <li>
       <%= link_to t('.settings.comments'), main_app.comments_refinery_admin_blog_settings_path,
-                  :class => "#{Refinery::BlogPost.comments_allowed? ? 'success' : 'failure'}_icon" %>
+                  :class => "#{Refinery::Blog::Post.comments_allowed? ? 'success' : 'failure'}_icon" %>
     </li>
     <li>
       <%= link_to t('.settings.moderation'), main_app.moderation_refinery_admin_blog_settings_path,
-                  :class => "#{Refinery::BlogComment::Moderation.enabled? ? 'success' : 'failure'}_icon" %>
+                  :class => "#{Refinery::Blog::Comment::Moderation.enabled? ? 'success' : 'failure'}_icon" %>
     </li>
     <li>
       <%= link_to t('.settings.update_notified'),
@@ -87,7 +87,7 @@
     </li>
     <li>
       <%= link_to t('.settings.teasers'),
-                  main_app.teasers_refinery_admin_blog_settings_path, :class => "#{Refinery::BlogPost.teasers_enabled? ? 'success' : 'failure'}_icon" %>
+                  main_app.teasers_refinery_admin_blog_settings_path, :class => "#{Refinery::Blog::Post.teasers_enabled? ? 'success' : 'failure'}_icon" %>
     </li>
   </ul>
 
diff --git a/app/views/refinery/admin/blog/posts/_form.html.erb b/app/views/refinery/admin/blog/posts/_form.html.erb
index 8a3b091..822ec8a 100644
--- a/app/views/refinery/admin/blog/posts/_form.html.erb
+++ b/app/views/refinery/admin/blog/posts/_form.html.erb
@@ -27,7 +27,6 @@
       </ul>
       
       <div id='page_part_editors'>
-      
         <% part_index = -1 %>
           <%= render :partial => 'form_part',
                      :locals => {
diff --git a/app/views/refinery/blog/categories/show.html.erb b/app/views/refinery/blog/categories/show.html.erb
index adcf1aa..00d9596 100644
--- a/app/views/refinery/blog/categories/show.html.erb
+++ b/app/views/refinery/blog/categories/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for :body_content_title, @category.title %>
+<% content_for :body_content_title, @blog_category.title %>
 
 <% content_for :body_content_left do %>
   <% if @blog_posts.any? %>
diff --git a/app/views/refinery/blog/comment_mailer/notification.html.erb b/app/views/refinery/blog/comment_mailer/notification.html.erb
index 800f12c..0c7dcd4 100644
--- a/app/views/refinery/blog/comment_mailer/notification.html.erb
+++ b/app/views/refinery/blog/comment_mailer/notification.html.erb
@@ -4,10 +4,10 @@
 
 <%=raw t('.comment_starts') %>
 
-<%=raw t('.from') %>: <%= @comment.name %>
-<%=raw t('.email') %>: <%= @comment.email %>
+<%=raw t('.from') %>: <%= @blog_comment.name %>
+<%=raw t('.email') %>: <%= @blog_comment.email %>
 <%=raw t('.message') %>:
-<%=simple_format strip_tags(@comment.body) %>
+<%=simple_format strip_tags(@blog_comment.body) %>
 
 <%=raw t('.comment_ends') %>
 
diff --git a/app/views/refinery/blog/posts/_post.html.erb b/app/views/refinery/blog/posts/_post.html.erb
index f86f63a..cbecc5f 100644
--- a/app/views/refinery/blog/posts/_post.html.erb
+++ b/app/views/refinery/blog/posts/_post.html.erb
@@ -23,7 +23,7 @@
   </header>
   <%= @blog_post.body.html_safe %>
 
-  <% if Refinery::BlogPost::ShareThis.enabled? %>
+  <% if Refinery::Blog::Post::ShareThis.enabled? %>
     <span class="st_sharethis" displayText="ShareThis"></span>
   <% end %>
 </article>
diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb
index 020c964..2ca168e 100644
--- a/app/views/refinery/blog/posts/show.html.erb
+++ b/app/views/refinery/blog/posts/show.html.erb
@@ -3,7 +3,7 @@
     <%= render 'post' %>
   </div>
 
-  <% if Refinery::BlogPost.comments_allowed? %>
+  <% if Refinery::Blog::Post.comments_allowed? %>
     <%= render 'comments'%>
   <% end %>
 <% end %>
@@ -17,5 +17,5 @@
   <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %>
   <%#= javascript_include_tag('refinery/blog/frontend') %>
   <script src="http://w.sharethis.com/button/buttons.js"></script>
-  <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script>
-<% end if Refinery::BlogPost::ShareThis.enabled? %>
+  <script>stLight.options({publisher:'<%= Blog::Post::ShareThis.key %>'});</script>
+<% end if Refinery::Blog::Post::ShareThis.enabled? %>
diff --git a/app/views/refinery/blog/shared/_categories.html.erb b/app/views/refinery/blog/shared/_categories.html.erb
index 295cae0..1280cd2 100644
--- a/app/views/refinery/blog/shared/_categories.html.erb
+++ b/app/views/refinery/blog/shared/_categories.html.erb
@@ -2,7 +2,7 @@
   <h2><%= t('.title') %></h2>
   <ul id='categories'>
     <% @blog_categories.each do |category| %>
-      <li<%= " class='selected'" if @category.present? and @category.id == category.id %>>
+      <li<%= " class='selected'" if @blog_category.present? and @blog_category.id == category.id %>>
         <%= link_to "#{category.title} (#{category.post_count})", main_app.blog_category_path(category) %>
       </li>
     <% end %>
diff --git a/app/views/refinery/blog/shared/_post.html.erb b/app/views/refinery/blog/shared/_post.html.erb
index 18271ec..c384bcb 100644
--- a/app/views/refinery/blog/shared/_post.html.erb
+++ b/app/views/refinery/blog/shared/_post.html.erb
@@ -33,7 +33,7 @@
         <%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), main_app.blog_post_path(post) if blog_post_teaser_enabled? %>
       </p>
       <aside class='comment_count'>
-        <% if Refinery::BlogPost.comments_allowed? %>
+        <% if Refinery::Blog::Post.comments_allowed? %>
           <% if post.comments.any? %>
              (<%= pluralize(post.comments.approved.count, t('singular', :scope => 'refinery.blog.shared.comments')) %>)
           <% else %>