25 files changed, 35 insertions, 35 deletions
diff --git a/app/controllers/refinery/admin/blog/categories_controller.rb b/app/controllers/refinery/blog/admin/categories_controller.rb
index 0fe4eec..cbde1cc 100644
--- a/app/controllers/refinery/admin/blog/categories_controller.rb
+++ b/app/controllers/refinery/blog/admin/categories_controller.rb
@@ -1,6 +1,6 @@
 module Refinery
-  module Admin
-    module Blog
+  module Blog
+    module Admin
       class CategoriesController < ::Refinery::AdminController
 
         crudify :'refinery/blog/category',
diff --git a/app/controllers/refinery/admin/blog/comments_controller.rb b/app/controllers/refinery/blog/admin/comments_controller.rb
index 6c1417e..3128e97 100644
--- a/app/controllers/refinery/admin/blog/comments_controller.rb
+++ b/app/controllers/refinery/blog/admin/comments_controller.rb
@@ -1,6 +1,6 @@
 module Refinery
-  module Admin
-    module Blog
+  module Blog
+    module Admin
       class CommentsController < ::Refinery::AdminController
         
         cache_sweeper Refinery::BlogSweeper
diff --git a/app/controllers/refinery/admin/blog/posts_controller.rb b/app/controllers/refinery/blog/admin/posts_controller.rb
index 4645f3f..04ee663 100644
--- a/app/controllers/refinery/admin/blog/posts_controller.rb
+++ b/app/controllers/refinery/blog/admin/posts_controller.rb
@@ -1,6 +1,6 @@
 module Refinery
-  module Admin
-    module Blog
+  module Blog
+    module Admin
       class PostsController < ::Refinery::AdminController
 
         cache_sweeper Refinery::BlogSweeper
@@ -8,7 +8,7 @@ module Refinery
         crudify :'refinery/blog/post',
                 :title_attribute => :title,
                 :order => 'published_at DESC',
-                :redirect_to_url => "main_app.refinery_admin_blog_posts_path"
+                :redirect_to_url => "main_app.refinery_blog_admin_posts_path"
 
         before_filter :find_all_categories,
                       :only => [:new, :edit, :create, :update]
@@ -54,7 +54,7 @@ module Refinery
 
             unless from_dialog?
               unless params[:continue_editing] =~ /true|on|1/
-                redirect_back_or_default(main_app.refinery_admin_blog_posts_path)
+                redirect_back_or_default(main_app.refinery_blog_admin_posts_path)
               else
                 unless request.xhr?
                   redirect_to :back
diff --git a/app/controllers/refinery/admin/blog/settings_controller.rb b/app/controllers/refinery/blog/admin/settings_controller.rb
index ee71393..afa6b2b 100644
--- a/app/controllers/refinery/admin/blog/settings_controller.rb
+++ b/app/controllers/refinery/blog/admin/settings_controller.rb
@@ -1,6 +1,6 @@
 module Refinery
-  module Admin
-    module Blog
+  module Blog
+    module Admin
       class SettingsController < ::Refinery::AdminController
 
         def notification_recipients
diff --git a/app/views/refinery/admin/blog/_submenu.html.erb b/app/views/refinery/blog/admin/_submenu.html.erb
index 2915610..d290ce8 100644
--- a/app/views/refinery/admin/blog/_submenu.html.erb
+++ b/app/views/refinery/blog/admin/_submenu.html.erb
@@ -3,7 +3,7 @@
     <li class='not_a_link'>
       <%= render :partial => "/refinery/admin/search",
                  :locals => {
-                   :url => main_app.refinery_admin_blog_posts_path
+                   :url => main_app.refinery_blog_admin_posts_path
                  } %>
     </li>
   </ul>
@@ -14,15 +14,15 @@
                    :class => 'page_copy_icon' %>
     </li>
     <li>
-      <%= link_to t('.posts.manage'), main_app.refinery_admin_blog_posts_path,
+      <%= link_to t('.posts.manage'), main_app.refinery_blog_admin_posts_path,
                    :class => 'page_icon' %>
     </li>
     <li>
-      <%= link_to t('.posts.uncategorized'), main_app.uncategorized_refinery_admin_blog_posts_path,
+      <%= link_to t('.posts.uncategorized'), main_app.uncategorized_refinery_blog_admin_posts_path,
                   :class => 'page_icon' %>
     </li>
     <li>
