X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26855add3861ad496efdcae8598ffdf7d1116074..f885cfe0f5f0602dd51e1734f8ce2eaf377b1614:/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 97bf06203..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' %> -

-
- - <%= 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 - %> -
-
- - -
-
- <% if @user and @user.id %> - <%= render :partial => "layouts/user_menu" %> - <% else %> - - <% end %> - -
-
- <%= 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?(PIWIK) -%> - + <% end -%>