This simply moves GPS Traces to the left bar

[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 37531a4a7782261fdf48e4408ca0e919a17a8ccd..84de929541dfc2235571a3d4617677f136f012ba 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -6,9 +6,8 @@
 </p>
 <% elsif !@user.data_public? %>
 <p><%= t 'site.edit.not_public' %></p>
 </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? %>
 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>


@@ -24,37 +23,36 @@
 
 <script type="text/javascript">
   function maximiseMap() {
 
 <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", "10px");

     <% if t('html.dir') == "ltr" -%>
     <% if t('html.dir') == "ltr" -%>

-    $("content").style.left = "10px";
+    $("#content").css("left", "10px");

     <% else -%>
     <% else -%>

-    $("content").style.right = "10px";
+    $("#content").css("right", "10px");

     <% end -%>
 
     handleResize();
   }
   
   function minimiseMap() {
     <% 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", "35px");

     <% if t('html.dir') == "ltr" -%>
     <% if t('html.dir') == "ltr" -%>

-    $("content").style.left = "192px";
+    $("#content").css("left", "192px");

     <% else -%>
     <% else -%>

-    $("content").style.right = "192px";
+    $("#content").css("right", "192px");

     <% end -%>
 
     handleResize();
   }
 
     <% end -%>
 
     handleResize();
   }
 

-  document.observe("dom:loaded", handleResize);
-
-  Event.observe(window, "resize", handleResize);
+  $(document).ready(handleResize);
+  $(window).resize(handleResize);

 </script>
 <% end %>
 </script>
 <% end %>