X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f1ce59f32b83c6053311c6e55e7b3d9b9ca18db..58653f8b9d90c9f0a2f44d026b0ec84574f6bc9a:/app/views/layouts/site.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index c17255709..b514fef99 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -13,6 +13,7 @@ <%= 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." }) %> + <%= style_rules %> <%= yield :head %> <%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %> @@ -67,7 +68,7 @@ <% else %>
  • <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
  • <% end %> -
  • <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip'), :class => traceclass} %>
  • +
  • <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil}, {: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} %>
  • @@ -99,11 +100,11 @@ <% 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' %>
    @@ -116,7 +117,10 @@ <% end %>
    - <%= t 'layouts.help_wiki' %>
    + <%= t 'layouts.help_and_wiki', + :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')), + :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title')) + %>
    <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
    <%= t 'layouts.news_blog' %>
    <%= t 'layouts.shop' %>