<%= flash[:error] %>
- <% end %>
- <% if flash[:warning] %>
- <%= flash[:warning] %>
- <% end %>
- <% if flash[:notice] %>
- <%= flash[:notice] %>
- <% end %>
-
- <%= yield %>
+
+
+ <%= render :partial => "layouts/head" %>
+
+
+ <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
+
-
-
- <% if @user and @user.id %>
- <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %>
- <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> |
- <%= yield :greeting %>
- <%
- inbox_attributes = {}
- inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
- inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
- %>
- <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |
- <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
- <% else %>
- <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
- <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
- <% end %>
-
-
- <%= t 'layouts.project_name.h1' %>
-
-
-
-
-
+
-
-
-
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ root_path) %>
+
-
+ <%= yield :optionals %>
<% unless @user %>
- <%= t 'layouts.project_name.h1' %>
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>-
<%= t('layouts.tag_line') %>
-<%= t 'layouts.project_name.h1' %>
+<%= t('layouts.tag_line') %>
+
<% end %>
-
- <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
-
- <%= t 'layouts.osm_offline' %>
+ <% if STATUS == :database_offline or STATUS == :api_offline %>
+
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
-
- <%= t 'layouts.osm_read_only' %>
+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
+
<% end %>
+
+
+
+
+ <%= ad = [{:image => 'sotm-birmingham-ad.png',
+ :title => 'State of the Map Birmingham',
+ :href =>'http://stateofthemap.org/'},
+ {:image => 'donate-ad.png',
+ :title => 'Server Donation Drive',
+ :href =>'http://donate.openstreetmap.org/'}].sample
- <% if false %>
-
+
+
+ <%= h(t('layouts.make_a_donation.text')) %>
+
+
+
- <%= t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %>
+ link_to ad[:href], :title => ad[:title] do
+ image_tag ad[:image], :class => :ad
+ end
+ %>
+
+
+
+
+
+ -
+ <% if @user and @user.id %>
+
- <%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %> +
- <%= yield :greeting %> +
- <%= render :partial => "layouts/inbox" %> +
- <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> + <% else %> +
- <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> +
- <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> + <% end %> +
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
<% end %>
-
-
+ <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+
+ <% end -%>