X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/397db07d65eec20de92f8c5220a4d41fc7d7ae7b..9a7e246102f3e40471d2f5e5ed1fbf4a3f50ba94:/app/views/site/edit.rhtml diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml index 08d6133c4..c72a3ab1d 100644 --- a/app/views/site/edit.rhtml +++ b/app/views/site/edit.rhtml @@ -1,22 +1,44 @@ -<% 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 %> -<%= 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 %> + +<%= 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 = 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 = '12' %> -<%else%> -<% lon = params['lon'] || '-0.1' %> -<% lat = params['lat'] || '51.5' %> -<% zoom = params['zoom'] || '12' %> +<% zoom = '14' %> +<% elsif params['gpx'].nil? %> +<% lon = h(params['lon'] || '-0.1') %> +<% lat = h(params['lat'] || '51.5') %> +<% zoom = h(params['zoom'] || '14') %> +<% else %> +<% lon = nil %> +<% lat = nil %> +<% zoom = '14' %> <% end %>
You need a Flash player to use Potlatch, the @@ -25,20 +47,33 @@ Several other options are also available for editing OpenStreetMap.
- - <% end %>