X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cc400de436a5dc33b66bc735b5fb6257e066a5a..a2498928e470b358f69902d9fdc72a1a80aa5bf8:/app/views/layouts/site.rhtml?ds=inline
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index c5ecfbd7c..4437fa879 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -11,8 +11,8 @@
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+
<%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
@@ -42,11 +42,17 @@
editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit'
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} %>
+ <% 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')} %>
-
<%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
+ <% 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', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
@@ -70,12 +76,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.
@@ -84,7 +90,6 @@