X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dd7ef37ec023646120358a0a6a7959a392b79f1c..eeadb9e20222eade2f1db0bb599bef50eea15f93:/app/views/site/edit.html.erb diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index e5bffd1e4..761975466 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -6,145 +6,16 @@

<% 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 t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> | -<% end %> +<% content_for :head do %> + <%= javascript_include_tag "edit" %> <% end %> -<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'home_link' %> +<%= render :partial => 'sidebar' %> <%= render :partial => 'search' %> -<% -session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(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? -%> - -
- <%= t 'site.edit.flash_player_required' %> -
- -<%= javascript_include_tag 'swfobject.js' %> - +<%= render :partial => preferred_editor %> <% end %>