-       <%= link_to t('.posts.new'), main_app.new_refinery_admin_blog_post_path,
+       <%= link_to t('.posts.new'), main_app.new_refinery_blog_admin_post_path,
                    :class => 'page_add_icon' %>
     </li>
   </ul>
@@ -38,15 +38,15 @@
                     :class => 'comments_icon' %>
       </li>
       <li>
-        <%= link_to t('.comments.new'), main_app.refinery_admin_blog_comments_path,
+        <%= link_to t('.comments.new'), main_app.refinery_blog_admin_comments_path,
                     :class => 'comment_icon' %>
       </li>
       <li>
-        <%= link_to t('.comments.approved'), main_app.approved_refinery_admin_blog_comments_path,
+        <%= link_to t('.comments.approved'), main_app.approved_refinery_blog_admin_comments_path,
                     :class => 'comment_tick_icon' %>
       </li>
       <li>
-        <%= link_to t('.comments.rejected'), main_app.rejected_refinery_admin_blog_comments_path,
+        <%= link_to t('.comments.rejected'), main_app.rejected_refinery_blog_admin_comments_path,
                     :class => 'comment_cross_icon' %>
       </li>
     </ul>
@@ -58,36 +58,36 @@
                   :class => 'folder_icon' %>
     </li>
     <li>
-      <%= link_to t('.categories.manage'), main_app.refinery_admin_blog_categories_path,
+      <%= link_to t('.categories.manage'), main_app.refinery_blog_admin_categories_path,
                   :class => 'folder_edit_icon' %>
     </li>
     <li>
-      <%= link_to t('.categories.new'), main_app.new_refinery_admin_blog_category_path(:dialog => true, :height => 325),
+      <%= link_to t('.categories.new'), main_app.new_refinery_blog_admin_category_path(:dialog => true, :height => 325),
                   :class => 'folder_add_icon' %>
     </li>
   </ul>
 
   <ul class='collapsible_menu'>
     <li class='not_a_link'>
-      <%= link_to t('.settings.title'), main_app.refinery_admin_blog_settings_path,
+      <%= link_to t('.settings.title'), main_app.refinery_blog_admin_settings_path,
                   :class => 'settings_icon' %>
     </li>
     <li>
-      <%= link_to t('.settings.comments'), main_app.comments_refinery_admin_blog_settings_path,
+      <%= link_to t('.settings.comments'), main_app.comments_refinery_blog_admin_settings_path,
                   :class => "#{Refinery::Blog::Post.comments_allowed? ? 'success' : 'failure'}_icon" %>
     </li>
     <li>
-      <%= link_to t('.settings.moderation'), main_app.moderation_refinery_admin_blog_settings_path,
+      <%= link_to t('.settings.moderation'), main_app.moderation_refinery_blog_admin_settings_path,
                   :class => "#{Refinery::Blog::Comment::Moderation.enabled? ? 'success' : 'failure'}_icon" %>
     </li>
     <li>
       <%= link_to t('.settings.update_notified'),
-                  main_app.notification_recipients_refinery_admin_blog_settings_path(:dialog => true, :height => 400),
+                  main_app.notification_recipients_refinery_blog_admin_settings_path(:dialog => true, :height => 400),
                   :class => 'user_comment_icon' %>
     </li>
     <li>
       <%= link_to t('.settings.teasers'),
-                  main_app.teasers_refinery_admin_blog_settings_path, :class => "#{Refinery::Blog::Post.teasers_enabled? ? 'success' : 'failure'}_icon" %>
+                  main_app.teasers_refinery_blog_admin_settings_path, :class => "#{Refinery::Blog::Post.teasers_enabled? ? 'success' : 'failure'}_icon" %>
     </li>
   </ul>
 
