From 9e32624fde8b2c431322189e96bb19c23f5a3b18 Mon Sep 17 00:00:00 2001
From: Markus Graf <info@markusgraf.ch>
Date: Thu, 21 Apr 2016 21:01:26 +0200
Subject: [PATCH] fixed

---
 app/controllers/admin/application_controller.rb |  6 ++----
 app/controllers/admin/pages_controller.rb       |  2 +-
 app/controllers/admin/supporters_controller.rb  |  2 +-
 config/routes.rb                                | 13 +++++++------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
index 4de6421..e4a7f9c 100644
--- a/app/controllers/admin/application_controller.rb
+++ b/app/controllers/admin/application_controller.rb
@@ -1,5 +1,3 @@
-module Admin
-  class ApplicationController < ApplicationController
-    http_basic_authenticate_with name: 'admin', password: ENV['ADMIN_PASSWORD'] unless Rails.env.development?
-  end
+class Admin::ApplicationController < ApplicationController
+  http_basic_authenticate_with name: 'admin', password: ENV['ADMIN_PASSWORD'] unless Rails.env.development?
 end
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
index 05b80ad..addb77d 100644
--- a/app/controllers/admin/pages_controller.rb
+++ b/app/controllers/admin/pages_controller.rb
@@ -1,4 +1,4 @@
-class PagesController < Admin::ApplicationController
+class Admin::PagesController < Admin::ApplicationController
   def map
     @supporters = Supporter.where(:coordinates.ne => nil).only(:coordinates, :support)
   end
diff --git a/app/controllers/admin/supporters_controller.rb b/app/controllers/admin/supporters_controller.rb
index 58b1209..03f4af2 100644
--- a/app/controllers/admin/supporters_controller.rb
+++ b/app/controllers/admin/supporters_controller.rb
@@ -1,4 +1,4 @@
-class SupportersController < Admin::ApplicationController
+class Admin::SupportersController < Admin::ApplicationController
   def index
     @supporters = Supporter.desc(:created_at)
   end
diff --git a/config/routes.rb b/config/routes.rb
index 31f5d3f..e39ce37 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,12 @@
 Rails.application.routes.draw do
   root 'supporters#new'
+  
+  namespace :admin do
+    get '/map', to: 'pages#map', as: :map
+
+    resources :supporters, only: :index
+  end
+  
   scope '/:locale' do
     get '/', to: 'supporters#new'
     resources :supporters
@@ -8,10 +15,4 @@ Rails.application.routes.draw do
   end
 
   get '/cities_autocomplete', to: 'cities_autocomplete#index', as: :cities_autocomplete
-
-  namespace :admin do
-    get '/map', to: 'pages#map', as: :map
-
-    resources :supporters, only: :index
-  end
 end