From a5fe9225fac33f15e972599132c7f569cc5cf397 Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Mon, 9 Aug 2010 19:31:22 +1200
Subject: Namespaced blog posts under blog/posts to allow for blog/comments and
 blog/categories

---
 app/controllers/admin/blog/posts_controller.rb     |  5 +++
 app/controllers/admin/blog_posts_controller.rb     |  5 ---
 app/views/admin/blog/posts/_form.html.erb          | 25 +++++++++++++
 app/views/admin/blog/posts/_post.html.erb          | 16 ++++++++
 app/views/admin/blog/posts/_sortable_list.html.erb |  7 ++++
 app/views/admin/blog/posts/edit.html.erb           |  1 +
 app/views/admin/blog/posts/index.html.erb          | 43 ++++++++++++++++++++++
 app/views/admin/blog/posts/new.html.erb            |  1 +
 app/views/admin/blog_posts/_blog_post.html.erb     | 16 --------
 app/views/admin/blog_posts/_form.html.erb          | 25 -------------
 app/views/admin/blog_posts/_sortable_list.html.erb |  7 ----
 app/views/admin/blog_posts/edit.html.erb           |  1 -
 app/views/admin/blog_posts/index.html.erb          | 43 ----------------------
 app/views/admin/blog_posts/new.html.erb            |  1 -
 config/locales/en.yml                              | 23 ++++++------
 config/locales/nb.yml                              | 23 ++++++------
 config/locales/nl.yml                              | 23 ++++++------
 config/routes.rb                                   |  4 +-
 rails/init.rb                                      |  4 +-
 19 files changed, 139 insertions(+), 134 deletions(-)
 create mode 100644 app/controllers/admin/blog/posts_controller.rb
 delete mode 100644 app/controllers/admin/blog_posts_controller.rb
 create mode 100644 app/views/admin/blog/posts/_form.html.erb
 create mode 100644 app/views/admin/blog/posts/_post.html.erb
 create mode 100644 app/views/admin/blog/posts/_sortable_list.html.erb
 create mode 100644 app/views/admin/blog/posts/edit.html.erb
 create mode 100644 app/views/admin/blog/posts/index.html.erb
 create mode 100644 app/views/admin/blog/posts/new.html.erb
 delete mode 100644 app/views/admin/blog_posts/_blog_post.html.erb
 delete mode 100644 app/views/admin/blog_posts/_form.html.erb
 delete mode 100644 app/views/admin/blog_posts/_sortable_list.html.erb
 delete mode 100644 app/views/admin/blog_posts/edit.html.erb
 delete mode 100644 app/views/admin/blog_posts/index.html.erb
 delete mode 100644 app/views/admin/blog_posts/new.html.erb

