X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cc400de436a5dc33b66bc735b5fb6257e066a5a..6c66507427961a22a8f282b5b2f4ab7fda1dad6f:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index c5ecfbd7c..93abf3a5e 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,5 +1,5 @@
-
+
<%= javascript_include_tag 'prototype' %>
<%= javascript_include_tag 'site' %>
@@ -7,12 +7,14 @@
<%= 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." }) %>
+ <%= yield :head %>
- <% if flash[:notice] %>
-
<%= flash[:notice] %>
+ <% if @notice || flash[:notice] %>
+
<%= @notice || flash[:notice] %>
<% end %>
<%= yield %>
@@ -36,17 +38,26 @@
<%
viewclass = ''
editclass = ''
+ historyclass = ''
exportclass = ''
traceclass = ''
viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index'
editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit'
+ historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox'
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 'History', {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %>
+ <% 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} %>
@@ -62,50 +73,66 @@
<% 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 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 == :database_readonly or OSM_STATUS == :api_readonly %>
The OpenStreetMap database is currently in read-only mode while
essential database maintenance work is carried out.
<% end %>
+ <% if false %>
+