Use rails 5 version of redirect_back.

[rails.git] / app / views / site / edit.html.erb

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 45cc6c7f96d7c97a1b7a16956a08a1be7366b7d1..ae313e1f263424119711c275207607d4843a824c 100644 (file)
--- 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 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 => 'resize' %>
-
-<%= render :partial => preferred_editor %>
-
-<script type="text/javascript">
-  function maximiseMap() {
-    $("#left").hide();
-    $("#greeting").hide();
-    $("#tabnav").hide();
-
-    $("#content").css("top", "0px");
-    <% if t('html.dir') == "ltr" -%>
-    $("#content").css("left", "0px");
-    <% else -%>
-    $("#content").css("right", "0px");
-    <% end -%>
-
-    handleResize();
-  }
-  
-  function minimiseMap() {
-    $("#left").show();
-    $("#greeting").show();
-    $("#tabnav").show();
-
-    $("#content").css("top", "30px");
-    <% if t('html.dir') == "ltr" -%>
-    $("#content").css("left", "185px");
-    <% else -%>
-    $("#content").css("right", "185px");
-    <% end -%>
-
-    handleResize();
-  }
-
-  $(document).ready(handleResize);
-  $(window).resize(handleResize);
-</script>
+<% content_for :content do %>
+  <% 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 %>
+    <%= render :partial => preferred_editor %>
+  <% end %>

 <% end %>
 <% end %>