La carte s'affiche mieux centrée
This commit is contained in:
parent
612b3f498a
commit
66e5d5d5cc
@ -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?
|
||||
|
@ -1,2 +1,5 @@
|
||||
@import "compass"
|
||||
|
||||
#map
|
||||
height: 60em
|
||||
@include transition-duration(0)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user