From: Simon Poole Date: Sun, 3 May 2015 15:43:34 +0000 (+0200) Subject: Add "Legal" paragraph on the "About" page X-Git-Tag: live~4104 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5552ae3de2d1a22dc0e1a47cc242fe9142fbb778?ds=sidebyside Add "Legal" paragraph on the "About" page --- diff --git a/app/assets/images/about/sprite.png b/app/assets/images/about/sprite.png index d38090599..fa0ce2986 100644 Binary files a/app/assets/images/about/sprite.png and b/app/assets/images/about/sprite.png differ diff --git a/app/assets/images/about/sprite.svg b/app/assets/images/about/sprite.svg new file mode 100644 index 000000000..01a80ae16 --- /dev/null +++ b/app/assets/images/about/sprite.svg @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + C + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/about/sprite@2x.png b/app/assets/images/about/sprite@2x.png index 471b31d8f..7560c8773 100644 Binary files a/app/assets/images/about/sprite@2x.png and b/app/assets/images/about/sprite@2x.png differ diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 2df8b7e65..01f602edb 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -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; } } } diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index a3954b0ce..07b2f9e52 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -25,6 +25,11 @@

<%= t "about_page.open_data_html", :copyright_path => copyright_path %>

+ +

<%= t "about_page.partners_title" %>

<%= t 'layouts.partners_html', diff --git a/config/locales/en.yml b/config/locales/en.yml index 701bae2dd..4004f41e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1200,6 +1200,14 @@ en: build upon the data in certain ways, you may distribute the result only under the same licence. See the Copyright and License page for details. + legal_title: Legal + legal_html: | + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + on behalf of the community. +
+ Please contact the OSMF + if you have licensing, copyright or other legal questions and issues. partners_title: Partners notifier: diary_comment_notification: