X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6cd8db7bff35f8b401eb904e4c24936d8fc09a0a..4424cd5b947432848fe7f5bc7518fd1b718ecf6c:/app/views/site/edit.rhtml diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml index ecb977656..ac54cb5e5 100644 --- a/app/views/site/edit.rhtml +++ b/app/views/site/edit.rhtml @@ -1,52 +1,77 @@ -<% if API_READONLY %> +<% if API_STATUS == :offline %> +
The OpenStreetMap database is currently offline while + essential database maintenance work is carried out. +
+<% elsif API_STATUS == :readonly %>The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
+<% elsif !@user.data_public? %> +You haven't set your edits to be public.
+You can't use the online editor unless you do so. You can set your edits as public from your +<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name}%>.
+(Find out why this is the case.)
<% else %> <% content_for :greeting do %> -<% if !@user.home_lon.nil? and !@user.home_lat.nil? %> +<% 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 %> -<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'search' %> <% session[:token] = @user.tokens.create.token unless session[:token] %> <% if params['mlon'] and params['mlat'] %> -<% lon = params['mlon'] %> -<% lat = params['mlat'] %> -<% zoom = params['zoom'] || '12' %> -<% elsif @user and params['lon'].nil? and params['lat'].nil? %> -<% lon = @user.home_lon %> -<% lat = @user.home_lat %> -<% zoom = '12' %> -<%else%> -<% lon = params['lon'] || '-0.1' %> -<% lat = params['lat'] || '51.5' %> -<% zoom = params['zoom'] || '12' %> + <% lon = h(params['mlon']) %> + <% lat = h(params['mlat']) %> + <% zoom = h(params['zoom'] || '14') %> +<% elsif @user and params['lon'].nil? and params['lat'].nil? and params['gpx'].nil? %> + <% lon = @user.home_lon %> + <% lat = @user.home_lat %> + <% zoom = '14' %> +<% else %> + <% lon = h(params['lon'] || 'null') %> + <% lat = h(params['lat'] || 'null') %> + <% zoom = h(params['zoom'] || '14') %> <% end %> -