Automatically convert links in diary postings into HTML links.

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 000df6c1a9eeba13b33b3e88f531832debd76c9c..604ecdb326a97659ab584eeec9d080992825f62c 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,54 +1,86 @@
-<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<% content_for :greeting do %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+<% end %>

 
 

-<div id="map"></div> 
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
+
+<div id="map">
+<div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
+</div> 
+
+<div id="attribution">
+<table width="100%">
+<tr>
+<td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
+<td align="right">http://openstreetmap.org/</td>
+</tr>
+<tr>
+<td colspan="2" align="center">
+Licensed under the Creative Commons Attribution-Share Alike 2.0 license
+by the OpenStreetMap project and it's contributors.
+</td>
+</table>
+</div>

 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>

-<% mlon = params['mlon'] %> 
-<% mlat = params['mlat'] %>
+<% mlon = h(params['mlon']) %> 
+<% mlat = h(params['mlat']) %>

 <% end %>
 
 <% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
 <% bbox = true %>
 <% end %>
 
 <% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
 <% bbox = true %>

-<% minlon = params['minlon'] %>
-<% minlat = params['minlat'] %>
-<% maxlon = params['maxlon'] %>
-<% maxlat = params['maxlat'] %>
+<% minlon = h(params['minlon']) %>
+<% minlat = h(params['minlat']) %>
+<% maxlon = h(params['maxlon']) %>
+<% maxlat = h(params['maxlat']) %>

 <% end %>
 
 <% if params['lon'] and params['lat'] %>
 <% end %>
 
 <% if params['lon'] and params['lat'] %>

-<% lon =  params['lon'] %>
-<% lat =  params['lat'] %>
-<% zoom =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
+<% lon =  h(params['lon']) %>
+<% lat =  h(params['lat']) %>
+<% zoom =  h(params['zoom'] || '5') %>
+<% layers = h(params['layers']) %>

 <% elsif params['mlon'] and params['mlat'] %>
 <% elsif params['mlon'] and params['mlat'] %>

-<% lon = params['mlon'] %> 
-<% lat = params['mlat'] %>
-<% zoom =  params['zoom'] || '12' %>
-<% layers = params['layers'] %>
+<% lon = h(params['mlon']) %> 
+<% lat = h(params['mlat']) %>
+<% zoom =  h(params['zoom'] || '12') %>
+<% layers = h(params['layers']) %>

 <% elsif cookies.key?("location") %>
 <% elsif cookies.key?("location") %>

-<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% lon,lat,zoom,layers = cookies["location"].split(",") %>

 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% else %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% 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' %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>

-<% zoom =  params['zoom'] || '5' %>
-<% layers = params['layers'] %>
+<% zoom =  h(params['zoom'] || '5') %>
+<% layers = h(params['layers']) %>
+<% end %>

 <% end %>
 
 <% end %>
 

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

 <%= javascript_include_tag 'map.js' %>
 
 <%= javascript_include_tag 'map.js' %>
 

-<% unless @user %>
-<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
-<% end %>

 
 <script type="text/javascript">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
 
 <script type="text/javascript">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;

+  var marker;

   var map;
 
   function init(){
   var map;
 
   function init(){


@@ -71,32 +103,36 @@
     map.setCenter(centre, zoom);
     <% end %>
 
     map.setCenter(centre, zoom);
     <% end %>
 

-    <% if marker %>
-    addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
-    <% end %>
-

     <% if layers %>
     setMapLayers("<%= layers %>");
     <% end %>
 
     <% if layers %>
     setMapLayers("<%= layers %>");
     <% end %>
 

+    <% if marker %>
+    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    <% end %>
+
+    map.events.register("zoomend", map, updateKey);
+

     map.events.register("moveend", map, updateLocation);
     map.events.register("moveend", map, updateLocation);

+    map.events.register("changelayer", map, updateLocation);

     updateLocation();
 
     updateLocation();
 

-    <% unless @user %>
-    if ( window.location.hostname == "www.openstreetmap.org" ) { 
-      mappam.register( map, '10011756636067178496', '1');
-    } else if( window.location.hostname == "openstreetmap.org" ) {
-      mappam.register( map, '6738410720121976832', '1');
-    }
-    <% end %>
-

     handleResize();
   }
 
     handleResize();
   }
 

+  function getPosition() {
+    return mercatorToLonLat(map.getCenter());
+  }
+

   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
     map.setCenter(centre, zoom);
   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
     map.setCenter(centre, zoom);

+
+    if (marker)
+      removeMarkerFromMap(marker);
+
+    marker = addMarkerToMap(centre, getArrowIcon());

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


@@ -121,14 +157,14 @@
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();

-    var search_results_width = $("search_results").offsetWidth;
+    var sidebar_width = $("sidebar").offsetWidth;

 
 

-    if (search_results_width > 0) {
-      search_results_width = search_results_width + 5
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5

     }
 
     }
 

-    $("map").style.left = (search_results_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
+    $("map").style.left = (sidebar_width) + "px";
+    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";

     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);
     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);