Showing all messages in inbox, but sorting by date DESC and highlighting new ones...

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index dc488089dc1c7d6b5390ba27a5d261b37389dfcc..08cbfaedaac8f0e01b7c9a79d06b73dedc791788 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,3 +1,7 @@
+<% content_for :left_menu do %>
+<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>
+<% end %>
+

 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 
 <div id="map"></div> 
 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 
 <div id="map"></div> 


@@ -33,11 +37,20 @@
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% else %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% else %>

+<% session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] %>
+<% if session[:location] %>
+<% bbox = true %>
+<% minlon = session[:location][:minlon] %>
+<% minlat = session[:location][:minlat] %>
+<% maxlon = session[:location][:maxlon] %>
+<% maxlat = session[:location][:maxlat] %>
+<% else %>

 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  params['zoom'] || '5' %>
 <% layers = params['layers'] %>
 <% end %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
 <% zoom =  params['zoom'] || '5' %>
 <% layers = params['layers'] %>
 <% end %>

+<% end %>

 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>


@@ -91,7 +104,7 @@
     if (marker)
       removeMarkerFromMap(marker);
 
     if (marker)
       removeMarkerFromMap(marker);
 

-    marker = addMarkerToMap(centre);
+    marker = addMarkerToMap(centre, getArrowIcon());

   }
 
   function updateLocation() {
   }
 
   function updateLocation() {