Fixed namespacing for Refinery conventions.

7 files changed, 29 insertions, 29 deletions

diff --git a/app/views/refinery/blog/posts/_comments.html.erb b/app/views/refinery/blog/posts/_comments.html.erb
index 9bc0a13..a34d106 100644
--- a/app/views/refinery/blog/posts/_comments.html.erb
+++ b/app/views/refinery/blog/posts/_comments.html.erb
@@ -1,6 +1,6 @@
 <aside id="comments">
   <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
-  <% if (comments = @blog_post.comments.approved).any? %>
+  <% if (comments = @post.comments.approved).any? %>
     <%= render :partial => "comment", :collection => comments %>
   <% else %>
     <p>
@@ -15,7 +15,7 @@
   <% end %>
 
   <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
-  <%= form_for [main_app, :blog_post, @blog_comment] do |f| %>
+  <%= form_for [main_app, :refinery_blog, @comment] do |f| %>
     <%= render :partial => "/refinery/admin/error_messages",
                :locals => {
                  :object => f.object,
diff --git a/app/views/refinery/blog/posts/_nav.html.erb b/app/views/refinery/blog/posts/_nav.html.erb
index 67aed14..8734638 100644
--- a/app/views/refinery/blog/posts/_nav.html.erb
+++ b/app/views/refinery/blog/posts/_nav.html.erb
@@ -1,17 +1,17 @@
 <nav id="next_prev_article">
-  <% if @blog_post.next.present? -%>
-    <%= link_to (truncate(@blog_post.next.title) + " &#187;").html_safe, 
-                main_app.url_for(@blog_post.next), 
+  <% if @post.next.present? -%>
+    <%= link_to (truncate(@post.next.title) + " &#187;").html_safe, 
+                main_app.url_for(@post.next), 
                 :class => 'next' %>
   <% end -%>
 
   <%= link_to t('blog_home', :scope => 'refinery.blog.posts.show'), 
-              main_app.blog_root_path, 
+              main_app.refinery_blog_root_path, 
               :class => 'home' %>
 
-  <% if @blog_post.prev.present? -%>
-    <%= link_to ("&#171; " + truncate(@blog_post.prev.title)).html_safe, 
-                main_app.url_for(@blog_post.prev), 
+  <% if @post.prev.present? -%>
+    <%= link_to ("&#171; " + truncate(@post.prev.title)).html_safe, 
+                main_app.url_for(@post.prev), 
                 :class => 'prev' %>
   <% end -%>
 </nav><!-- /next_prev_article -->
diff --git a/app/views/refinery/blog/posts/_post.html.erb b/app/views/refinery/blog/posts/_post.html.erb
index cbecc5f..020ba41 100644
--- a/app/views/refinery/blog/posts/_post.html.erb
+++ b/app/views/refinery/blog/posts/_post.html.erb
@@ -5,27 +5,27 @@
 <% end %>
 <article id="blog_post">
   <header>
-    <h1><%= @blog_post.title %></h1>
+    <h1><%= @post.title %></h1>
     <section class='details'>
-      <time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
-        <%= t('created_at', :scope => 'refinery.blog.shared.posts', :when => l(@blog_post.published_at.to_date, :format => :short)) %>
+      <time datetime="<%=l @post.published_at.to_date, :format => :default %>" class='posted_at'>
+        <%= t('created_at', :scope => 'refinery.blog.shared.posts', :when => l(@post.published_at.to_date, :format => :short)) %>
       </time>
-      <%= "#{t('by', :scope => 'refinery.blog.posts.show')} #{@blog_post.author.username}" if @blog_post.author.present? %>.
-      <% if (categories = @blog_post.categories).any? %>
+      <%= "#{t('by', :scope => 'refinery.blog.posts.show')} #{@post.author.username}" if @post.author.present? %>.
+      <% if (categories = @post.categories).any? %>
         <aside class='filed_in'>
           <%= t('filed_in', :scope => 'refinery.blog.posts.show') %>
           <% categories.each_with_index do |category, index| %>
-            <%= link_to category.title, main_app.blog_category_path(category) -%><%= ',' if index < ((categories.length) - 1) %>
+            <%= link_to category.title, main_app.refinery_blog_category_path(category) -%><%= ',' if index < ((categories.length) - 1) %>
           <% end %>
         </aside>
       <% end %>
     </section>
   </header>
-  <%= @blog_post.body.html_safe %>
+  <%= @post.body.html_safe %>
 
   <% if Refinery::Blog::Post::ShareThis.enabled? %>
     <span class="st_sharethis" displayText="ShareThis"></span>
   <% end %>
 </article>
-<%= render :partial => '/refinery/draft_page_message' unless @blog_post.nil? or @blog_post.live? -%>
-<%= render 'nav' if next_or_previous?(@blog_post) %>
+<%= render :partial => '/refinery/draft_page_message' unless @post.nil? or @post.live? -%>
+<%= render 'nav' if next_or_previous?(@post) %>
diff --git a/app/views/refinery/blog/posts/archive.html.erb b/app/views/refinery/blog/posts/archive.html.erb
index 01e3748..bda6c45 100644
--- a/app/views/refinery/blog/posts/archive.html.erb
+++ b/app/views/refinery/blog/posts/archive.html.erb
@@ -2,9 +2,9 @@
 
 <% content_for :body_content_left do %>
   <h1><%= t('.blog_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
-  <% if @blog_posts.any? %>
+  <% if @posts.any? %>
     <section id="blog_posts">
-      <%= render :partial => "/refinery/blog/shared/post", :collection => @blog_posts %>
+      <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
     </section>
   <% else %>
     <p><%= t('.no_blog_articles_posted', :date => @archive_date.strftime('%B %Y')) %></p>
diff --git a/app/views/refinery/blog/posts/index.html.erb b/app/views/refinery/blog/posts/index.html.erb
index f5f12b8..36c007b 100644
--- a/app/views/refinery/blog/posts/index.html.erb
+++ b/app/views/refinery/blog/posts/index.html.erb
@@ -1,10 +1,10 @@
 <% content_for :body_content_left do %>
   <%= raw @page.content_for(::Refinery::Pages.config.default_parts.first.to_sym) if ::Refinery::Pages.config.default_parts.any? %>
 
-  <% if @blog_posts.any? %>
+  <% if @posts.any? %>
     <section id="blog_posts">
-      <%= render :partial => "/refinery/blog/shared/post", :collection => @blog_posts %>
-      <%= will_paginate @blog_posts %>
+      <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
+      <%= will_paginate @posts %>
     </section>
   <% else %>
     <p><%= t('.no_blog_articles_yet') %></p>
diff --git a/app/views/refinery/blog/posts/index.rss.builder b/app/views/refinery/blog/posts/index.rss.builder
index 609816a..99ae0eb 100644
--- a/app/views/refinery/blog/posts/index.rss.builder
+++ b/app/views/refinery/blog/posts/index.rss.builder
@@ -3,14 +3,14 @@ xml.rss :version => "2.0" do
   xml.channel do
     xml.title Refinery::Core.config.site_name
     xml.description Refinery::Core.config.site_name + " Blog Posts"
-    xml.link main_app.blog_root_url
+    xml.link main_app.refinery_blog_root_url
 
-    @blog_posts.each do |post|
+    @posts.each do |post|
       xml.item do
         xml.title post.title
         xml.description post.body
         xml.pubDate post.published_at.to_s(:rfc822)
-        xml.link main_app.blog_post_url(post)
+        xml.link main_app.refinery_blog_post_url(post)
       end
     end
   end
diff --git a/app/views/refinery/blog/posts/tagged.html.erb b/app/views/refinery/blog/posts/tagged.html.erb
index 468401a..3a3ee75 100644
--- a/app/views/refinery/blog/posts/tagged.html.erb
+++ b/app/views/refinery/blog/posts/tagged.html.erb
@@ -3,10 +3,10 @@
 <% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
 
 <% content_for :body_content_left do %>
-  <% if @blog_posts.any? %>
+  <% if @posts.any? %>
     <section id="blog_posts">
-      <%= render :partial => "/refinery/blog/shared/post", :collection => @blog_posts %>
-      <%= will_paginate @blog_posts %>
+      <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
+      <%= will_paginate @posts %>
     </section>
   <% else %>
     <p><%= t('.no_blog_articles_yet') %></p>