X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..080d347d8fb55534bcd0ac8dafd61479d0401dc8:/app/views/site/edit.html.erb?ds=sidebyside diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index 51389afc1..84de92954 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -1,150 +1,58 @@ -<% 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? %><%= t 'site.edit.not_public' %>
-<%= t 'site.edit.not_public_description', -:user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>
-<%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>
+<%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>
+<%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>
<% else %> <% 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)" %> | +<%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> | <% end %> <% end %> <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> <%= render :partial => 'search' %> +<%= render :partial => 'resize' %> -<% -session[:token] = @user.tokens.create.token unless session[:token] - -# 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? -%> - -