Front page copy revision

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.

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 59235fbc836d7f3a76a706a93cf6a9f558229a6c..75c33b6aa16b16c1bccf148e5f96dfdfde77e7a8 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -85,12 +85,12 @@ h2 {
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
-#intro {
+.sidebar-copy {
   border-top: 1px solid #ccc;
   padding: 0px 5px;
 }
 
-#intro p {
+.sidebar-copy p {
   margin: 5px;
 }
 
@@ -236,7 +236,7 @@ h2 {
 
 .donate {
   width: 155px;
-  margin: 10px 5px;
+  margin: 10px 10px;
   padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 14cf7b0037103c06d857beb4e3dafcf5aea2e5cc..19835489c65b4e4b059d336b090e2f3666d481cb 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -68,19 +68,19 @@
       <%= yield :optionals %>
 
       <% unless @user %>
-      <div id="intro">
+      <div class="sidebar-copy">
         <p>
           <%= t 'layouts.intro_1' %>
         </p>
         <p>
-          <%= t 'layouts.intro_2' %>
-        </p>
-        <p>
-        <%= raw(t 'layouts.intro_3', 
-                  :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
-                  :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"),
-                  :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
-                  :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url'))) %>
+        <%= raw(t 'layouts.intro_2',
+                :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"),
+                :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')),
+                :license => link_to(t('layouts.intro_2_license'),
+                                   url_for({:controller => 'site', :action => 'copyright'})),
+                :create_account => link_to(t('layouts.intro_2_create_account'),
+                                   url_for({:controller => 'user', :action => 'new'})))
+        %>
         </p>
       </div>
       <% end %>
@@ -127,12 +127,17 @@
         </ul>
       </div>
 
-      <center>
-        <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>
-        </div>
-      </center>
-    </div>
+      <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>
+      </div>
+      <div class='sidebar-copy'>
+          <p><%= raw(t 'layouts.partners',
+              :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">
     $(document).ready(function () {

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 928c26177cf6888a694b92f0d1965e6a01a40cd6..1cec3f1486fc94007269a978289b716a789977f5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -973,14 +973,19 @@ en:
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     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_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
-    intro_3_ucl: "the UCL VR Centre"
-    intro_3_ic: "Imperial College London"
-    intro_3_bytemark: "Bytemark Hosting"
-    intro_3_partners: "wiki"
-    intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
+    intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
+    intro_2: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+    intro_2_create_account: "Create a user account"
+    intro_2_license: "open license"
+    intro_2_use: "use"
+    intro_2_download: "download"
+    intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
+    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_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."