diff --git a/app/controllers/admin/blog/posts_controller.rb b/app/controllers/admin/blog/posts_controller.rb
new file mode 100644
index 0000000..291571c
--- /dev/null
+++ b/app/controllers/admin/blog/posts_controller.rb
@@ -0,0 +1,5 @@
+class Admin::Blog::PostsController < Admin::BaseController
+
+  crudify :blog_post, :title_attribute => :title, :order => 'created_at DESC'
+
+end
diff --git a/app/controllers/admin/blog_posts_controller.rb b/app/controllers/admin/blog_posts_controller.rb
deleted file mode 100644
index 0fd5a93..0000000
--- a/app/controllers/admin/blog_posts_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Admin::BlogPostsController < Admin::BaseController
-
-  crudify :blog_post, :title_attribute => :title, :order => 'created_at DESC'
-
-end
diff --git a/app/views/admin/blog/posts/_form.html.erb b/app/views/admin/blog/posts/_form.html.erb
new file mode 100644
index 0000000..5d9f347
--- /dev/null
+++ b/app/views/admin/blog/posts/_form.html.erb
@@ -0,0 +1,25 @@
+<% form_for [:admin, @blog_post] do |f| -%>
+  <%= f.error_messages %>
+
+  <div class='field'>
+    <%= f.label :title -%>
+    <%= f.text_field :title, :class => 'larger widest' -%>
+  </div>
+
+  <div class='field'>
+    <%= f.label :body -%>
+    <%= f.text_area :body, :rows => 20, :class => 'wymeditor widest' -%>
+  </div>
+
+  <div class='field'>
+    <%= f.label :draft -%>
+    <%= f.check_box :draft -%>
+  </div>
+
+  <%= render :partial => "/shared/admin/form_actions",
+              :locals => {
+                :f => f,
+                :continue_editing => false,
+                :delete_title => t('admin.blogs.blogs.delete')
+              } %>
+<% end -%>
diff --git a/app/views/admin/blog/posts/_post.html.erb b/app/views/admin/blog/posts/_post.html.erb
new file mode 100644
index 0000000..3e15543
--- /dev/null
+++ b/app/views/admin/blog/posts/_post.html.erb
@@ -0,0 +1,16 @@
+<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(post) -%>">
+  <span class='title'>
+    <%=h post.title %>
+    <span class="preview">&nbsp;</span>
+  </span>
+  <span class='actions'>
+    <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post),
+        :title => t('.view_live'),
+        :target => "_blank" %>
+    <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_blog_post_path(post),
+         :title => t('.edit') %>
+    <%= link_to refinery_icon_tag("delete.png"), admin_blog_post_path(post),
+        :class => "cancel confirm-delete",
+        :title => t('.delete') %>
+  </span>
+</li>
diff --git a/app/views/admin/blog/posts/_sortable_list.html.erb b/app/views/admin/blog/posts/_sortable_list.html.erb
new file mode 100644
index 0000000..7ae0ad3
--- /dev/null
+++ b/app/views/admin/blog/posts/_sortable_list.html.erb
@@ -0,0 +1,7 @@
+<ul id='sortable_list'>
+  <%= render :partial => 'post', :collection => @blog_posts %>
+</ul>
+<%= render :partial => "/shared/admin/sortable_list",
+           :locals => {
+             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
+           } %>
diff --git a/app/views/admin/blog/posts/edit.html.erb b/app/views/admin/blog/posts/edit.html.erb
new file mode 100644
index 0000000..2872e82
--- /dev/null
+++ b/app/views/admin/blog/posts/edit.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "form" %>
diff --git a/app/views/admin/blog/posts/index.html.erb b/app/views/admin/blog/posts/index.html.erb
new file mode 100644
index 0000000..0bc14db
--- /dev/null
+++ b/app/views/admin/blog/posts/index.html.erb
@@ -0,0 +1,43 @@
+<div id='actions'>
+  <ul>
+    <li>
+      <%= render :partial => "/shared/admin/search",
+                 :locals => {
+                   :url => admin_blog_posts_url
+                 } %>
+    </li>
+    <li>
+      <%= link_to t('.create_new'), new_admin_blog_post_url,
+                  :class => "add_icon" %>
+    </li>
+  </ul>
+</div>
+<div id='records'>
+  <% if searching? %>
+    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
+    <% if @blog_posts.any? %>
+      <%= render :partial => "blog_posts",
+                 :collection => @blog_posts %>
+    <% else %>
+      <p><%= t('admin.search_no_results') %></p>
+    <% end %>
+  <% else %>
+    <% if @blog_posts.any? %>
+      <%= will_paginate @blog_posts,
+                        :previous_label => '&laquo;',
+                        :next_label => '&raquo;' %>
+
+      <%= render :partial => "sortable_list" %>
+
+      <%= will_paginate @blog_posts,
+                        :previous_label => '&laquo;',
+                        :next_label => '&raquo;' %>
+    <% else %>
+      <p>
+        <strong>
+          <%= t('.no_items_yet') %>
+        </strong>
+      </p>
+    <% end %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/blog/posts/new.html.erb b/app/views/admin/blog/posts/new.html.erb
new file mode 100644
index 0000000..2872e82
--- /dev/null
+++ b/app/views/admin/blog/posts/new.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "form" %>
diff --git a/app/views/admin/blog_posts/_blog_post.html.erb b/app/views/admin/blog_posts/_blog_post.html.erb
deleted file mode 100644
index b56a050..0000000
--- a/app/views/admin/blog_posts/_blog_post.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(blog_post) -%>">
-  <span class='title'>
-    <%=h blog_post.title %>
-    <span class="preview">&nbsp;</span>
-  </span>
-  <span class='actions'>
-    <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(blog_post),
-        :title => t('.view_live'),
-        :target => "_blank" %>
-    <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_blog_post_path(blog_post),
-         :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), admin_blog_post_path(blog_post),
-        :class => "cancel confirm-delete",
-        :title => t('.delete') %>
-  </span>
-</li>
diff --git a/app/views/admin/blog_posts/_form.html.erb b/app/views/admin/blog_posts/_form.html.erb
deleted file mode 100644
index 5d9f347..0000000
--- a/app/views/admin/blog_posts/_form.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% form_for [:admin, @blog_post] do |f| -%>
-  <%= f.error_messages %>
-
-  <div class='field'>
-    <%= f.label :title -%>
-    <%= f.text_field :title, :class => 'larger widest' -%>
-  </div>
-
-  <div class='field'>
-    <%= f.label :body -%>
-    <%= f.text_area :body, :rows => 20, :class => 'wymeditor widest' -%>
-  </div>
-
-  <div class='field'>
-    <%= f.label :draft -%>
-    <%= f.check_box :draft -%>
-  </div>
-
-  <%= render :partial => "/shared/admin/form_actions",
-              :locals => {
-                :f => f,
-                :continue_editing => false,
-                :delete_title => t('admin.blogs.blogs.delete')
-              } %>
-<% end -%>
diff --git a/app/views/admin/blog_posts/_sortable_list.html.erb b/app/views/admin/blog_posts/_sortable_list.html.erb
deleted file mode 100644
index 3529b23..0000000
--- a/app/views/admin/blog_posts/_sortable_list.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul id='sortable_list'>
-  <%= render :partial => 'blog_post', :collection => @blog_posts %>
-</ul>
-<%= render :partial => "/shared/admin/sortable_list",
-           :locals => {
-             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
-           } %>
diff --git a/app/views/admin/blog_posts/edit.html.erb b/app/views/admin/blog_posts/edit.html.erb
deleted file mode 100644
index 2872e82..0000000
--- a/app/views/admin/blog_posts/edit.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => "form" %>
diff --git a/app/views/admin/blog_posts/index.html.erb b/app/views/admin/blog_posts/index.html.erb
deleted file mode 100644
index 0bc14db..0000000
--- a/app/views/admin/blog_posts/index.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<div id='actions'>
-  <ul>
-    <li>
-      <%= render :partial => "/shared/admin/search",
-                 :locals => {
-                   :url => admin_blog_posts_url
-                 } %>
-    </li>
-    <li>
-      <%= link_to t('.create_new'), new_admin_blog_post_url,
-                  :class => "add_icon" %>
-    </li>
-  </ul>
-</div>
-<div id='records'>
-  <% if searching? %>
-    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
-    <% if @blog_posts.any? %>
-      <%= render :partial => "blog_posts",
-                 :collection => @blog_posts %>
-    <% else %>
-      <p><%= t('admin.search_no_results') %></p>
-    <% end %>
-  <% else %>
-    <% if @blog_posts.any? %>
-      <%= will_paginate @blog_posts,
-                        :previous_label => '&laquo;',
-                        :next_label => '&raquo;' %>
-
-      <%= render :partial => "sortable_list" %>
-
-      <%= will_paginate @blog_posts,
-                        :previous_label => '&laquo;',
-                        :next_label => '&raquo;' %>
-    <% else %>
-      <p>
-        <strong>
-          <%= t('.no_items_yet') %>
-        </strong>
-      </p>
-    <% end %>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/admin/blog_posts/new.html.erb b/app/views/admin/blog_posts/new.html.erb
deleted file mode 100644
index 2872e82..0000000
--- a/app/views/admin/blog_posts/new.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => "form" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0b1e15d..4489389 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,17 +3,18 @@ en:
     refinerycms_blog:
       title: Blog
   admin:
