aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/refinery/admin/blog/posts/_post.html.erb8
-rw-r--r--app/views/refinery/admin/blog/posts/_sortable_list.html.erb2
-rw-r--r--app/views/refinery/admin/blog/posts/index.html.erb8
-rw-r--r--features/support/step_definitions/authors_steps.rb4
4 files changed, 11 insertions, 11 deletions
diff --git a/app/views/refinery/admin/blog/posts/_post.html.erb b/app/views/refinery/admin/blog/posts/_post.html.erb
index a7f09e0..28704ff 100644
--- a/app/views/refinery/admin/blog/posts/_post.html.erb
+++ b/app/views/refinery/admin/blog/posts/_post.html.erb
@@ -7,15 +7,15 @@
</span>
</span>
<span class='actions'>
- <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post),
+ <%= link_to refinery_icon_tag("application_go.png"), main_app.blog_post_path(post),
:title => t('.view_live_html'),
:target => "_blank" %>
- <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_blog_post_path(post),
+ <%= link_to refinery_icon_tag("application_edit.png"), main_app.edit_refinery_admin_blog_post_path(post),
:title => t('.edit') %>
- <%= link_to refinery_icon_tag("delete.png"), admin_blog_post_path(post),
+ <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_admin_blog_post_path(post),
:class => "cancel confirm-delete",
:title => t('.delete'),
:method => :delete,
- :confirm => t('message', :scope => 'shared.admin.delete', :title => post.title) %>
+ :confirm => t('message', :scope => 'refinery.admin.delete', :title => post.title) %>
</span>
</li>
diff --git a/app/views/refinery/admin/blog/posts/_sortable_list.html.erb b/app/views/refinery/admin/blog/posts/_sortable_list.html.erb
index 7ae0ad3..18d12cc 100644
--- a/app/views/refinery/admin/blog/posts/_sortable_list.html.erb
+++ b/app/views/refinery/admin/blog/posts/_sortable_list.html.erb
@@ -1,7 +1,7 @@
<ul id='sortable_list'>
<%= render :partial => 'post', :collection => @blog_posts %>
</ul>
-<%= render :partial => "/shared/admin/sortable_list",
+<%= render :partial => "/refinery/admin/sortable_list",
:locals => {
:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
} %>
diff --git a/app/views/refinery/admin/blog/posts/index.html.erb b/app/views/refinery/admin/blog/posts/index.html.erb
index 72037ca..9d81f45 100644
--- a/app/views/refinery/admin/blog/posts/index.html.erb
+++ b/app/views/refinery/admin/blog/posts/index.html.erb
@@ -1,22 +1,22 @@
<%= render :partial => '/refinery/admin/blog/submenu' %>
<div id='records'>
<% if searching? %>
- <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
+ <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
<% if @blog_posts.any? %>
<ul>
<%= render :partial => "post",
:collection => @blog_posts %>
</ul>
<% else %>
- <p><%= t('no_results', :scope => 'shared.admin.search') %></p>
+ <p><%= t('no_results', :scope => 'refinery.admin.search') %></p>
<% end %>
<% else %>
<% if @blog_posts.any? %>
- <%= will_paginate @blog_posts %>
+ <%= paginate @blog_posts %>
<%= render :partial => "sortable_list" %>
- <%= will_paginate @blog_posts %>
+ <%= paginate @blog_posts %>
<% else %>
<p>
<strong>
diff --git a/features/support/step_definitions/authors_steps.rb b/features/support/step_definitions/authors_steps.rb
index d78ca90..eaa5f32 100644
--- a/features/support/step_definitions/authors_steps.rb
+++ b/features/support/step_definitions/authors_steps.rb
@@ -1,7 +1,7 @@
Then /^there should be (\d+) blog posts?$/ do |num|
- BlogPost.all.size == num
+ ::Refinery::BlogPost.all.size == num
end
Then /^the blog post should belong to me$/ do
- BlogPost.first.author.login == User.last.login
+ ::Refinery::BlogPost.first.author.login == ::Refinery::User.last.login
end \ No newline at end of file