X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/250a068b066c8968047ed90c2de64a47f9301c7d..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/app/views/layouts/site.html.erb?ds=sidebyside diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index a0e894e46..f02f024a5 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,164 +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" %> - -

- <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %> - <%= t 'layouts.project_name.h1' %> -

-
- - <%= yield :optionals %> - <% unless @user %> - - <% end %> - <% if STATUS == :database_offline or STATUS == :api_offline %> - - <% 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 - - link_to ad[:href], :title => ad[:title] do - image_tag ad[:image], :class => :ad - end - %> -
-
- - -
-
- - -
- - -
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - <% if content_for? :heading %> -
- <%= yield :heading %> -
- <% end %> -
- <%= yield %> -
-
- <% 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 %>