X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b61e4f77e86fd2535a88b0d3e5aec97809c8ec5e..d13ef1db021391e677a2c3d75f3b0999064ffb3a:/app/views/layouts/site.rhtml?ds=sidebyside diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index 2a1c8ac0b..e0fd0e391 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -5,8 +5,9 @@ <%= javascript_include_tag 'site' %> <%= 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" }) %> - OpenStreetMap<%= ' | '+@title if @title %> + OpenStreetMap<%= ' | '+ h(@title) if @title %>
@@ -19,11 +20,9 @@ <% if @user and @user.id %> - Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | + Welcome, <%= link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %> - <% if !@user.home_lon.nil? and !@user.home_lat.nil? %> - <%= link_to 'home', {:controller => 'site', :action => 'index', :lon => @user.home_lon, :lat => @user.home_lat, :zoom => '10'} %> | - <% end %> + <%= yield :greeting %> <%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> | <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%> <% else %> @@ -37,14 +36,16 @@ <% viewclass = '' editclass = '' + exportclass = '' traceclass = '' viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' - editclass = 'active' if params['controller'] == 'campaign' + exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export' traceclass = 'active' if params['controller'] == 'trace' %>
  • <%= 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 } %>
    • +
  • <%= link_to 'Export', {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass } %>
  • <%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %>
    • @@ -69,7 +70,12 @@ <% end %> - <% if API_READONLY %> + <% if API_STATUS == :offline %> +
    + The OpenStreetMap database is currently offline while + essential database maintenance work is carried out. +
    + <% elsif API_STATUS == :readonly %>
    The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.