cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add trademark information to copyright page

Browse source 
Added some minimal text to the copyright page wrt trademarks, currently
pointing to the LWG, one day it should refer to a formal policy.
This commit is contained in:
Simon Poole 2015-05-19 13:53:18 +01:00 • committed by Tom Hughes
parent 9d9c13c433
commit a1f73967a9
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/common.scss
View file

@ -15,9 +15,15 @@ fieldset,img { border: 0; }
legend { color: #000; }
sup { vertical-align: text-top; }
sup {
vertical-align: super;
font-size: smaller;
}
sub { vertical-align: text-bottom; }
sub {
vertical-align: sub;
font-size: smaller;
}
table {
border-collapse: collapse;

3
app/views/site/copyright.html.erb
View file

@ -71,3 +71,6 @@
<h3><%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %></p>
<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>
<h3><%= t "license_page.legal_babble.trademarks_title_html", :locale => @locale %></h3>
<p><%= t "license_page.legal_babble.trademarks_1_html", :locale => @locale %></p>

5
config/locales/en.yml
View file

@ -966,7 +966,7 @@ en:
legal_babble:
title_html: Copyright and License
intro_1_html: |
OpenStreetMap is <i>open data</i>, licensed under the <a
OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
href="http://opendatacommons.org/licenses/odbl/">Open Data
Commons Open Database License</a> (ODbL) by the <a
href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
@ -1078,6 +1078,9 @@ en:
to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
procedure</a> or file directly at our
<a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
trademarks_title_html: <span id="trademarks"></span>Trademarks
trademarks_1_html: |
OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
welcome_page:
title: Welcome!
introduction_html: |