X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9c9d6c1aafdd60c72b54345b4d2dc94317298a0..b9a19ab23a8dc63bc7c7f867e2ece6924319f0f2:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index cecf5acc2..0ba203fde 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,139 +1,165 @@
-
-
-
-
- <% if flash[:error] %>
-
<%= flash[:error] %>
- <% end %>
- <% if flash[:warning] %>
-
<%= flash[:warning] %>
- <% end %>
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
- <% end %>
-
- <%= yield %>
-
-
-
-
- <%
- viewclass = ''
- editclass = ''
- historyclass = ''
- exportclass = ''
- traceclass = ''
- viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index'
- editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit'
- historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list'
- exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export'
- traceclass = 'active' if params['controller'] == 'trace'
- diaryclass = 'active' if params['controller'] == 'diary_entry'
- %>
- - <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
- - <%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
- - <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
- <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
- - <%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
- <% else %>
- - <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
- <% end %>
- - <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
- - <%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %>
-
+
+
+ <%= render :partial => "layouts/head" %>
+
+
+ <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
+
<%= t 'layouts.project_name.h1' %>
-
-
-
+
-
- <%= 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 %>
-
+
<% 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 %>
-
- <%= 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 %>
-
-