X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e6af088dda8e85f53b11ffbaddb11edf08e4a046..faa1a4825021ab6fe84272cffb875d45e4150c8b:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 54b7af10c..91fcea0ea 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,33 +1,29 @@
-
+
- <%= javascript_include_tag 'main.js' %>
-
- <%= javascript_include_tag 'tile.js' %>
- <%= javascript_include_tag 'site.js' %>
-
-
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+
<%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
-
- <% if @user %>
- Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> |
- <% @inbox_weight = 'bold' if @user.get_new_messages.length > 0 %>
- <%= link_to "inbox (#{@user.get_new_messages.length})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
+ <% if @user and @user.id %>
+ 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};" } %> |
<%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%>
<% else %>
<%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> |
@@ -37,17 +33,26 @@
- <% viewclass = ''
+ <%
+ viewclass = ''
editclass = ''
+ exportclass = ''
traceclass = ''
viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index'
editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit'
- editcalss = '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', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
@@ -57,46 +62,65 @@
OpenStreetMap
<%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %>
- The Free Wiki World Map
+ The Free Wiki World Map
+
<% unless @user %>
- OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-
- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-
- OpenStreetMap's hosting is kindly supported by the
UCL VR Centre and
bytemark.
+
+ OpenStreetMap is a free editable map of the whole world. It
+ is made by people like you.
+
+
+ OpenStreetMap allows you to view, edit and use geographical
+ data in a collaborative way from anywhere on Earth.
+
+
+ OpenStreetMap's hosting is kindly supported by the
+ UCL VR Centre and
+ bytemark.
+
<% end %>
-
-
+ <% 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 OSM_STATUS == :api_readonly %>
+
+ The OpenStreetMap database is currently in read-only mode while
+ essential database maintenance work is carried out.
+
+ <% end %>
-