X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/13289d404188bd397ee72852f66c415a2bb87066..fa7ba58d5e22040f5e0d6c171bcceb59b58145ad:/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 84de92954..1dba95e5d 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 %> -<p><%= t 'layouts.osm_offline' %> -</p> -<% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -<p><%= t 'layouts.osm_read_only' %> -</p> -<% elsif !@user.data_public? %> -<p><%= t 'site.edit.not_public' %></p> -<p><%= 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'}) %></p> -<p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p> -<% 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 %> -<% end %> - -<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> -<%= render :partial => 'search' %> -<%= render :partial => 'resize' %> - -<%= render :partial => preferred_editor %> - -<script type="text/javascript"> - function maximiseMap() { - $("#left").hide(); - $("#greeting").hide(); - $("#tabnav").hide(); - - $("#content").css("top", "10px"); - <% if t('html.dir') == "ltr" -%> - $("#content").css("left", "10px"); - <% else -%> - $("#content").css("right", "10px"); - <% end -%> - - handleResize(); - } - - function minimiseMap() { - $("#left").show(); - $("#greeting").show(); - $("#tabnav").show(); - - $("#content").css("top", "35px"); - <% if t('html.dir') == "ltr" -%> - $("#content").css("left", "192px"); - <% else -%> - $("#content").css("right", "192px"); - <% end -%> - - handleResize(); - } - - $(document).ready(handleResize); - $(window).resize(handleResize); -</script> +<% content_for :content do %> + <% if Settings.status == "database_offline" or Settings.status == "api_offline" %> + <p><%= t "layouts.osm_offline" %></p> + <% elsif Settings.status == "database_readonly" or Settings.status == "api_readonly" %> + <p><%= t "layouts.osm_read_only" %></p> + <% elsif !current_user.data_public? %> + <p><%= t ".not_public" %></p> + <p><%= raw t ".not_public_description", :user_page => (link_to t(".user_page_link"), :controller => "users", :action => "account", :display_name => current_user.display_name, :anchor => "public") %></p> + <p><%= raw t "site.edit.anon_edits", :link => link_to(t(".anon_edits_link_text"), t(".anon_edits_link")) %></p> + <% else %> + <%= render :partial => preferred_editor %> + <% end %> <% end %>