X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/feeb135760abdbfef0eea193318566d9d96f2523..d404bc04d542d381a3233e8cf461f5c9fb981af2:/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 44edfc6d1..7c921658d 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,162 +1,11 @@
-
+
<%= 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' %>
-
-
-
- <%= 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 %>
-
-
-
- <%= 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
- %>
-
-
-
-
- <%= h(t('layouts.make_a_donation.text')) %>
-
-
-
-
- <% if @user and @user.id %>
- - <%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
- - <%= 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, :editor => preferred_editor },
- :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'
- } %>
-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
- <% if content_for? :heading %>
-
- <%= yield :heading %>
-
- <% end %>
-
- <%= yield %>
-
-
+
+ <%= render :partial => "layouts/header" %>
+ <%= render :partial => "layouts/content" %>
+ <% if defined?(Settings.matomo) -%>
+ 
<% end -%>