X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8c1d3fdd6bd4e80f3cbf2fcd6842ebf3a5050992..ec91b3a39fc28442f367be1dda6cb9dc37172cbb:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 53867995b..7c921658d 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,138 +1,11 @@ - - - - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'site' %> - - <%= stylesheet_link_tag 'site' %> - <%= stylesheet_link_tag 'print', :media => "print" %> - <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %> - <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> - <%= yield :head %> - <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> - - -
- <% if @notice || flash[:notice] %> -
<%= @notice || flash[:notice] %>
- <% end %> - - <%= yield %> -
- - - <% if @user and @user.id %> - <%= 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')) %> | - <%= yield :greeting %> - <% - inbox_attributes = {} - inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0 - inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size - %> - <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> | - <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> - <% else %> - <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {: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 %> - - -
- -
- -
- - - - <% unless @user %> -
-

- <%= t 'layouts.intro_1' %> -

-

- <%= t 'layouts.intro_2' %> -

-

- <%= t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %> -

-
- <% end %> - - <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %> -
- <%= t 'layouts.osm_offline' %> -
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %> -
- <%= t 'layouts.osm_read_only' %> -
- <% end %> - - <% if false %> - - <% end %> - -
- <%= t 'layouts.help_wiki' %>
- <%= t 'layouts.news_blog' %>
- <%= t 'layouts.shop' %>
- <%= yield :left_menu %> -
- - <%= yield :optionals %> - -
- - - -
-
+ + + <%= render :partial => "layouts/head" %> + + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(Settings.matomo) -%> + + <% end -%>