From 6cd8db7bff35f8b401eb904e4c24936d8fc09a0a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 24 Aug 2007 17:43:15 +0000
Subject: [PATCH] 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.

---
 app/views/layouts/site.rhtml | 4 +---
 app/views/site/edit.rhtml    | 6 ++++++
 app/views/site/index.rhtml   | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 2a1c8ac0b..3c84dc47f 100644
--- 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 548a1acaf..ecb977656 100644
--- 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 08cbfaeda..b9525c71a 100644
--- 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 %>
-- 
2.43.2