X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4d0b049eeda5720084ed9801fd9d302d4992279..18409c05ab43a2f818f6db911ae383eb0ebfb07d:/app/views/layouts/site.html.erb?ds=inline
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 368e3fc20..f02f024a5 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,135 +1,14 @@
-
-
+
+<%= tag.html :lang => I18n.locale,
+ :dir => dir,
+ :data => { :bs_theme => (preferred_color_scheme(:site) if preferred_color_scheme(:site) != "auto") } do %>
<%= render :partial => "layouts/head" %>
-
-
- <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
-
<%= t 'layouts.project_name.h1' %>
-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
-
- <%= yield %>
-
-
-
- <% 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 %>
- <%= render :partial => "layouts/inbox" %> |
- <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%>
- <% 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 %>
-
-
-
-
- <%
- 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', :display_name => nil, :tag => nil, :page => nil}, {: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} %>
-
-
-
-
-
-
-
-
-
-
-
- <%= 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') %>
-
-
-
- <% unless @user %>
-
-
- <%= t 'layouts.intro_1' %>
-
-
- <%= t 'layouts.intro_2' %>
-
-
- <%= t 'layouts.intro_3',
- :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
- :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
- :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %>
-
-
- <% 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 %>
-
- <% if false %>
-
- <% end %>
-
-
-
-
- <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
-
-
- <%= yield :optionals %>
-
-
-
-
-
-
-
+ <%= tag.body :class => body_class,
+ :data => { :map_theme => (preferred_color_scheme(:map) if preferred_color_scheme(:map) != "auto") } do %>
+ <%= render :partial => "layouts/header" %>
+ <%= render :partial => "layouts/content" %>
+ <% if defined?(Settings.matomo) -%>
+
+ <% end -%>
+ <% end %>
+<% end %>