-    blog_posts:
-      index:
-        create_new: Create new post
-        reorder: Reorder Blog Posts
-        reorder_done: Done Reordering Blog Posts
-        sorry_no_results: Sorry! There are no results found.
-        no_items_yet: There are no Blog Posts yet. Click "Create a new Blog Posts" to add your first blog posts.
-      blog_post:
-        view_live: View this blog post live <br/><em>(opens in a new window)</em>
-        edit: Edit this blog post
-        delete: Remove this blog post forever
+    blog:
+      posts:
+        index:
+          create_new: Create new post
+          reorder: Reorder Blog Posts
+          reorder_done: Done Reordering Blog Posts
+          sorry_no_results: Sorry! There are no results found.
+          no_items_yet: There are no Blog Posts yet. Click "Create a new Blog Posts" to add your first blog posts.
+        post:
+          view_live: View this blog post live <br/><em>(opens in a new window)</em>
+          edit: Edit this blog post
+          delete: Remove this blog post forever
   blog_posts:
     show:
       other: Other Blog Posts
\ No newline at end of file
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 8ff239f..0c7f237 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -3,17 +3,18 @@ nb:
     refinerycms_blog:
       title: Blog
   admin:
-    blog_posts:
-      index:
-        create_new: Lag en ny post
-        reorder: Endre rekkefølgen på Blog Posts
-        reorder_done: Ferdig å endre rekkefølgen Blog Posts
-        sorry_no_results: Beklager! Vi fant ikke noen resultater.
-        no_items_yet: Det er ingen Blog Posts enda. Klikk på "Lag en ny Blog Posts" for å legge til din første blog posts.
-      blog_post:
-        view_live: Vis hvordan denne blog post ser ut offentlig <br/><em>(åpner i et nytt vindu)</em>
-        edit: Rediger denne blog post
-        delete: Fjern denne blog post permanent
+    blog:
+      posts:
+        index:
+          create_new: Lag en ny post
+          reorder: Endre rekkefølgen på Blog Posts
+          reorder_done: Ferdig å endre rekkefølgen Blog Posts
+          sorry_no_results: Beklager! Vi fant ikke noen resultater.
+          no_items_yet: Det er ingen Blog Posts enda. Klikk på "Lag en ny Blog Posts" for å legge til din første blog posts.
+        post:
+          view_live: Vis hvordan denne blog post ser ut offentlig <br/><em>(åpner i et nytt vindu)</em>
+          edit: Rediger denne blog post
+          delete: Fjern denne blog post permanent
   blog_posts:
     show:
       other: Andre Blog Posts
