Skip to content

Commit

Permalink
fix some css
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien Gruhier committed May 14, 2012
1 parent f9b4d35 commit 535434e
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 50 deletions.
6 changes: 5 additions & 1 deletion app/controllers/map_controller.rb
@@ -1,7 +1,11 @@
class MapController < ApplicationController
include BBPHealth::Clustering

def clusterize
render :json => clusterize_response(params), :callback => params[:callback]
end

def select
render :json => {markers: [{html: 'TODO'}]}, :callback => params[:callback]
end
end
2 changes: 2 additions & 0 deletions app/views/layouts/application.html.erb
Expand Up @@ -5,6 +5,8 @@
<!-- <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Convergence|Open+Sans"> -->
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
<%= stylesheet_link_tag "application", "vendor" %>
<!--[if lte IE 8]><link rel="stylesheet" href="/leaflet.ie.css" /><![endif]-->

<%= csrf_meta_tags %>
<%= yield :head %>
</head>
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
Expand Up @@ -24,4 +24,5 @@
end

get '/map/1/clusterize' => 'map#clusterize'
get '/map/1/select' => 'map#select'
end
2 changes: 1 addition & 1 deletion db/seeds.rb
Expand Up @@ -10,7 +10,7 @@
m.user = user
m.save!

effects = %["mal au dos", "fatigue", "vomissement"]
effects = ["mal au dos", "fatigue", "vomissement"]
1.upto(10) do
m.prescriptions.create! lat: 46 + 2 + rand(100)/100.0, lng: 0 + 2 + rand(100)/100.0, secondary_effects: effects[rand(effects.length)]
end
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/clusterV3.css
Expand Up @@ -78,7 +78,7 @@
/* Info Window */
.maptimize_window {
width: 200px;
height: 200px;
height: 75px;
overflow: auto;
}

2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/leaflet.css
Expand Up @@ -269,5 +269,5 @@ a.leaflet-active {
font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;
}
.leaflet-popup-close-button {
background: white url(images/popup-close.png);
background: white url(/assets/popup-close.png);
}
46 changes: 0 additions & 46 deletions vendor/assets/stylesheets/leaflet.ie.css

This file was deleted.

0 comments on commit 535434e

Please sign in to comment.