From 66e5d5d5cca3a6a20422a0d3b68dea9a9a34e2eb Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Thu, 31 Jul 2014 19:34:56 +0200
Subject: [PATCH] =?UTF-8?q?La=20carte=20s'affiche=20mieux=20centr=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/maps.js.coffee | 4 +---
 app/assets/stylesheets/maps.css.sass  | 3 +++
 app/models/user.rb                    | 5 -----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/maps.js.coffee b/app/assets/javascripts/maps.js.coffee
index 5a73f886..cb8cce7f 100644
--- a/app/assets/javascripts/maps.js.coffee
+++ b/app/assets/javascripts/maps.js.coffee
@@ -1,6 +1,6 @@
 $(document).ready ->
   if $('#map').size() > 0
-    map = L.map('map')
+    map = L.map('map').setView [46.5, 4], 6
 
     L.tileLayer('https://{s}.tiles.mapbox.com/v3/{id}/{z}/{x}/{y}.png',
       id: 'examples.map-i86knfo3',
@@ -10,8 +10,6 @@ $(document).ready ->
     ).addTo map
 
     $.getJSON '/maps.json', (json) ->
-      map.setView [45, 6], 6
-
       L.geoJson(json,
         onEachFeature: (feature, layer) ->
           # Does this feature have a property named popupContent?
diff --git a/app/assets/stylesheets/maps.css.sass b/app/assets/stylesheets/maps.css.sass
index fdfccb5a..822df358 100644
--- a/app/assets/stylesheets/maps.css.sass
+++ b/app/assets/stylesheets/maps.css.sass
@@ -1,2 +1,5 @@
+@import "compass"
+
 #map
   height: 60em
+  @include transition-duration(0)
diff --git a/app/models/user.rb b/app/models/user.rb
index faea21dc..33eda7e7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,9 +17,7 @@ class User < ActiveRecord::Base
   end
 
   def self.find_first_by_auth_conditions(warden_conditions)
-    logger.info 'XXXXXXXXX'
     conditions = warden_conditions.dup
-    logger.info conditions
     if login = conditions.delete(:login)
       where(conditions).where(["login = :value", { value: login }]).first
     else
@@ -29,9 +27,6 @@ class User < ActiveRecord::Base
 
   def valid_password?(password)
     encrypted_password == password_digest(password)
-    logger.info 'XXXXXXXXX'
-    logger.info encrypted_password
-    logger.info password_digest(password)
   end
 
   def to_s