X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4d91fe3dd95c1058cb8d24fd4c900223e30b9059..b54362d4581075308ad277fd7023ee11f530e0a0:/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 dadb9e4e5..e84adf2d4 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -1,57 +1,13 @@ -<% if STATUS == :database_offline or STATUS == :api_offline %> -
<%= t 'layouts.osm_offline' %> -
-<% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -<%= t 'layouts.osm_read_only' %> -
-<% elsif !@user.data_public? %> -<%= t 'site.edit.not_public' %>
-<%= 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 t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | -<% end %> -<% end %> - -<%= render :partial => 'sidebar' %> -<%= render :partial => 'search' %> - -<%= render :partial => preferred_editor %> - - +<% content_for :content do %> + <% if STATUS == :database_offline or STATUS == :api_offline %> +<%= t 'layouts.osm_offline' %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> +<%= t 'layouts.osm_read_only' %>
+ <% elsif !current_user.data_public? %> +<%= t '.not_public' %>
+<%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %>
+<%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %>
+ <% else %> + <%= render :partial => preferred_editor %> + <% end %> <% end %>