<%= link_to(image_tag("osm_logo.png",
:size => "120x120",
:alt => t('layouts.logo.alt_text')),
- root_path) %>
+ root_path) %>
<%= yield :optionals %>
<% unless @user %>
@@ -96,39 +38,52 @@
+ root_path) %>
<%= t 'layouts.project_name.h1' %>
-<%= t('layouts.tag_line') %>
+<%= t('layouts.tag_line') %>
<%= t 'layouts.osm_read_only' %>
- <%= h(t('layouts.make_a_donation.text')) %>
+ } %>
+
+ <%= yield :left_menu %>
+
+
+
+
+
+
+ <%= h(t('layouts.make_a_donation.text')) %>
+
+ <%= 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
+
+ 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 %>
+
<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+ <%= yield :heading %>
+
+ <% end %>
+
+ <%= yield %>
+
+