X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c02cd4b5fe5ccdb8e25f8401b3e89b7c2c13cee..0d16fd57d46a4aaa1c170d79772e549bfadf288a:/app/views/site/index.rhtml?ds=inline diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index ea756829e..3bccb7e04 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,101 +1,183 @@ -<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> - -
- -<% if params['mlon'] and params['mlat'] %> -<% marker = true %> -<% mlon = params['mlon'] %> -<% mlat = params['mlat'] %> -<% 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'] %> +<% content_for :greeting do %> +<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> +<%= link_to_function t('site.index.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> | <% end %> - -<% if params['lon'] and params['lat'] %> -<% lon = params['lon'] %> -<% lat = params['lat'] %> -<% zoom = params['zoom'] || '5' %> -<% layers = params['layers'] %> -<% elsif params['mlon'] and params['mlat'] %> -<% lon = params['mlon'] %> -<% lat = params['mlat'] %> -<% zoom = params['zoom'] || '12' %> -<% layers = params['layers'] %> -<% elsif cookies.key?("location") %> -<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %> -<% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> -<% lon = @user.home_lon %> -<% lat = @user.home_lat %> -<% zoom = '10' %> -<% else %> -<% lon = '-0.1' %> -<% lat = '51.5' %> -<% zoom = params['zoom'] || '5' %> -<% layers = params['layers'] %> <% end %> - +<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'key' %> +<%= render :partial => 'search' %> + + + +
+ +
+ +
+ + + + + + + + +
http://creativecommons.org/licenses/by-sa/2.0/http://openstreetmap.org/
<%= t 'site.index.license' %>
+
+ +<% +if params['mlon'] and params['mlat'] + marker = true + mlon = h(params['mlon']) + mlat = h(params['mlat']) +end + +if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] + bbox = true + minlon = h(params['minlon']) + minlat = h(params['minlat']) + maxlon = h(params['maxlon']) + maxlat = h(params['maxlat']) + box = true if params['box']=="yes" +end + +# Decide on a lat lon to initialise the map with. Various ways of doing this +if params['lon'] and params['lat'] + lon = h(params['lon']) + lat = h(params['lat']) + zoom = h(params['zoom'] || '5') + layers = h(params['layers']) + +elsif params['mlon'] and params['mlat'] + lon = h(params['mlon']) + lat = h(params['mlat']) + zoom = h(params['zoom'] || '12') + layers = h(params['layers']) + +elsif cookies.key?("_osm_location") + lon,lat,zoom,layers = cookies["_osm_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 + 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 = h(params['zoom'] || '5') + end + layers = h(params['layers']) +end +%> + +<%= javascript_include_tag '/openlayers/OpenLayers.js' %> +<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> <%= javascript_include_tag 'map.js' %> -