Skip to content

Commit

Permalink
Add "Legal" paragraph on the "About" page
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpoole authored and tomhughes committed May 5, 2015
1 parent dcaefd0 commit 5552ae3
Show file tree
Hide file tree
Showing 6 changed files with 402 additions and 0 deletions.
Binary file modified app/assets/images/about/sprite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
388 changes: 388 additions & 0 deletions app/assets/images/about/sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/about/sprite@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2659,6 +2659,7 @@ input.richtext_title[type="text"] {
&.open { background-position: 0px -80px; }
&.partners { background-position: 0px -120px; }
&.infringement { background-position: 0px -160px; }
&.legal { background-position: -45px -160px; }
}
}

Expand Down
5 changes: 5 additions & 0 deletions app/views/site/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<p><%= t "about_page.open_data_html", :copyright_path => copyright_path %></p>
</div>

<div class='section' id='legal'>
<h2><div class='icon legal'></div><%= t "about_page.legal_title" %></h2>
<p><%= t "about_page.legal_html" %></p>
</div>

<div class='section' id='partners'>
<h2><div class='icon partners'></div><%= t "about_page.partners_title" %></h2>
<p><%= t 'layouts.partners_html',
Expand Down
8 changes: 8 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,14 @@ en:
build upon the data in certain ways, you may distribute the result only
under the same licence. See the <a href='%{copyright_path}'>Copyright and
License page</a> for details.
legal_title: Legal
legal_html: |
This site and many other related services are formally operated by the
<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
on behalf of the community.
<br>
Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a>
if you have licensing, copyright or other legal questions and issues.
partners_title: Partners
notifier:
diary_comment_notification:
Expand Down

0 comments on commit 5552ae3

Please sign in to comment.