X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/734697ebb6cc27057fd8bb1d078a175ca5f45406..e62eacd8d3c839835308cf01da11827f844d3a91:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index ef11b5c0b..33e02449d 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,7 +20,7 @@
<% 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 %>
<%= yield :greeting %>
<%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
@@ -35,15 +36,23 @@
<%
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'
+ diaryclass = 'active' if params['controller'] == 'diary_entry'
%>
- <%= 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 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %>
+ <%= 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} %>
+ <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
+ <%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
+ <% else %>
+ <%= 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} %>
@@ -67,7 +76,12 @@
<% end %>
- <% if API_STAUS != :online %>
+ <% 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.
@@ -76,12 +90,17 @@
+
+
<%= yield :optionals %>