X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9dbe1a497af89d3e53aad1af091d296520a74c6f..6c02cd4b5fe5ccdb8e25f8401b3e89b7c2c13cee:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index c2e831bf7..673e12706 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,19 +1,15 @@ - <%= javascript_include_tag 'site.js' %> - - <%= stylesheet_link_tag 'site.css' %> + <%= javascript_include_tag 'prototype' %> + <%= 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" }) %> OpenStreetMap<%= ' | '+@title if @title %> - - <% if params[:controller] == 'site' and params[:action] == 'index' %> -
- <% end %> -
<% if flash[:notice] %>
<%= flash[:notice] %>
@@ -26,6 +22,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};" } %> | <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> <% else %>