From 400d07c0c128f0c0ce7db9e892251ea8532134b0 Mon Sep 17 00:00:00 2001
From: Nico <info@nicolasbally.com>
Date: Tue, 8 Jan 2013 23:55:59 +0100
Subject: [PATCH] magick encoding

---
 app/views/devise/sessions/new.html.erb | 4 ++--
 config/database.yml                    | 2 +-
 config/environments/production.rb      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 83bf324..4cbfba5 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,8 +1,8 @@
 <h2>Sign in</h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :username %><br />
-	  <%= f.text_field :username %></div>
+  <div><%= f.label :login %><br />
+	  <%= f.text_field :login %></div>
 
   <div><%= f.label :password %><br />
   <%= f.password_field :password %></div>
diff --git a/config/database.yml b/config/database.yml
index 93e4d7f..995f03b 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -10,7 +10,7 @@ development:
   database: pic_vert
   pool: 5
   username: root
-#  password: dev
+  password: dev
   socket: /tmp/mysql.sock 
 
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8390600..c6f0ff5 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -49,7 +49,7 @@ Survey::Application.configure do
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w( topics.js topics.css )
+  config.assets.precompile += %w( admin.js admin.css topics.js topics.css )
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false