aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2012-04-12 18:13:24 +0200
committerLuc Donnet2012-04-12 18:13:24 +0200
commitf9dff8ab5c5eb02dc42c09b188771940d75df0a3 (patch)
tree1b177c2f33e38369abaf52f0c46d632b1eff1728
parent674233635870f25382b7569b5df354b6a97634a2 (diff)
downloadchouette-core-f9dff8ab5c5eb02dc42c09b188771940d75df0a3.tar.bz2
Add area type picto for index
-rw-r--r--app/assets/stylesheets/stop_areas.css.scss12
-rw-r--r--app/maps/stop_area_map.rb4
-rw-r--r--app/views/stop_areas/_stop_area.html.erb5
3 files changed, 21 insertions, 0 deletions
diff --git a/app/assets/stylesheets/stop_areas.css.scss b/app/assets/stylesheets/stop_areas.css.scss
index 046066b9f..1f1624dd7 100644
--- a/app/assets/stylesheets/stop_areas.css.scss
+++ b/app/assets/stylesheets/stop_areas.css.scss
@@ -98,6 +98,18 @@
float: left;
padding-right: 10px;
+ .area_type {
+ width: 25px;
+ height: 64px;
+ float: left;
+ margin-right: 10px;
+
+
+ a {
+ text-decoration: none;
+ }
+ }
+
}
}
diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb
index a07a236bd..e0735e0a4 100644
--- a/app/maps/stop_area_map.rb
+++ b/app/maps/stop_area_map.rb
@@ -13,6 +13,10 @@ class StopAreaMap < ApplicationMap
def map
@map ||= MapLayers::Map.new(id, :projection => projection("EPSG:900913"), :controls => controls) do |map, page|
page << map.add_layer(MapLayers::OSM_MAPNIK)
+ page << map.add_layer(google_physical)
+ page << map.add_layer(google_streets)
+ page << map.add_layer(google_hybrid)
+ page << map.add_layer(google_satellite)
page.assign "edit_stop_area_layer", kml_layer( polymorphic_path( [referential, stop_area], :format => :kml, :default => editable?), :style_map => StyleMap::StopAreasStyleMap.new.style_map)
page << map.add_layer(:edit_stop_area_layer)
diff --git a/app/views/stop_areas/_stop_area.html.erb b/app/views/stop_areas/_stop_area.html.erb
index be230c931..4e1feae9d 100644
--- a/app/views/stop_areas/_stop_area.html.erb
+++ b/app/views/stop_areas/_stop_area.html.erb
@@ -1,4 +1,9 @@
<%= div_for(stop_area) do %>
+ <%= link_to([@referential, stop_area], :class => "preview") do %>
+ <div class="area_type">
+ <%= image_tag "map/" + stop_area.area_type.to_s.downcase + ".png" %>
+ </div>
+ <% end %>
<%= link_to stop_area.name, [@referential, stop_area] %>
<div class="info">
<p>