X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2cea4e0d98f6780d16165c394b18b50bbbe35cd0..2160f820ac9fe3f78deb97a3a4285e9bf8daa095:/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 89b33ab05..1e1e23ebb 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,144 +1,11 @@ - - - - - <%= 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 %> - - -

- <% 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')) %> - <%= 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')}%> - <% 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 %> - - -

<%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
<%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('layouts.edit_tooltip'), :class => editclass} %>
<%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %>
<%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
<%= 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'}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
<%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => t('layouts.user_diaries_tooltip'), :class => diaryclass} %>

- -

<%= t 'layouts.project_name.h1' %>

- <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
-

<%= t('layouts.tag_line') %>

- -

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

- <%= t 'layouts.donate', :link => "#{t('layouts.donate_link_text')}" %> -

- <% end %> - -

- <%= t 'layouts.help_wiki' %>
- <%= t 'layouts.news_blog' %>
- <%= t 'layouts.shop' %>
- <%= yield :left_menu %> -

- - <%= yield :optionals %> - - -

- <%= h(t('layouts.make_a_donation.text')) %> -

- -

- <%= link_to( - image_tag("cc_button.png", - :alt => t('layouts.license.alt'), - :border => 0, - :width => 88, - :height => 31, - :title => t('layouts.license.title')), - "http://creativecommons.org/licenses/by-sa/2.0/", - { :rel => "license" }) %> -

- -

+ + + <%= render :partial => "layouts/head" %> + + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(PIWIK) -%> + + <% end -%>