X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae0177fbe61d7d02e3c6b441bd395fff6fd96a18..d66ad4a4555c6ae9cb7257f53e2df375e5c4c73f:/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 12b5b82c5..ca59f5763 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,133 +1,11 @@
-
+
<%= render :partial => "layouts/head" %>
-
- <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %>
- <%= 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/'}].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 %>
- <%= render :partial => "layouts/user_menu" %>
- <% 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, :class => 'tab geolink llz layers' %>
-
-
- <%= render :partial => 'layouts/edit_menu',
- :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
-
-
- <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
-
-
-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
- <% if content_for? :heading %>
-
- <%= yield :heading %>
-
- <% end %>
-
- <%= yield %>
-
-
- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
-
+ <%= render :partial => "layouts/header" %>
+ <%= render :partial => "layouts/content" %>
+ <% if defined?(PIWIK) -%>
+
<% end -%>