X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/420ebbbb875ac359c8aae3a05970daabeeafa8b8..8f529a337ffdb0b35f87169ad50e3ce36ea70c60:/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 5e091339c..b31b09973 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -1,58 +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', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> -<%= render :partial => 'search' %> -<%= render :partial => 'resize' %> - -<%= render :partial => preferred_editor %> - - +<% content_for :content do %> + <% if Settings.status == "database_offline" or Settings.status == "api_offline" %> +<%= t "layouts.osm_offline" %>
+ <% elsif Settings.status == "database_readonly" or Settings.status == "api_readonly" %> +<%= t "layouts.osm_read_only" %>
+ <% elsif !current_user.data_public? %> +<%= t ".not_public" %>
+<%= t ".not_public_description_html", :user_page => (link_to t(".user_page_link"), user_account_path(current_user, :anchor => "public")) %>
+<%= t ".anon_edits_html", :link => link_to(t(".anon_edits_link_text"), t(".anon_edits_link")) %>
+ <% else %> + <%= render :partial => preferred_editor %> + <% end %> <% end %>