Merge branch 'master' into notes

[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 84de929541dfc2235571a3d4617677f136f012ba..761975466b6211c198f4efb0a95bab962a15d13b 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -9,50 +9,13 @@
 <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 %>
+<% content_for :head do %>
+  <%= javascript_include_tag "edit" %>
 <% end %>
 
-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'home_link' %>
+<%= 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", "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>
 <% end %>