X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5898b494df440ba9659ac8fbe2e150285a9a85a6..e7cd90f4b4d431b32a92ca68c3df817e8e765d09:/app/views/site/edit.html.erb diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index 779abd352..a9b915faf 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -1,7 +1,7 @@ -<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %> +<% if STATUS == :database_offline or STATUS == :api_offline %>
<%= t 'layouts.osm_offline' %>
-<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %> +<% elsif STATUS == :database_readonly or STATUS == :api_readonly %><%= t 'layouts.osm_read_only' %>
<% elsif !@user.data_public? %> @@ -19,78 +19,9 @@ <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> <%= render :partial => 'search' %> -<% -session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) +<%= render :partial => preferred_editor %> -# Decide on a lat lon to initialise potlatch with. Various ways of doing this -if params['lon'] and params['lat'] - lon = h(params['lon']) - lat = h(params['lat']) - zoom = h(params['zoom']) - -elsif params['mlon'] and params['mlat'] - lon = h(params['mlon']) - lat = h(params['mlat']) - zoom = h(params['zoom']) - -elsif params['gpx'] - #use gpx id to locate (dealt with below) - -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 - -else - #catch all. Do nothing. lat=nil, lon=nil - #Currently this results in potlatch starting up at 0,0 (Atlantic ocean). -end - -zoom='14' if zoom.nil? -%> - -