Restructured part of the project to Refinery::Blog::Admin not Refiner…

…y::Admin::Blog

Rakefile

@@ -14,6 +14,6 @@ end
 
 require "refinerycms-testing"
 Refinery::Testing::Railtie.load_tasks
-Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
+#Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)

app/controllers/refinery/admin/blog/categories_controller.rb → 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',

app/controllers/refinery/admin/blog/comments_controller.rb → 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

app/controllers/refinery/admin/blog/posts_controller.rb → app/controllers/refinery/blog/admin/posts_controller.rb

@@ -1,14 +1,14 @@
 module Refinery
-  module Admin
-    module Blog
+  module Blog
+    module Admin
       class PostsController < ::Refinery::AdminController
 
         cache_sweeper Refinery::BlogSweeper
 
         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 @@ def create
 
             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

app/controllers/refinery/admin/blog/settings_controller.rb → 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

app/views/refinery/admin/blog/_submenu.html.erb → 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>
 

app/views/refinery/admin/blog/categories/_category.html.erb → 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,

app/views/refinery/admin/blog/comments/_comment.html.erb → 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>

app/views/refinery/admin/blog/comments/show.html.erb → 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>

app/views/refinery/admin/blog/posts/_form.html.erb → 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 %>

app/views/refinery/admin/blog/posts/_post.html.erb → 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,

config/routes.rb

@@ -8,10 +8,8 @@
       match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'
       get 'archive/:year(/:month)', :to => 'posts#archive', :as => 'archive_blog_posts'
       get 'tagged/:tag_id(/:tag_name)' => 'posts#tagged', :as => 'tagged_posts'
-    end
 
-    scope(:path => 'refinery', :as => 'refinery_admin', :module => 'admin') do
-      scope(:path => 'blog', :as => 'blog', :module => 'blog') do
+      scope(:path => 'refinery', :as => 'refinery_admin', :module => 'admin') do
         root :to => 'posts#index'
         resources :posts do
           collection do

lib/refinery/blog/engine.rb

@@ -10,7 +10,7 @@ class Engine < Rails::Engine
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = "refinerycms_blog"
-          plugin.url = app.routes.url_helpers.refinery_admin_blog_posts_path
+          plugin.url = app.routes.url_helpers.refinery_blog_admin_posts_path
           plugin.menu_match = /refinery\/blog\/?(posts|comments|categories)?/
           plugin.activity = {
             :class_name => :'refinery/blog/post'