Merge branch 'master' into moderation

[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 abbb5918f64e2c8d7bc72e27f87e528f307de4cf..81095140ed8f1fbdf47a64fdd8330e880c9a1dda 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -1,52 +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 %>
-<%= render :partial => 'home_link' %>
-<%= render :partial => 'sidebar' %>
-<%= render :partial => 'search' %>
-
-<%= render :partial => preferred_editor %>
-
-<script type="text/javascript">
-  function maximiseMap() {
-    $("#left").hide();
-    $("#greeting").hide();
-    $("#tabnav").hide();
-
-    $("#content").css("top", "0px");
-    if ($("html").attr("dir") == "ltr") {
-      $("#content").css("left", "0px");
-    } else {
-      $("#content").css("right", "0px");
-    }
-
-    handleResize();
-  }
-  
-  function minimiseMap() {
-    $("#left").show();
-    $("#greeting").show();
-    $("#tabnav").show();
-
-    $("#content").css("top", "30px");
-    if ($("html").attr("dir") == "ltr") {
-      $("#content").css("left", "185px");
-    } else {
-      $("#content").css("right", "185px");
-    }
-
-    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 !current_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 => current_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 %>