X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ebcb038c1c27695790f81900204d4c8589b2dfbb..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 064fbed0a..f02f024a5 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,151 +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", :alt => t('layouts.logo.alt_text')), root_path) %>
-
<%= t 'layouts.project_name.h1' %>
-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
- <%= yield %>
-
-
-
- <% if @user and @user.id %>
- <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %>
- <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> |
- <%= 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 %>
-
-
- - <%= link_to t('layouts.view'), root_path, {
- :id => 'viewanchor',
- :title => t('layouts.view_tooltip'),
- :class => 'geolink llz layers'
- } %>
- - <%= link_to h(t('layouts.edit')) + content_tag(:span, "â¾", :class => "menuicon"), edit_path, {
- :id => 'editanchor',
- :title => t('javascripts.site.edit_tooltip'),
- :data => { :minzoom => 13 },
- :class => 'geolink llz object disabled'
- } %>
- - <%= link_to t('layouts.history'), browse_changesets_path, {
- :id => 'historyanchor',
- :data => { :minzoom => 11 },
- :title => t('javascripts.site.history_tooltip'),
- :class => 'geolink bbox'
- } %>
- - <%= link_to t('layouts.export'), export_path, {
- :id => 'exportanchor',
- :title => t('layouts.export_tooltip'),
- :class => 'geolink llz layers'
- } %>
-
-
-
-
-
-
- <%= 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 STATUS == :database_offline or STATUS == :api_offline %>
-
- <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
-
- <% end %>
- <% if false %>
-
- <% end %>
-
-
- <%= link_to image_tag("sotmpdx.png",
- :alt => t('layouts.sotm2012'),
- :title => t('layouts.sotm2012'),
- :border => "0"), "http://stateofthemap.us/" %>
-
-
-
-
- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
-
+ <%= 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 %>