Fixed namespacing for Refinery conventions.

16 files changed, 47 insertions, 54 deletions

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f7ed37c..400aa8a 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -3,8 +3,8 @@ bg:
     plugins:
       refinerycms_blog:
         title: Блог
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Редактиране на тази категория
@@ -80,7 +80,6 @@ bg:
             moderation: Модерация
             update_notified: Получатели на уведомления
             comments: Коментари
-    blog:
       comment_mailer:
         notification:
           greeting: Здравейте
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 10f02b6..28b0fb4 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -3,8 +3,8 @@ cs:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Upravit kategorii
@@ -76,7 +76,6 @@ cs:
             moderation: Moderování
             update_notified: Upravit seznam notifikovaných
             comments: Komentáře
-    blog:
       comment_mailer:
         notification:
           greeting: Ahoj
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7b96846..30cdc54 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3,8 +3,8 @@ de:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Diese Kategorie bearbeiten
@@ -76,7 +76,6 @@ de:
             moderation: Moderation
             update_notified: Empfänger für Benachrichtigungen bearbeiten
             comments: Kommentare
-    blog:
       comment_mailer:
         notification:
           greeting: Hallo
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3aa2b68..64d4064 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,8 +3,8 @@ en:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Edit this category
@@ -83,7 +83,6 @@ en:
             update_notified: Update who gets notified
             comments: Comments
             teasers: Teasers
-    blog:
       comment_mailer:
         notification:
           greeting: Hi there
@@ -143,7 +142,7 @@ en:
           posts_tagged: Posts tagged
         archive:
           blog_archive_for: 'Archive for %{date}'
-          no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'  
+          no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'
   activerecord:
     models:
       refinery/blog_category: Category
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fb22854..8c275a7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3,8 +3,8 @@ es:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Editar esta categoría
@@ -76,7 +76,6 @@ es:
             moderation: Moderación
             update_notified: '¿Quién recibe las notificaciones?'
             comments: Comentarios
-    blog:
       comment_mailer:
         notification:
           greeting: Hola
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 33027da..661dd9f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3,8 +3,8 @@ fr:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Modifier cette catégorie
@@ -76,7 +76,6 @@ fr:
             moderation: Modération
             update_notified: Mettre à jour les personnes à notifier
             comments: Commentaires
-    blog:
       comment_mailer:
         notification:
           greeting: Bonjour
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 58cc41c..11fa53a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -3,8 +3,8 @@ it:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Modifica questa categoria
@@ -80,7 +80,6 @@ it:
             moderation: Moderazione
             update_notified: Aggiornare i destinatari delle notifiche
             comments: Commenti
-    blog:
       comment_mailer:
         notification:
           greeting: Ciao
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 65508ce..1ffd25f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -3,8 +3,8 @@ ja:
     plugins:
       refinerycms_blog:
         title: ブログ
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: このカテゴリを編集
@@ -80,7 +80,6 @@ ja:
             moderation: 管理する
             update_notified: 通知者を変更・更新する
             comments: コメント
-    blog:
       comment_mailer:
         notification:
           greeting: こんにちわ
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 891ea13..5ee8057 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -3,8 +3,8 @@ nb:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         posts:
           form:
             seo_override_title: Nettleser tittel
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ec3edd9..6842d4a 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3,8 +3,8 @@ nl:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Bewerk deze categorie
@@ -77,7 +77,6 @@ nl:
             update_notified: Wijzig wie notificaties ontvangt
             comments: Reacties
             teasers: Teasers
-    blog:
       comment_mailer:
         notification:
           greeting: Hallo
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6423d22..ade7e83 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3,8 +3,8 @@ pl:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Edytuj tą kategorię
@@ -76,7 +76,6 @@ pl:
             moderation: Wł./wył. moderację
             update_notified: Powiadamianie przez e-mail
             comments: Komentarze
-    blog:
       comment_mailer:
         notification:
           greeting: Witaj:)
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index bf5f914..f5fe701 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -3,8 +3,8 @@ pt-BR:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Editar esta categoria
@@ -76,7 +76,6 @@ pt-BR:
             moderation: Moderação
             update_notified: Quem receberá a notificação?
             comments: Comentários
-    blog:
       comment_mailer:
         notification:
           greeting: Olá
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index acde9a9..b6d9d0b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3,8 +3,8 @@ ru:
     plugins:
       refinerycms_blog:
         title: Блог
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Редактировать эту категорию
@@ -76,7 +76,6 @@ ru:
             moderation: Модерирование
             update_notified: Настроить уведомления
             comments: Комментарии
-    blog:
       comment_mailer:
         notification:
           greeting: Здравствуйте
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index d90333f..99888af 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -3,8 +3,8 @@ sk:
     plugins:
       refinerycms_blog:
         title: Blog
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: Upraviť kategóriu
@@ -76,7 +76,6 @@ sk:
             moderation: Moderovanie
             update_notified: Upraviť zoznam notifikovaných
             comments: Komentáre
-    blog:
       comment_mailer:
         notification:
           greeting: Ahoj
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7d94e4a..894140d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -3,8 +3,8 @@ zh-CN:
     plugins:
       refinerycms_blog:
         title: 博客
-    admin:
-      blog:
+    blog:
+      admin:
         categories:
           category:
             edit: 编辑此类别
@@ -76,7 +76,6 @@ zh-CN:
             moderation: 等待审核
             update_notified: 更新获得通知的人
             comments: 评论
-    blog:
       comment_mailer:
         notification:
           greeting: 您好
diff --git a/config/routes.rb b/config/routes.rb
index 353d0b8..aa8151e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,16 +1,23 @@
 Rails.application.routes.draw do
-  scope(:module => 'refinery') do
-    scope(:path => 'blog', :module => 'blog') do
-      root :to => 'posts#index', :as => 'blog_root'
-      match 'feed.rss', :to => 'posts#index', :as => 'blog_rss_feed', :defaults => {:format => "rss"}
-      match ':id', :to => 'posts#show', :as => 'blog_post'
-      match 'categories/:id', :to => 'categories#show', :as => 'blog_category'
-      match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'
+  namespace :refinery, :path => '' do
+    namespace :blog do
+      root :to => "posts#index"
+
+      resources :posts, :only => [:show]
+
+      match 'feed.rss', :to => 'posts#index', :as => 'rss_feed', :defaults => {:format => "rss"}
+      match 'categories/:id', :to => 'categories#show', :as => 'category'
+      match ':id/comments', :to => 'posts#comment', :as => 'comments'
       get 'archive/:year(/:month)', :to => 'posts#archive', :as => 'archive_blog_posts'
       get 'tagged/:tag_id(/:tag_name)' => 'posts#tagged', :as => 'tagged_posts'
+    end
+  end
+
+  namespace :refinery do
+    namespace :blog do
+      namespace :admin, :path =>'' do
+        root :to => "posts#index"
 
-      scope(:path => 'refinery', :as => 'refinery_admin', :module => 'admin') do
-        root :to => 'posts#index'
         resources :posts do
           collection do
             get :uncategorized