X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/33a6b79bd78f1903011367f6a5adf2f91d160f74..d7b4f88d5e342b5c2b4f2435d0394e4286524678:/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 461257207..69ac7aa02 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,115 +1,9 @@ - + <%= 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 %> -
-

<%= t 'layouts.intro_1' %>

-

- <%= t 'layouts.intro_2_html', - :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"), - :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')), - :license => link_to(t('layouts.intro_2_license'), copyright_path), - :create_account => link_to(t('layouts.intro_2_create_account'), user_new_path) - %> -

-
- <% 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 %> - - -
-

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), - :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %> -

-
-
-
- - <% 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 -%>