X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32554955205b000f346e4c6915b571fc5af6a4ed..205ccf2d51753b6802ca212df6aa3425af40430e:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index b41bbf377..69ac7aa02 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,140 +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 %> - - -
- -
- - - - - -
- - - <%= yield :optionals %> - - <% unless @user %> -
-

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

-

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

-

- <%= raw(t 'layouts.intro_3', - :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), - :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"), - :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url'))) %> -

-
- <% end %> - - <% if STATUS == :database_offline or STATUS == :api_offline %> -
- <%= t 'layouts.osm_offline' %> -
- <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -
- <%= t 'layouts.osm_read_only' %> -
- <% end %> - - <% if true %> - - <% 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 -%>