\ No newline at end of file
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c5daaf8..e1f7eca 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3,17 +3,18 @@ nl:
     refinerycms_blog:
       title: Blog
   admin:
-    blog_posts:
-      index:
-        create_new: Maak een nieuwe post
-        reorder: Wijzig de volgorde van de Blog Post
-        reorder_done: Klaar met het wijzingen van de volgorde van de Blog Post
-        sorry_no_results: Helaas! Er zijn geen resultaten gevonden.
-        no_items_yet: Er zijn nog geen Blog Post. Druk op 'Maak een nieuwe Blog Post' om de eerste aan te maken.
-      blog_post:
-        view_live: Bekijk deze blog posts op de website <br/><em>(opent een nieuw venster)</em>
-        edit: Bewerk deze blog post
-        delete: Verwijder deze blog post voor eeuwig
+    blog:
+      posts:
+        index:
+          create_new: Maak een nieuwe post
+          reorder: Wijzig de volgorde van de Blog Post
+          reorder_done: Klaar met het wijzingen van de volgorde van de Blog Post
+          sorry_no_results: Helaas! Er zijn geen resultaten gevonden.
+          no_items_yet: Er zijn nog geen Blog Post. Druk op 'Maak een nieuwe Blog Post' om de eerste aan te maken.
+        post:
+          view_live: Bekijk deze blog posts op de website <br/><em>(opent een nieuw venster)</em>
+          edit: Bewerk deze blog post
+          delete: Verwijder deze blog post voor eeuwig
   blog_posts:
     show:
       other: Andere Blog Post
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index e47fa00..4722ce3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,8 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :blog_posts, :as => :blog
 
   map.namespace(:admin, :path_prefix => 'refinery') do |admin|
-    admin.resources :blog_posts, :collection => {:update_positions => :post}
+    admin.namespace :blog do |blog|
+      blog.resources :posts, :collection => {:update_positions => :post}
+    end
   end
 end
diff --git a/rails/init.rb b/rails/init.rb
index 1877664..13abf82 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,7 +1,7 @@
 Refinery::Plugin.register do |plugin|
   plugin.name = "refinerycms_blog"
-  plugin.url = {:controller => '/admin/blog_posts', :action => 'index'}
-  plugin.menu_match = /^\/?(admin|refinery)\/blog_(posts|comments|categories)/
+  plugin.url = {:controller => '/admin/blog/posts', :action => 'index'}
+  plugin.menu_match = /^\/?(admin|refinery)\/blog\/?(posts|comments|categories)?/
   plugin.activity = {
     :class => BlogPost
   }
-- 
cgit v1.2.3