X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/336a80530cb38c4b138493ef547961ea36b82ee3..bf29550db840c97cafffbe1e836750bef6c7942d:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index d9641891c..cf7ad9fc8 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -7,12 +7,13 @@ <%= stylesheet_link_tag 'site' %> <%= 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." }) %> OpenStreetMap<%= ' | '+ h(@title) if @title %>
- <% if flash[:notice] %> -
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %> +
<%= @notice || flash[:notice] %>
<% end %> <%= yield %> @@ -43,7 +44,6 @@ exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export' traceclass = 'active' if params['controller'] == 'trace' diaryclass = 'active' if params['controller'] == 'diary_entry' - browseclass = 'active' if params['controller'] == 'browse' %>
  • <%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %>
  • <%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %>
    • @@ -53,8 +53,7 @@
  • <%= link_to 'Export', {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %>
    • <% end %>
  • <%= link_to 'GPS Traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
    • -
  • <%= link_to 'User Diaries', {:controller => 'diary_entry', :action => 'list'}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
    • -
  • <%= link_to_remote 'Browse', {:url => {:controller => 'browse', :action => 'start'}}, {:href => url_for( {:controller => 'browse', :action => 'index'}), :id => 'browseanchor', :title => 'browse data', :class => browseclass} %>
    • +
  • <%= link_to 'User Diaries', {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
    • @@ -78,12 +77,12 @@ <% end %> - <% if API_STATUS == :offline %> + <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
    The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
    - <% elsif API_STATUS == :readonly %> + <% elsif OSM_STATUS == :api_readonly %>
    The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out. @@ -108,7 +107,7 @@ - + <%= link_to (image_tag "cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>