Revert copyright page from the trunk for now.

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index c17255709171508eb4fe470294807211f3fb93b2..5679f3e8bfcc5df4617394011b340c7ed5fa2bb3 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -117,7 +117,6 @@
 
       <div id="left_menu" class="left_menu">
         <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
 
       <div id="left_menu" class="left_menu">
         <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />

-        <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %><br />

         <a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
         <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
         <%= yield :left_menu %>
         <a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
         <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
         <%= yield :left_menu %>


@@ -129,6 +128,18 @@
         <div class="donate">
           <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
         </div>
         <div class="donate">
           <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
         </div>

+
+        <div id="cclogo" style="width: 88px">
+          <%= link_to(
+                  image_tag("cc_button.png",
+                      :alt => t('layouts.license.alt'),
+                      :border => 0,
+                      :width => 88,
+                      :height => 31,
+                      :title => t('layouts.license.title')),
+                  "http://creativecommons.org/licenses/by-sa/2.0/",
+                  { :rel => "license" }) %>
+        </div>

       </center>
     </div>
   </body>
       </center>
     </div>
   </body>

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
deleted file mode 100644 (file)
index f7ef2af..0000000
--- a/app/views/site/copyright.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<p style="float: right"><a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a></p>
-
-<h2>Copyright and License</h2>
-
-<p>OpenStreetMap is <i>open data</i>, licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).</p>
-
-<p>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 <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code</a> explains your rights and responsibilities.</p>
-
-<h3>How to credit OpenStreetMap</h3>
-
-<p>If you are using OpenStreetMap map images, we request that your credit reads at least &ldquo;&copy; OpenStreetMap contributors, CC-BY-SA&rdquo;. If you are using map data only, we request &ldquo;Map data &copy; OpenStreetMap contributors, CC-BY-SA&rdquo;.</p>
-
-<p>Where possible, OpenStreetMap should be hyperlinked to <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> and CC-BY-SA to <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. 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 &lsquo;OpenStreetMap&rsquo; to this full address) and to www.creativecommons.org.</p>
-
-<h3>Finding out more</h3>
-
-<p>Read more about using our data at the <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>.
-       
-<p>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.</p>
-
-<p>Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a> and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
-
-<h3>Our contributors</h3>
-
-<p>Our CC-BY-SA licence requires you to &ldquo;give the Original Author credit reasonable to the medium or means You are utilising&rdquo;. Individual OSM mappers do not request a credit over and above that to &ldquo;OpenStreetMap contributors&rdquo;, 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.</p>
-
-<!--
-
-Information for page editors
-
-The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data.
-
-Any additions here must be discussed with OSM sysadmins first.
-
--->
-
-<ul id="contributors">
-       
-<li><strong>Australia</strong>: Contains suburb data based on Australian Bureau of Statistics data.
-
-<li><strong>Canada</strong>: Contains data from GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).
-
-<li><strong>New Zealand</strong>: Contains data sourced from Land Information New Zealand. Crown Copyright reserved.
-
-<li><strong>United Kingdom</strong>: Contains Ordnance Survey data &copy; Crown copyright and database right 2010.
-
-</ul>
-
-<p>Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability.</p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e10cdf61cbd172e7201e6a6df437c4d0efb33be..8699d600cf0420e5775fe87f17c2d6356b291ed9 100644 (file)
--- 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"
     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
     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 df6efef60643cdf05941fb2cfe2f6cc74386eaff..0c0e62849770ad3627d44e6f7bc608cdbc1cfc41 100644 (file)
--- 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.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'
   map.connect '/history', :controller => 'changeset', :action => 'list'
   map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom
   map.connect '/export', :controller => 'site', :action => 'export'