X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/599843c72db1f519daa085de69a19d9aa77332e2..420ebbbb875ac359c8aae3a05970daabeeafa8b8:/app/views/site/edit.html.erb

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index fdbfa5428..5e091339c 100644
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -6,13 +6,12 @@
 </p>
 <% elsif !@user.data_public? %>
 <p><%= t 'site.edit.not_public' %></p>
-<p><%= 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><%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></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') } %> |
+<%= 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 %>
 
@@ -22,40 +21,38 @@
 
 <%= render :partial => preferred_editor %>
 
-<script type="text/javascript" defer="defer">
+<script type="text/javascript">
   function maximiseMap() {
-    $("left").style.display = "none";
-    $("greeting").style.display = "none";
-    $("tabnav").style.display = "none";
+    $("#left").hide();
+    $("#greeting").hide();
+    $("#tabnav").hide();
 
-    $("content").style.top = "10px";
+    $("#content").css("top", "0px");
     <% if t('html.dir') == "ltr" -%>
-    $("content").style.left = "10px";
+    $("#content").css("left", "0px");
     <% else -%>
-    $("content").style.right = "10px";
+    $("#content").css("right", "0px");
     <% end -%>
 
     handleResize();
   }
   
   function minimiseMap() {
-    $("left").style.display = "";
-    $("greeting").style.display = "";
-    $("tabnav").style.display = "";
+    $("#left").show();
+    $("#greeting").show();
+    $("#tabnav").show();
 
-    $("content").style.top = "35px";
+    $("#content").css("top", "30px");
     <% if t('html.dir') == "ltr" -%>
-    $("content").style.left = "192px";
+    $("#content").css("left", "185px");
     <% else -%>
-    $("content").style.right = "192px";
+    $("#content").css("right", "185px");
     <% end -%>
 
     handleResize();
   }
 
-  handleResize();
-
-  Event.observe(window, "load", handleResize);
-  Event.observe(window, "resize", handleResize);
+  $(document).ready(handleResize);
+  $(window).resize(handleResize);
 </script>
 <% end %>