X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb83f28a5e9326be55a431d5c3f7b4ae7529a942..cea0cccc6d73d7543d80d659b0f221f0d3196c0e:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index d04a2877f..a89db5078 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,131 +1,136 @@
-
-
+
+
<%= render :partial => "layouts/head" %>
-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
-
- <%= yield %>
-
-
-
-
-
- <%= 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') %>
-
+ <%= link_to(image_tag("osm_logo.png",
+ :size => "120x120",
+ :alt => t('layouts.logo.alt_text')),
+ root_path) %>
+ <%= t 'layouts.project_name.h1' %>
+ <%= t('layouts.tag_line') %>
-
+ <%= yield :optionals %>
<% unless @user %>
-
-
- <%= t 'layouts.intro_1' %>
-
-
- <%= t 'layouts.intro_2' %>
-
+
<% end %>
-
<% if STATUS == :database_offline or STATUS == :api_offline %>
-
- <%= t 'layouts.osm_offline' %>
+
<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-
- <%= t 'layouts.osm_read_only' %>
+
<% 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 %>
-
- <%= t 'layouts.donate', :link => "
#{t('layouts.donate_link_text')}" %>
+ link_to ad[:href], :title => ad[:title] do
+ image_tag ad[:image], :class => :ad
+ end
+ %>
+
- <% end %>
-
-
+
+ <% if @user and @user.id %>
+ <%= render :partial => "layouts/user_menu" %>
+ <% 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 %>
+
+ -
+ <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+
-
+ <%= render :partial => 'layouts/edit_menu',
+ :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+
-
+ <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+
+
+
+
+ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+ <% if content_for? :heading %>
+
+ <%= yield :heading %>
-
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
+ <% end %>
+
+ <%= yield %>
-
- <%= yield :optionals %>
-
-
-
-
+ <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+
+ <% end -%>