X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eb38443c0eb3dcd85439e1cd6001d8b81536c90c..77303f1e5ac466d59129f6cf083e5f6d6ac09288:/app/views/layouts/site.rhtml?ds=sidebyside
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 7c0a0c20c..534003031 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,6 +7,8 @@
<%= 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 %>
OpenStreetMap<%= ' | '+ h(@title) if @title %>
@@ -36,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 => 'history' }, {: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 %>
@@ -89,15 +94,15 @@
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 0 %>
-
+ <% if false %>
+
Support OpenStreetMap by
donating
to the Hardware Upgrade Fund.
@@ -111,22 +116,23 @@
<%= yield :left_menu %>
- <%= yield :optionals %>
-
-
-
-
+
-
+ <%= 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/" %>
+
+