X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43b3998657c9807a68e71609c568748c8337b95e..64d076847b8b1a5899833db9a9ef88064cd14433:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index a5416ff68..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' %>
@@ -8,6 +8,7 @@
<%= 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 %>
OpenStreetMap<%= ' | '+ h(@title) if @title %>
@@ -37,16 +38,19 @@
<%
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')} %>
<% else %>
@@ -69,12 +73,19 @@
<% unless @user %>
- HELLO!
- 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 %>
@@ -83,13 +94,21 @@
The OpenStreetMap database is currently offline while
essential database maintenance work is carried out.
- <% elsif OSM_STATUS == :api_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 %>
+
+ Support OpenStreetMap by
+
donating
+ to the Hardware Upgrade Fund.
+
+ <% end %>
+
- <%= yield :optionals %>
-
-
-
-
+
- <%= link_to (image_tag "cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+ <%= yield :optionals %>
-
-
+
+
+
+ <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+
+