From 101477c7daa18e9a8d33bb6c6de6e79dfc60a84d Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Fri, 14 Aug 2015 13:33:30 +0200
Subject: [PATCH] refactors admin layout

---
 app/helpers/admin_helper.rb                      | 10 ++++++++--
 app/views/admin/{shared => }/_menu.html.erb      |  0
 app/views/layouts/admin.html.erb                 |  2 +-
 app/views/moderation/{shared => }/_menu.html.erb |  0
 config/locales/es.yml                            |  2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename app/views/admin/{shared => }/_menu.html.erb (100%)
 rename app/views/moderation/{shared => }/_menu.html.erb (100%)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index f95a14b9f..a7fef3aa2 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -1,7 +1,13 @@
 module AdminHelper
 
-  def namespace
-    controller.class.parent.name.downcase
+  def side_menu
+    render "/#{namespace}/menu"
   end
 
+  private
+
+    def namespace
+      controller.class.parent.name.downcase
+    end
+
 end
\ No newline at end of file
diff --git a/app/views/admin/shared/_menu.html.erb b/app/views/admin/_menu.html.erb
similarity index 100%
rename from app/views/admin/shared/_menu.html.erb
rename to app/views/admin/_menu.html.erb
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 598ca47fb..b23b3e193 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -24,7 +24,7 @@
     <% end %>
 
     <div class="left" style="padding:50px;">
-      <%= render "/#{namespace}/shared/menu" %>
+      <%= side_menu %>
     </div>
 
     <%= yield %>
diff --git a/app/views/moderation/shared/_menu.html.erb b/app/views/moderation/_menu.html.erb
similarity index 100%
rename from app/views/moderation/shared/_menu.html.erb
rename to app/views/moderation/_menu.html.erb
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 44f91be77..df82dae91 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -12,7 +12,7 @@ es:
       see_all_debates: Ver todos los debates
       my_account_link: Mi cuenta
       language: Idioma de la página
-      administration: Admininstar
+      administration: Administar
       moderation: Moderar
     footer:
       copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados"