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

Front page copy revision

Browse source 
This edits the front page copy to be more direct, link off to more
useful resources, and guide people to register for an account. It
also moves partner links to below the donate link.
This commit is contained in:
Tom MacWright 2012-03-14 11:16:10 -04:00 • committed by Tom Hughes
parent e2caef64b8
commit dc48c9a510
3 changed files with 36 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,12 +85,12 @@ h2 {
/* Rules for the introductory text displayed in the left sidebar to new users */ /* Rules for the introductory text displayed in the left sidebar to new users */
#intro { .sidebar-copy {
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
padding: 0px 5px; padding: 0px 5px;
} }
#intro p { .sidebar-copy p {
margin: 5px; margin: 5px;
} }
@ -236,7 +236,7 @@ h2 {
.donate { .donate {
width: 155px; width: 155px;
margin: 10px 5px; margin: 10px 10px;
padding: 5px; padding: 5px;
border: 1px solid #ccc; border: 1px solid #ccc;
background: #cbeea7; background: #cbeea7;

35
app/views/layouts/site.html.erb
View file

@ -68,19 +68,19 @@
<%= yield :optionals %> <%= yield :optionals %>
<% unless @user %> <% unless @user %>
<div id="intro"> <div class="sidebar-copy">
<p> <p>
<%= t 'layouts.intro_1' %> <%= t 'layouts.intro_1' %>
</p> </p>
<p> <p>
<%= t 'layouts.intro_2' %> <%= raw(t 'layouts.intro_2',
</p> :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"),
<p> :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')),
<%= raw(t 'layouts.intro_3', :license => link_to(t('layouts.intro_2_license'),
:ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), url_for({:controller => 'site', :action => 'copyright'})),
:ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"), :create_account => link_to(t('layouts.intro_2_create_account'),
:bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"), url_for({:controller => 'user', :action => 'new'})))
:partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url'))) %> %>
</p> </p>
</div> </div>
<% end %> <% end %>
@ -127,12 +127,17 @@
</ul> </ul>
</div> </div>
<center> <div class="donate">
<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>
<a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a> </div>
</div> <div class='sidebar-copy'>
</center> <p><%= raw(t 'layouts.partners',
</div> :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>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {

21
config/locales/en.yml
View file

@ -973,14 +973,19 @@ en:
user_diaries_tooltip: View user diaries user_diaries_tooltip: View user diaries
edit_with: Edit with %{editor} edit_with: Edit with %{editor}
tag_line: The Free Wiki World Map tag_line: The Free Wiki World Map
intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you." intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth." intro_2: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}." intro_2_create_account: "Create a user account"
intro_3_ucl: "the UCL VR Centre" intro_2_license: "open license"
intro_3_ic: "Imperial College London" intro_2_use: "use"
intro_3_bytemark: "Bytemark Hosting" intro_2_download: "download"
intro_3_partners: "wiki" intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners" partners: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
partners_ucl: "the UCL VR Centre"
partners_ic: "Imperial College London"
partners_bytemark: "Bytemark Hosting"
partners_partners: "partners"
partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."