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

Move sidebar footer elements elsewhere

Browse source 
Donate is in attribution control.
Hosting credits are on about page.
This commit is contained in:
John Firebaugh 2013-11-07 11:17:42 -08:00
parent 12e820c27e
commit 6d5ce8d492
4 changed files with 13 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/common.css.scss
View file

@ -656,20 +656,6 @@ nav.secondary {
cursor: pointer;
}
.footer {
position: absolute;
bottom: 0;
}
p.credits {
font-size: 11px;
color: #999;
a {
color: #666;
}
}
p.large-text {
font-size: 1.7em;
line-height: 1.4em;
@ -2616,7 +2602,7 @@ a.button {
&.local { background-position: 0px 0px; }
&.community { background-position: 0px -40px; }
&.open { background-position: 0px -80px; }
&.contributors { background-position: 0px -120px; }
&.partners { background-position: 0px -120px; }
&.infringement { background-position: 0px -160px; }
}
}

10
app/views/site/about.html.erb
View file

@ -24,4 +24,14 @@
<h2><div class='icon open'></div><%= t "about_page.open_data_title" %></h2>
<p><%= t "about_page.open_data_html", :copyright_path => copyright_path %></p>
</div>
<div class='section' id='partners'>
<h2><div class='icon partners'></div><%= t "about_page.partners_title" %></h2>
<p><%= t 'layouts.partners_html',
:ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
:partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
</p>
</div>
</div>

15
app/views/site/index.html.erb
View file

@ -14,18 +14,3 @@
<a class="button" href="<%= user_new_path %>"><%= t('layouts.sign_up') %></a>
</div>
<% end %>
<div class='footer'>
<a title="<%= t('layouts.make_a_donation.title') %>" href="http://donate.openstreetmap.org/" class="donate">
<span class='icon donate'></span>
<span><%= t('layouts.make_a_donation.text') %></span>
</a>
<p class='credits inner12'>
<%= t 'layouts.partners_html',
:ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
:ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
:bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
:partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
</p>
</div>

23
config/locales/en.yml
View file

@ -1220,26 +1220,7 @@ 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.
photo_caption_0_html: |
<a href='https://twitter.com/mikel'>@mikel</a> working on
<a href='http://mapkibera.org/'>Map Kibera</a>, a project to map the
largest slum in Nairobi, Kenya.
<a href='http://www.flickr.com/photos/watato/4564778295'>&copy; watato
2010</a>
photo_caption_1_html: |
<a href='https://twitter.com/lxbarth'>@lxbarth</a> and
<a href='https://twitter.com/limareis'>@limareis</a> survey Brasilia with
walking papers.
<a href='http://www.flickr.com/photos/mapbox/7104560119'>&copy; mapbox
2012</a>
photo_caption_2_html: |
@TODO caption (<a href='http://www.flickr.com/photos/oddwick/4775001075'>source</a>)
photo_caption_3_html: |
@TODO caption (<a href='http://www.flickr.com/photos/28698126@N02/3012439281'>source</a>)
photo_caption_4_html: |
@TODO caption (<a href='http://www.flickr.com/photos/louis_liu/4875155429/'>source</a>)
photo_caption_5_html: |
@TODO caption (<a href='http://www.flickr.com/photos/kachkaev/5793019627'>source</a>)
partners_title: Partners
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@ -2171,7 +2152,7 @@ en:
overlays: Enable overlays for troubleshooting the map
title: "Layers"
copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Donate</a>"
donate_link_text: "<span class='icon donate'></span><a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map