X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/da950bbfb43e634abdd512255e1c6440ffa52fa4..b61e4f77e86fd2535a88b0d3e5aec97809c8ec5e:/app/views/layouts/site.rhtml diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 601e7b0bd..2a1c8ac0b 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -1,19 +1,14 @@ - <%= javascript_include_tag 'site.js' %> - - <%= stylesheet_link_tag 'site.css' %> - <%= 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" }) %> + <%= javascript_include_tag 'prototype' %> + <%= javascript_include_tag 'site' %> + + <%= stylesheet_link_tag 'site' %> + <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> OpenStreetMap<%= ' | '+@title if @title %> - - <% if params[:controller] == 'site' and params[:action] == 'index' %> -
- <% end %> -
<% if flash[:notice] %>
<%= flash[:notice] %>
@@ -25,11 +20,11 @@ <% 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 %> + <% @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 %> - <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | + <%= 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'}%> | @@ -86,6 +81,7 @@ <%= link_to "Users' diaries", {:controller => 'diary_entry', :action => 'list', :display_name => nil} %>
News blog
Shop
+ <%= yield :left_menu %>
<%= yield :optionals %>