X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..18883b59c88940b9bd323756e60603302f185dfd:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index d1983a9f0..9cb6d3df0 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,26 +1,13 @@ - - - <%= javascript_strings %> - <%= javascript_include_tag 'prototype' %> - <%= javascript_include_tag 'site' %> - - <%= stylesheet_link_tag 'common' %> - - <%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %> - <%= stylesheet_link_tag 'site', :media => "screen and (min-width: 482px)" %> - <%= 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 %> - + <%= render :partial => "layouts/head" %> -
- <% if @notice || flash[:notice] %> -
<%= @notice || flash[:notice] %>
- <% end %> +
+ <%= 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 %>
@@ -30,13 +17,8 @@ <%= 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 %> - <% - 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')}%> + <%= render :partial => "layouts/inbox" %> | + <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%> <% 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')} %> @@ -46,31 +28,44 @@
+ + + +
+ <%= yield :optionals %> + <% unless @user %>

@@ -91,17 +88,19 @@

<%= 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") %> + :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 OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %> + <% if STATUS == :database_offline or STATUS == :api_offline %>
<%= t 'layouts.osm_offline' %>
- <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %> + <% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
<%= t 'layouts.osm_read_only' %>
@@ -114,30 +113,24 @@ <% end %>
- <%= t 'layouts.help_wiki' %>
- <%= t 'layouts.news_blog' %>
- <%= t 'layouts.shop' %>
- <%= yield :left_menu %> +
    +
  • <%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
    • +
  • <%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %>
    • +
  • <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
    • +
  • <%= t 'layouts.community_blogs' %>
    • +
  • <%= t 'layouts.foundation' %>
    • + <%= yield :left_menu %> +
- <%= yield :optionals %> +
+ <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %> +
- -