Fixed namespacing for Refinery conventions.

4 files changed, 20 insertions, 20 deletions

diff --git a/app/views/refinery/blog/admin/comments/_comment.html.erb b/app/views/refinery/blog/admin/comments/_comment.html.erb
index 51f2996..f4a7a16 100644
--- a/app/views/refinery/blog/admin/comments/_comment.html.erb
+++ b/app/views/refinery/blog/admin/comments/_comment.html.erb
@@ -5,7 +5,7 @@
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_go.png"),
-                main_app.blog_post_path(comment.post, :anchor => "comment-#{comment.to_param}"),
+                main_app.refinery_blog_post_path(comment.post, :anchor => "comment-#{comment.to_param}"),
                 :title => t('.view_live_html'),
                 :target => "_blank" unless comment.unmoderated? %>
     <%= link_to refinery_icon_tag('zoom.png'), main_app.refinery_blog_admin_comment_path(comment),
diff --git a/app/views/refinery/blog/admin/comments/_sortable_list.html.erb b/app/views/refinery/blog/admin/comments/_sortable_list.html.erb
index f781ba1..9f8bbbc 100644
--- a/app/views/refinery/blog/admin/comments/_sortable_list.html.erb
+++ b/app/views/refinery/blog/admin/comments/_sortable_list.html.erb
@@ -1,5 +1,5 @@
 <ul id='sortable_list'>
-  <%= render :partial => 'comment', :collection => @blog_comments %>
+  <%= render :partial => 'comment', :collection => @comments %>
 </ul>
 <%= render :partial => "/refinery/admin/sortable_list",
            :locals => {
diff --git a/app/views/refinery/blog/admin/comments/index.html.erb b/app/views/refinery/blog/admin/comments/index.html.erb
index 059ef59..991980d 100644
--- a/app/views/refinery/blog/admin/comments/index.html.erb
+++ b/app/views/refinery/blog/admin/comments/index.html.erb
@@ -1,26 +1,26 @@
-<%= render :partial => '/refinery/admin/blog/submenu' %>
+<%= render :partial => '/refinery/blog/admin/submenu' %>
 <div id='records'>
   <% if searching? %>
     <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
-    <% if @blog_comments.any? %>
-      <%= will_paginate @blog_comments %>
+    <% if @comments.any? %>
+      <%= will_paginate @comments %>
 
       <ul>
         <%= render :partial => "blog_comments",
-                   :collection => @blog_comments %>
+                   :collection => @comments %>
       </ul>
 
-      <%= will_paginate @blog_comments %>
+      <%= will_paginate @comments %>
     <% else %>
       <p><%= t('search_no_results', :scope => 'admin') %></p>
     <% end %>
   <% else %>
-    <% if @blog_comments.any? %>
-      <%= will_paginate @blog_comments %>
+    <% if @comments.any? %>
+      <%= will_paginate @comments %>
 
       <%= render :partial => "sortable_list" %>
 
-      <%= will_paginate @blog_comments %>
+      <%= will_paginate @comments %>
     <% else %>
       <h3>
         <%= t('.no_items_yet',
diff --git a/app/views/refinery/blog/admin/comments/show.html.erb b/app/views/refinery/blog/admin/comments/show.html.erb
index 2aa75f1..df04b3e 100644
--- a/app/views/refinery/blog/admin/comments/show.html.erb
+++ b/app/views/refinery/blog/admin/comments/show.html.erb
@@ -1,7 +1,7 @@
 <div id='actions'>
   <h2><%= t('.details')%></h2>
   <p>
-    <strong><%= t('.age') %>:</strong> <%= time_ago_in_words(@blog_comment.created_at) %>
+    <strong><%= t('.age') %>:</strong> <%= time_ago_in_words(@comment.created_at) %>
   </p>
   <h2><%= t('.actions') %></h2>
   <ul>
@@ -9,12 +9,12 @@
       <%= link_to t('.back'), main_app.refinery_blog_admin_comments_path, :class => "back_icon" %>
     </li>
     <li>
-      <%= link_to t('.reject'), main_app.rejected_refinery_blog_admin_comment_path(@blog_comment, :return_to => 'rejected'),
-          :class => 'comment_cross_icon' unless @blog_comment.rejected? %>
+      <%= link_to t('.reject'), main_app.rejected_refinery_blog_admin_comment_path(@comment, :return_to => 'rejected'),
+          :class => 'comment_cross_icon' unless @comment.rejected? %>
     </li>
     <li>
-      <%= link_to t('.approve'), main_app.approved_refinery_blog_admin_comment_path(@blog_comment, :return_to => 'approved'),
-          :class => 'comment_tick_icon' unless @blog_comment.approved? %>
+      <%= link_to t('.approve'), main_app.approved_refinery_blog_admin_comment_path(@comment, :return_to => 'approved'),
+          :class => 'comment_tick_icon' unless @comment.approved? %>
     </li>
   </ul>
 </div>
@@ -26,8 +26,8 @@
         <strong><%= t('.blog_post') %></strong>
       </td>
       <td>
-        <%= link_to @blog_comment.post.title,
-                    main_app.blog_post_path(@blog_comment.post, :anchor => "comment-#{@blog_comment.to_param}"),
+        <%= link_to @comment.post.title,
+                    main_app.refinery_blog_post_path(@comment.post, :anchor => "comment-#{@comment.to_param}"),
                     :target => '_blank' %>
       </td>
     </tr>
@@ -36,7 +36,7 @@
         <strong><%= t('.from') %></strong>
       </td>
       <td>
-        <%= @blog_comment.name %> [<%= mail_to @blog_comment.email, @blog_comment.email, {:title => t('.click_to_email')} %>]
+        <%= @comment.name %> [<%= mail_to @comment.email, @comment.email, {:title => t('.click_to_email')} %>]
       </td>
     </tr>
     <tr>
@@ -44,7 +44,7 @@
         <strong><%= t('.date') %></strong>
       </td>
       <td>
-        <%= l(Date.parse(@blog_comment.created_at.to_s), :format => :long) %>
+        <%= l(Date.parse(@comment.created_at.to_s), :format => :long) %>
       </td>
     </tr>
     <tr>
@@ -53,7 +53,7 @@
       </td>
       <td>
         <p style='margin-top: 0px'>
-          <%= @blog_comment.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
+          <%= @comment.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
         </p>
       </td>
     </tr>