From 5ef14149793f8b199549c789b6d144920be9744a Mon Sep 17 00:00:00 2001
From: Wojciech Todryk <wojciech@todryk.pl>
Date: Fri, 22 Jul 2011 21:58:59 +0200
Subject: [PATCH] change core controller to user

---
 app/controllers/{core_controller.rb => user_controller.rb} | 2 +-
 app/helpers/core_helper.rb                                 | 2 --
 app/helpers/user_helper.rb                                 | 2 ++
 config/routes.rb                                           | 6 +++---
 themes/olive/views/core/logout.html.erb                    | 2 --
 themes/olive/views/{core => user}/login.html.erb           | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)
 rename app/controllers/{core_controller.rb => user_controller.rb} (81%)
 delete mode 100644 app/helpers/core_helper.rb
 create mode 100644 app/helpers/user_helper.rb
 delete mode 100644 themes/olive/views/core/logout.html.erb
 rename themes/olive/views/{core => user}/login.html.erb (95%)

diff --git a/app/controllers/core_controller.rb b/app/controllers/user_controller.rb
similarity index 81%
rename from app/controllers/core_controller.rb
rename to app/controllers/user_controller.rb
index 5b51e6e..da1198b 100644
--- a/app/controllers/core_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,4 +1,4 @@
-class CoreController < ApplicationController
+class UserController < ApplicationController
 
   theme :theme_resolver
   layout "simple"
diff --git a/app/helpers/core_helper.rb b/app/helpers/core_helper.rb
deleted file mode 100644
index 1e2635d..0000000
--- a/app/helpers/core_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module CoreHelper
-end
diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
new file mode 100644
index 0000000..0147c3f
--- /dev/null
+++ b/app/helpers/user_helper.rb
@@ -0,0 +1,2 @@
+module UserHelper
+end
diff --git a/config/routes.rb b/config/routes.rb
index aa8dc28..346dd05 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,9 +2,9 @@ Mailr::Application.routes.draw do
 
 	themes_for_rails
 
-	get "core/login"
-	get "core/logout"
-	post "core/authenticate"
+	get "user/login"
+	get "user/logout"
+	post "user/authenticate"
 
 
   # The priority is based upon order of creation:
diff --git a/themes/olive/views/core/logout.html.erb b/themes/olive/views/core/logout.html.erb
deleted file mode 100644
index 6abeb59..0000000
--- a/themes/olive/views/core/logout.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Core#logout</h1>
-<p>Find me in app/views/core/logout.html.erb</p>
diff --git a/themes/olive/views/core/login.html.erb b/themes/olive/views/user/login.html.erb
similarity index 95%
rename from themes/olive/views/core/login.html.erb
rename to themes/olive/views/user/login.html.erb
index 51b027b..4ff69b7 100755
--- a/themes/olive/views/core/login.html.erb
+++ b/themes/olive/views/user/login.html.erb
@@ -11,7 +11,7 @@
 			<div class="message notice"><p><%= flash[:notice] %></p></div>
 		<% end %>
 		</div>
-	<form action="<%=url_for(:controller => 'core', :action => 'authenticate')%>" method="post" class="form login">
+	<form action="<%=url_for(:controller => 'user', :action => 'authenticate')%>" method="post" class="form login">
 		<div class="group wat-cf">
 			<div class="left">
                 <label class="label right"><%= t(:email) %></label>