Only put the 'home' link in the top left on the map and edit pages, and

make it update position in place rather than reloading the page.

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 2a1c8ac0b07345b3fbc085fd20349aa1ddee386e..3c84dc47f0de2f64452d00b0f74c9e5497aab00c 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -21,9 +21,7 @@
       <% if @user and @user.id %>
         Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | 
         <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %>
-        <% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
-        <%= link_to 'home', {:controller => 'site', :action => 'index', :lon => @user.home_lon, :lat => @user.home_lat, :zoom => '10'} %> |
-        <% end %>
+        <%= yield :greeting %>
         <%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
         <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%>
       <% else %>

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 548a1acaf7b4a96b461389f40a44126ae52d2850..ecb977656fa890f97d9e249f92f0b1d0715b2e81 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -3,6 +3,12 @@
    essential database maintenance work is carried out.
 </p>
 <% else %>
+<% content_for :greeting do %>
+<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+<% end %>
+
 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 
 <% session[:token] = @user.tokens.create.token unless session[:token] %>

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 08cbfaedaac8f0e01b7c9a79d06b73dedc791788..b9525c71ab27fc87572e5025faddf12303fdf276 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,3 +1,7 @@
+<% content_for :greeting do %>
+<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+
 <% content_for :left_menu do %>
 <%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>
 <% end %>