X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be585d140336313b0f94c695dde71cc97a00b1f4..ebeea34670ed0fca539daef0e7a10887d839e6d2:/app/views/layouts/site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 58376d857..1e1e23ebb 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,156 +1,11 @@
-
-
+
+
<%= render :partial => "layouts/head" %>
-
-
- <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
-
<%= 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), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %>
- <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> |
- <%= yield :greeting %>
- <%= render :partial => "layouts/inbox" %> |
- <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
- <% else %>
- <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
- <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
- <% end %>
-
-
- <%
- viewclass = 'geolink llz layers'
- editclass = 'geolink llz object minzoom13 disabled'
- historyclass = 'geolink bbox minzoom11'
- exportclass = 'geolink llz layers'
- traceclass = ''
- viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index'
- editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit'
- historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list'
- exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export'
- traceclass += ' active' if params['controller'] == 'trace'
- %>
- - <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
- - <%= link_to h(t('layouts.edit')) + ' ▾'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
- - <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
- - <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
- - <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
-
-
-
-
-
-
-
-
-
- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
-
<%= 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 %>
-
-
-
-
-
-
-
-
-
- <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
- <%= render :partial => "layouts/piwik" %>
+
+ <%= render :partial => "layouts/header" %>
+ <%= render :partial => "layouts/content" %>
+ <% if defined?(PIWIK) -%>
+
<% end -%>