diff --git a/app/views/refinery/admin/blog/categories/_category.html.erb b/app/views/refinery/blog/admin/categories/_category.html.erb
index 80cc2e3..d476439 100644
--- a/app/views/refinery/admin/blog/categories/_category.html.erb
+++ b/app/views/refinery/blog/admin/categories/_category.html.erb
@@ -5,11 +5,11 @@
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_edit.png"),
-                main_app.edit_refinery_admin_blog_category_path(category, 
+                main_app.edit_refinery_blog_admin_category_path(category, 
                                                                 :dialog => true, 
                                                                 :height => 325),
                 :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_admin_blog_category_path(category),
+    <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_blog_admin_category_path(category),
                 :class => "cancel confirm-delete",
                 :title => t('.delete'),
                 :method => :delete,
diff --git a/app/views/refinery/admin/blog/categories/_form.html.erb b/app/views/refinery/blog/admin/categories/_form.html.erb
index a5d3de3..a5d3de3 100644
--- a/app/views/refinery/admin/blog/categories/_form.html.erb
+++ b/app/views/refinery/blog/admin/categories/_form.html.erb
diff --git a/app/views/refinery/admin/blog/categories/_sortable_list.html.erb b/app/views/refinery/blog/admin/categories/_sortable_list.html.erb
index f4e8641..f4e8641 100644
--- a/app/views/refinery/admin/blog/categories/_sortable_list.html.erb
+++ b/app/views/refinery/blog/admin/categories/_sortable_list.html.erb
diff --git a/app/views/refinery/admin/blog/categories/edit.html.erb b/app/views/refinery/blog/admin/categories/edit.html.erb
index 2872e82..2872e82 100644
--- a/app/views/refinery/admin/blog/categories/edit.html.erb
+++ b/app/views/refinery/blog/admin/categories/edit.html.erb
diff --git a/app/views/refinery/admin/blog/categories/index.html.erb b/app/views/refinery/blog/admin/categories/index.html.erb
index 4ad59ab..4ad59ab 100644
--- a/app/views/refinery/admin/blog/categories/index.html.erb
+++ b/app/views/refinery/blog/admin/categories/index.html.erb
diff --git a/app/views/refinery/admin/blog/categories/new.html.erb b/app/views/refinery/blog/admin/categories/new.html.erb
index 2872e82..2872e82 100644
--- a/app/views/refinery/admin/blog/categories/new.html.erb
+++ b/app/views/refinery/blog/admin/categories/new.html.erb
diff --git a/app/views/refinery/admin/blog/comments/_comment.html.erb b/app/views/refinery/blog/admin/comments/_comment.html.erb
index f5eba4d..51f2996 100644
--- a/app/views/refinery/admin/blog/comments/_comment.html.erb
+++ b/app/views/refinery/blog/admin/comments/_comment.html.erb
@@ -8,13 +8,13 @@
                 main_app.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_admin_blog_comment_path(comment),
+    <%= link_to refinery_icon_tag('zoom.png'), main_app.refinery_blog_admin_comment_path(comment),
                 :title => t('.read') %>
     <%= link_to refinery_icon_tag("cross.png"),
-                main_app.rejected_refinery_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                main_app.rejected_refinery_blog_admin_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
                 :title => t('.reject') unless comment.rejected? %>
     <%= link_to refinery_icon_tag("tick.png"),
-                main_app.approved_refinery_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                main_app.approved_refinery_blog_admin_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
                 :title => t('.approve') unless comment.approved? %>
   </span>
 </li>
diff --git a/app/views/refinery/admin/blog/comments/_sortable_list.html.erb b/app/views/refinery/blog/admin/comments/_sortable_list.html.erb
index f781ba1..f781ba1 100644
--- a/app/views/refinery/admin/blog/comments/_sortable_list.html.erb
+++ b/app/views/refinery/blog/admin/comments/_sortable_list.html.erb
diff --git a/app/views/refinery/admin/blog/comments/index.html.erb b/app/views/refinery/blog/admin/comments/index.html.erb
index 059ef59..059ef59 100644
--- a/app/views/refinery/admin/blog/comments/index.html.erb
+++ b/app/views/refinery/blog/admin/comments/index.html.erb
diff --git a/app/views/refinery/admin/blog/comments/show.html.erb b/app/views/refinery/blog/admin/comments/show.html.erb
index 3dc50ff..2aa75f1 100644
--- a/app/views/refinery/admin/blog/comments/show.html.erb
+++ b/app/views/refinery/blog/admin/comments/show.html.erb
@@ -6,14 +6,14 @@
   <h2><%= t('.actions') %></h2>
   <ul>
     <li>
-      <%= link_to t('.back'), main_app.refinery_admin_blog_comments_path, :class => "back_icon" %>
+      <%= link_to t('.back'), main_app.refinery_blog_admin_comments_path, :class => "back_icon" %>
     </li>
     <li>
-      <%= link_to t('.reject'), main_app.rejected_refinery_admin_blog_comment_path(@blog_comment, :return_to => 'rejected'),
+      <%= 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? %>
     </li>
     <li>
-      <%= link_to t('.approve'), main_app.approved_refinery_admin_blog_comment_path(@blog_comment, :return_to => 'approved'),
+      <%= 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? %>
     </li>
   </ul>
diff --git a/app/views/refinery/admin/blog/posts/_form.html.erb b/app/views/refinery/blog/admin/posts/_form.html.erb
index f20c0cc..656c9c6 100644
--- a/app/views/refinery/admin/blog/posts/_form.html.erb
+++ b/app/views/refinery/blog/admin/posts/_form.html.erb
@@ -113,4 +113,4 @@
 
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/backend') %>
 <% content_for :javascripts, javascript_include_tag('refinery/blog/backend') %>
-<%= render 'refinery/shared/admin/autocomplete', :dom_id => '#blog_post_tag_list', :url => main_app.tags_refinery_admin_blog_posts_url %>
+<%= render 'refinery/shared/admin/autocomplete', :dom_id => '#blog_post_tag_list', :url => main_app.tags_refinery_blog_admin_posts_url %>
diff --git a/app/views/refinery/admin/blog/posts/_form_part.html.erb b/app/views/refinery/blog/admin/posts/_form_part.html.erb
index 114e493..114e493 100644
--- a/app/views/refinery/admin/blog/posts/_form_part.html.erb
+++ b/app/views/refinery/blog/admin/posts/_form_part.html.erb
diff --git a/app/views/refinery/admin/blog/posts/_post.html.erb b/app/views/refinery/blog/admin/posts/_post.html.erb
index 28704ff..c8baa80 100644
--- a/app/views/refinery/admin/blog/posts/_post.html.erb
+++ b/app/views/refinery/blog/admin/posts/_post.html.erb
@@ -10,9 +10,9 @@
     <%= 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"), main_app.edit_refinery_admin_blog_post_path(post),
+    <%= link_to refinery_icon_tag("application_edit.png"), main_app.edit_refinery_blog_admin_post_path(post),
          :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_admin_blog_post_path(post),
+    <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_blog_admin_post_path(post),
         :class => "cancel confirm-delete",
         :title => t('.delete'),
         :method => :delete,
diff --git a/app/views/refinery/admin/blog/posts/_sortable_list.html.erb b/app/views/refinery/blog/admin/posts/_sortable_list.html.erb
index 18d12cc..18d12cc 100644
--- a/app/views/refinery/admin/blog/posts/_sortable_list.html.erb
+++ b/app/views/refinery/blog/admin/posts/_sortable_list.html.erb
diff --git a/app/views/refinery/admin/blog/posts/_teaser_part.html.erb b/app/views/refinery/blog/admin/posts/_teaser_part.html.erb
index dc9186a..dc9186a 100644
--- a/app/views/refinery/admin/blog/posts/_teaser_part.html.erb
+++ b/app/views/refinery/blog/admin/posts/_teaser_part.html.erb
diff --git a/app/views/refinery/admin/blog/posts/edit.html.erb b/app/views/refinery/blog/admin/posts/edit.html.erb
index 2872e82..2872e82 100644
--- a/app/views/refinery/admin/blog/posts/edit.html.erb
+++ b/app/views/refinery/blog/admin/posts/edit.html.erb
diff --git a/app/views/refinery/admin/blog/posts/index.html.erb b/app/views/refinery/blog/admin/posts/index.html.erb
index 922353c..922353c 100644
--- a/app/views/refinery/admin/blog/posts/index.html.erb
+++ b/app/views/refinery/blog/admin/posts/index.html.erb
diff --git a/app/views/refinery/admin/blog/posts/new.html.erb b/app/views/refinery/blog/admin/posts/new.html.erb
index 2872e82..2872e82 100644
--- a/app/views/refinery/admin/blog/posts/new.html.erb
+++ b/app/views/refinery/blog/admin/posts/new.html.erb
diff --git a/app/views/refinery/admin/blog/posts/uncategorized.html.erb b/app/views/refinery/blog/admin/posts/uncategorized.html.erb
index 030e789..030e789 100644
--- a/app/views/refinery/admin/blog/posts/uncategorized.html.erb
+++ b/app/views/refinery/blog/admin/posts/uncategorized.html.erb
diff --git a/app/views/refinery/admin/blog/settings/notification_recipients.html.erb b/app/views/refinery/blog/admin/settings/notification_recipients.html.erb
index d321ded..d321ded 100644
--- a/app/views/refinery/admin/blog/settings/notification_recipients.html.erb
+++ b/app/views/refinery/blog/admin/settings/notification_recipients.html.erb