X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/397db07d65eec20de92f8c5220a4d41fc7d7ae7b..2c0cd2730c369410a677bcd30e6233534e7fc5ad:/app/views/layouts/site.rhtml?ds=sidebyside
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 673e12706..3c84dc47f 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -5,8 +5,7 @@
<%= javascript_include_tag 'site' %>
<%= stylesheet_link_tag 'site' %>
- <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Placename Search", :href => "/opensearch/osm.xml" }) %>
- <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Postcode Search", :href => "/opensearch/osm-postcode.xml" }) %>
+ <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
OpenStreetMap<%= ' | '+@title if @title %>
@@ -21,11 +20,9 @@
<% 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.get_new_messages.length > 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 %>
- <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
+ <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %>
+ <%= 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 %>
<%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> |
@@ -82,6 +79,7 @@
<%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
News blog
Shop
+ <%= yield :left_menu %>
<%= yield :optionals %>