From ef880621a40a6065699ee69e3ba69c7a64a2afde Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sun, 21 Jul 2013 15:17:50 -0700 Subject: [PATCH] Combine and refine third and sixth section --- app/assets/javascripts/welcome.js | 4 +- app/assets/stylesheets/common.css.scss | 5 +- app/views/site/welcome.html.erb | 66 +++++++++++--------------- config/locales/en.yml | 33 ++++++------- config/routes.rb | 2 +- 5 files changed, 48 insertions(+), 62 deletions(-) diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 5409c9ec9..8cf9eb83b 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -21,9 +21,7 @@ $(document).ready(function() { } }); - $('.start-mapping').on('click', function(e) { - window.location = '/edit?zoom=17&lat=' + params.lat + '&lon=' + params.lon; - }); + $('.start-mapping').attr('href', '/edit?zoom=17&lat=' + params.lat + '&lon=' + params.lon); } else if (navigator.geolocation) { $('.edit-geolocated').show(); diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 0680a2fcb..cc0bad072 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -2353,10 +2353,10 @@ a.button { display: none; } - .start-mapping { + .start-mapping, + .sign-up { background: #EB6F67; color: #FFF; - display: block; margin: auto; cursor: pointer; border: none; @@ -2364,6 +2364,7 @@ a.button { border-bottom: 1px solid #A53931; padding: 20px 40px; font-size: 30px; + text-decoration: none; } .note-box { diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index d3cb7392f..4377da670 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -12,97 +12,89 @@
-

<%= t "welcome_page.section_1.title" %>

+

<%= t "welcome_page.one_map_many_uses.title" %>

<%= t "layouts.project_name.title" %> - <% t("welcome_page.section_1.names").sample(6).each_with_index do |name, i| %> + <% t("welcome_page.one_map_many_uses.names").sample(6).each_with_index do |name, i| %> <%= name %> <% end %>
-

<%= t "welcome_page.section_1.paragraph_1_html" %>

+

<%= t "welcome_page.one_map_many_uses.paragraph_1_html" %>

-

<%= t "welcome_page.section_2.title" %>

+

<%= t "welcome_page.whats_on_the_map.title" %>

-

<%= t "welcome_page.section_2.on_html" %>

+

<%= t "welcome_page.whats_on_the_map.on_html" %>

-

<%= t "welcome_page.section_2.off_html" %>

+

<%= t "welcome_page.whats_on_the_map.off_html" %>

-<% if @user %> -
-

<%= t "welcome_page.section_3.title" %>

-

<%= t "welcome_page.section_3.paragraph_2_html" %>

-
-<% else %> -
-

<%= t "welcome_page.section_3.title_no_user" %>

-

<%= t "welcome_page.section_3.paragraph_1_html" %>

-

<%= t "welcome_page.section_3.paragraph_2_html" %>

-
-<% end %> -
-

<%= t "welcome_page.section_4.title" %>

-

<%= t "welcome_page.section_4.paragraph_1_html" %>

+

<%= t "welcome_page.basic_terms.title" %>

+

<%= t "welcome_page.basic_terms.paragraph_1_html" %>

- <%= t "welcome_page.section_4.editor_html" %> + <%= t "welcome_page.basic_terms.editor_html" %>

- <%= t "welcome_page.section_4.node_html" %> + <%= t "welcome_page.basic_terms.node_html" %>

- <%= t "welcome_page.section_4.way_html" %> + <%= t "welcome_page.basic_terms.way_html" %>

- <%= t "welcome_page.section_4.changeset_html" %> + <%= t "welcome_page.basic_terms.changeset_html" %>

-

<%= t "welcome_page.section_5.title" %>

+

<%= t "welcome_page.questions.title" %>

-

<%= t "welcome_page.section_5.paragraph_1_html" %>

+

<%= t "welcome_page.questions.paragraph_1_html" %>

-

<%= t "welcome_page.section_6.title" %>

+

<%= t "welcome_page.contributing.title" %>

<% if @user %>

- <%= t "welcome_page.section_6.paragraph_1_html" %> - <%= t "welcome_page.section_6.paragraph_located" %> - <%= t "welcome_page.section_6.paragraph_geocoded_html" %> - <%= t "welcome_page.section_6.paragraph_geolocated" %> + <%= t "welcome_page.contributing.paragraph_1_html" %> + <%= t "welcome_page.contributing.paragraph_located" %> + <%= t "welcome_page.contributing.paragraph_geocoded_html" %> + <%= t "welcome_page.contributing.paragraph_geolocated" %>

- +
+ <%= t "welcome_page.contributing.start_mapping" %> +
<% else %> -

<%= t "welcome_page.section_6.paragraph_1_no_user_html" %>

+

<%= t "welcome_page.contributing.paragraph_1_no_user_html" %>

+
+ +
<% end %>
-

<%= t "welcome_page.section_7.title" %>

-

<%= t "welcome_page.section_7.paragraph_1_html" %>

-

<%= t "welcome_page.section_7.paragraph_2_html" %>

+

<%= t "welcome_page.add_a_note.title" %>

+

<%= t "welcome_page.add_a_note.paragraph_1_html" %>

+

<%= t "welcome_page.add_a_note.paragraph_2_html" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 9cb2a13de..0a0fa9888 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1156,7 +1156,7 @@ en: 1 million users, who add data based on local knowledge, GPS tracks, and more">created by people like you, and free for anyone to fix, update, download and use. Here's a quick guide to get you started. - section_1: + one_map_many_uses: title: One Map, Many Uses paragraph_1_html: | OpenStreetMap is used in websites, phones, hand-held GPS devices, sat-navs, and even @@ -1174,7 +1174,7 @@ en: - MapQuest - Telenav - USA Today - section_2: + whats_on_the_map: title: What's on the Map on_html: | OpenStreetMap is a place for mapping things that are both real and current - @@ -1184,17 +1184,7 @@ en: What it doesn't include is opinionated data like ratings, historical or hypothetical features, and data from copyrighted sources. Unless you have special permission, don't copy from online or paper maps. - section_3: - title: You're Signed Up - title_no_user: Get a Free Account - paragraph_1_html: | - To edit OpenStreetMap, you'll need a user account. - Sign up here. - paragraph_2_html: | - With your user account, you can edit the map and collaborate - with other mappers. - section_4: + basic_terms: title: Basic Terms For Mapping paragraph_1_html: | OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. @@ -1208,15 +1198,18 @@ en: A changeset is group of changes to the map saved by a user. - section_5: + questions: title: Any questions? paragraph_1_html: | Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered on the help website. - section_6: + contributing: title: Start Contributing paragraph_1_html: | - You can zoom in anywhere in the world and click the Edit button to start contributing. + With your user account, you can edit the map and collaborate with other + mappers. To start contributing, zoom in anywhere in the world and click the Edit + button. paragraph_located: | Or, start contributing now: paragraph_geocoded_html: | @@ -1224,9 +1217,11 @@ en: paragraph_geolocated: | Or, start directly at your current location: paragraph_1_no_user_html: | - Once you have an account, you can zoom in anywhere in the world and click the Edit - button to start contributing. - section_7: + To edit OpenStreetMap, you'll need a user account. Once you have an account, you can zoom in + anywhere in the world and click the Edit button to start contributing. + start_mapping: Start Mapping + sign_up: Sign Up + add_a_note: title: No Time To Edit? Add a Note! paragraph_1_html: | If you just want something small fixed and don't have the time to sign up and learn how to edit, it's diff --git a/config/routes.rb b/config/routes.rb index a53c70af9..0168b6190 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -122,7 +122,7 @@ OpenStreetMap::Application.routes.draw do # web site root :to => 'site#index', :via => [:get, :post] - match '/edit' => 'site#edit', :via => :get + match '/edit' => 'site#edit', :via => :get, :as => :edit match '/copyright/:copyright_locale' => 'site#copyright', :via => :get match '/copyright' => 'site#copyright', :via => :get match '/welcome' => 'site#welcome', :via => :get, :as => :welcome -- 2.43.2