agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

La carte s'affiche mieux centrée

Browse Source
This commit is contained in:
echarp 2014-07-31 19:34:56 +02:00
parent 612b3f498a
commit 66e5d5d5cc
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/maps.js.coffee
View File

@ -1,6 +1,6 @@
$(document).ready -> $(document).ready ->
if $('#map').size() > 0 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', L.tileLayer('https://{s}.tiles.mapbox.com/v3/{id}/{z}/{x}/{y}.png',
id: 'examples.map-i86knfo3', id: 'examples.map-i86knfo3',
@ -10,8 +10,6 @@ $(document).ready ->
).addTo map ).addTo map
$.getJSON '/maps.json', (json) -> $.getJSON '/maps.json', (json) ->
map.setView [45, 6], 6
L.geoJson(json, L.geoJson(json,
onEachFeature: (feature, layer) -> onEachFeature: (feature, layer) ->
# Does this feature have a property named popupContent? # Does this feature have a property named popupContent?

3
app/assets/stylesheets/maps.css.sass
View File

@ -1,2 +1,5 @@
@import "compass"
#map #map
height: 60em height: 60em
@include transition-duration(0)

5
app/models/user.rb
View File

@ -17,9 +17,7 @@ class User < ActiveRecord::Base
end end
def self.find_first_by_auth_conditions(warden_conditions) def self.find_first_by_auth_conditions(warden_conditions)
logger.info 'XXXXXXXXX'
conditions = warden_conditions.dup conditions = warden_conditions.dup
logger.info conditions
if login = conditions.delete(:login) if login = conditions.delete(:login)
where(conditions).where(["login = :value", { value: login }]).first where(conditions).where(["login = :value", { value: login }]).first
else else
@ -29,9 +27,6 @@ class User < ActiveRecord::Base
def valid_password?(password) def valid_password?(password)
encrypted_password == password_digest(password) encrypted_password == password_digest(password)
logger.info 'XXXXXXXXX'
logger.info encrypted_password
logger.info password_digest(password)
end end
def to_s def to_s