From db691133d384cef053204cda8188234da2dd2782 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 7 Apr 2010 09:45:41 +0000 Subject: [PATCH] Revert copyright page from the trunk for now. --- app/views/layouts/site.html.erb | 13 +++++++- app/views/site/copyright.html.erb | 49 ------------------------------- config/locales/en.yml | 1 - config/routes.rb | 1 - 4 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 app/views/site/copyright.html.erb diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index c17255709..5679f3e8b 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -117,7 +117,6 @@
<%= t 'layouts.help_wiki' %>
- <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
<%= t 'layouts.news_blog' %>
<%= t 'layouts.shop' %>
<%= yield :left_menu %> @@ -129,6 +128,18 @@ + +
diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb deleted file mode 100644 index f7ef2afa3..000000000 --- a/app/views/site/copyright.html.erb +++ /dev/null @@ -1,49 +0,0 @@ -

- -

Copyright and License

- -

OpenStreetMap is open data, licensed under the Creative Commons Attribution-ShareAlike 2.0 licence (CC-BY-SA).

- -

You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our maps or data, you may distribute the result only under the same or similar licence. The full legal code explains your rights and responsibilities.

- -

How to credit OpenStreetMap

- -

If you are using OpenStreetMap map images, we request that your credit reads at least “© OpenStreetMap contributors, CC-BY-SA”. If you are using map data only, we request “Map data © OpenStreetMap contributors, CC-BY-SA”.

- -

Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ and CC-BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If you are using a medium where links are not possible (e.g. a printed work), we suggest you direct your readers to www.openstreetmap.org (perhaps by expanding ‘OpenStreetMap’ to this full address) and to www.creativecommons.org.

- -

Finding out more

- -

Read more about using our data at the Legal FAQ. - -

OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders.

- -

Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our Tile Usage Policy and Nominatim Usage Policy. - -

Our contributors

- -

Our CC-BY-SA licence requires you to “give the Original Author credit reasonable to the medium or means You are utilising”. Individual OSM mappers do not request a credit over and above that to “OpenStreetMap contributors”, but where data from a national mapping agency or other major source has been included in OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page.

- - - - - -

Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability.

diff --git a/config/locales/en.yml b/config/locales/en.yml index 7e10cdf61..8699d600c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -914,7 +914,6 @@ en: help_wiki: "Help & Wiki" help_wiki_tooltip: "Help & Wiki site for the project" help_wiki_url: "http://wiki.openstreetmap.org" - copyright: "Copyright & License" news_blog: "News blog" news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." shop: Shop diff --git a/config/routes.rb b/config/routes.rb index df6efef60..0c0e62849 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,7 +88,6 @@ ActionController::Routing::Routes.draw do |map| map.root :controller => 'site', :action => 'index' map.connect '/', :controller => 'site', :action => 'index' map.connect '/edit', :controller => 'site', :action => 'edit' - map.connect '/copyright', :controller => 'site', :action => 'copyright' map.connect '/history', :controller => 'changeset', :action => 'list' map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom map.connect '/export', :controller => 'site', :action => 'export' -- 2.43.2