X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/874c4f367f3be1d2b6b14f1df3386fc42e8c40ef..60817dedf0066dc0415897015a68bafa3cbc69b2:/app/views/layouts/site.rhtml?ds=inline diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index df6989bf8..a2b912a97 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,12 +1,9 @@ - + - <%= javascript_include_tag 'main.js' %> - - <%= javascript_include_tag 'tile.js' %> <%= javascript_include_tag 'site.js' %> - - + + <%= stylesheet_link_tag 'site.css' %> OpenStreetMap<%= ' | '+@title if @title %> @@ -14,18 +11,20 @@ <% if params[:controller] == 'site' and params[:action] == 'index' %>
<% end %> +
<% if flash[:notice] %>
<%= flash[:notice] %>
<% end %> <%= yield %> -
- <% if @user %> - Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + <% 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 %> + <%= 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 %> <%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> | @@ -35,12 +34,13 @@
+ <% unless @user %>
OpenStreetMap is a free editable map of the whole world. It is made by people like you. @@ -68,18 +69,18 @@
<% end %> -
- Help & Wiki
- <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list'} %>
+
+ Help & Wiki
+ <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
News blog
Shop
-
+
-
-
-Come to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. -
+
+
+ Come to the first OpenStreetMap Conference, The State of the Map: 14th-15th July 2007, Manchester, UK. +
@@ -88,13 +89,13 @@ Come to the first OpenStreetMap Conference, - - - - + + + + - +