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

Combine and refine third and sixth section

Browse source
This commit is contained in:
John Firebaugh 2013-07-21 15:17:50 -07:00
parent 0effb12e4e
commit ef880621a4
5 changed files with 48 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/welcome.js
View file

@ -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();

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

@ -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 {

66
app/views/site/welcome.html.erb
View file

@ -12,97 +12,89 @@
</div>
<div class='pad2 drop'>
<h3><%= t "welcome_page.section_1.title" %></h3>
<h3><%= t "welcome_page.one_map_many_uses.title" %></h3>
<div class='center one-map'>
<div class='sprite large one-map'>
<span class='one-map-name one-map-project-name'><%= t "layouts.project_name.title" %></span>
<% 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| %>
<span class='one-map-name one-map-name-<%= i+1 %>'><%= name %></span>
<% end %>
</div>
</div>
<p><%= t "welcome_page.section_1.paragraph_1_html" %></p>
<p><%= t "welcome_page.one_map_many_uses.paragraph_1_html" %></p>
</div>
<div class='pad2 drop clearfix'>
<h3><%= t "welcome_page.section_2.title" %></h3>
<h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
<div class='col6 pad1'>
<div class='center pad1'>
<span class='sprite small check'></span>
</div>
<p><%= t "welcome_page.section_2.on_html" %></p>
<p><%= t "welcome_page.whats_on_the_map.on_html" %></p>
</div>
<div class='col6 pad1'>
<div class='center pad1'>
<span class='sprite small x'></span>
</div>
<p><%= t "welcome_page.section_2.off_html" %></p>
<p><%= t "welcome_page.whats_on_the_map.off_html" %></p>
</div>
</div>
<% if @user %>
<div class='pad2 drop'>
<h3><%= t "welcome_page.section_3.title" %></h3>
<p><%= t "welcome_page.section_3.paragraph_2_html" %></p>
</div>
<% else %>
<div class='pad2 drop'>
<h3><%= t "welcome_page.section_3.title_no_user" %></h3>
<p><%= t "welcome_page.section_3.paragraph_1_html" %></p>
<p><%= t "welcome_page.section_3.paragraph_2_html" %></p>
</div>
<% end %>
<div class='pad2 drop'>
<h3><%= t "welcome_page.section_4.title" %></h3>
<p><%= t "welcome_page.section_4.paragraph_1_html" %></p>
<h3><%= t "welcome_page.basic_terms.title" %></h3>
<p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
<div class='col12 clearfix'>
<p>
<span class='sprite small term editor'></span>
<%= t "welcome_page.section_4.editor_html" %>
<%= t "welcome_page.basic_terms.editor_html" %>
</p>
<p>
<span class='sprite small term node'></span>
<%= t "welcome_page.section_4.node_html" %>
<%= t "welcome_page.basic_terms.node_html" %>
</p>
<p>
<span class='sprite small term way'></span>
<%= t "welcome_page.section_4.way_html" %>
<%= t "welcome_page.basic_terms.way_html" %>
</p>
<p>
<span class='sprite small term changeset'></span>
<%= t "welcome_page.section_4.changeset_html" %>
<%= t "welcome_page.basic_terms.changeset_html" %>
</p>
</div>
</div>
<div class='pad2 drop'>
<h3><%= t "welcome_page.section_5.title" %></h3>
<h3><%= t "welcome_page.questions.title" %></h3>
<div class='center pad1'>
<span class='sprite small term question'></span>
</div>
<p><%= t "welcome_page.section_5.paragraph_1_html" %></p>
<p><%= t "welcome_page.questions.paragraph_1_html" %></p>
</div>
<div class='pad2 drop'>
<h3><%= t "welcome_page.section_6.title" %></h3>
<h3><%= t "welcome_page.contributing.title" %></h3>
<% if @user %>
<p>
<%= t "welcome_page.section_6.paragraph_1_html" %>
<span class='edit-located'><%= t "welcome_page.section_6.paragraph_located" %></span>
<span class='edit-geocoded'><%= t "welcome_page.section_6.paragraph_geocoded_html" %></span>
<span class='edit-geolocated'><%= t "welcome_page.section_6.paragraph_geolocated" %></span>
<%= t "welcome_page.contributing.paragraph_1_html" %>
<span class='edit-located'><%= t "welcome_page.contributing.paragraph_located" %></span>
<span class='edit-geocoded'><%= t "welcome_page.contributing.paragraph_geocoded_html" %></span>
<span class='edit-geolocated'><%= t "welcome_page.contributing.paragraph_geolocated" %></span>
</p>
<button class="edit-located edit-geocoded edit-geolocated start-mapping">Start Mapping</button>
<div class='center'>
<a href="<%= edit_path %>" class="edit-located edit-geocoded edit-geolocated start-mapping"><%= t "welcome_page.contributing.start_mapping" %></a>
</div>
<% else %>
<p><%= t "welcome_page.section_6.paragraph_1_no_user_html" %></p>
<p><%= t "welcome_page.contributing.paragraph_1_no_user_html" %></p>
<div class='center'>
<a href="<%= user_new_path %>" class="sign-up"><%= t "welcome_page.contributing.sign_up" %></a>
</div>
<% end %>
</div>
<div class='note-box pad2 drop'>
<div class='pad1'>
<h3><%= t "welcome_page.section_7.title" %></h3>
<p><%= t "welcome_page.section_7.paragraph_1_html" %></p>
<p><%= t "welcome_page.section_7.paragraph_2_html" %></p>
<h3><%= t "welcome_page.add_a_note.title" %></h3>
<p><%= t "welcome_page.add_a_note.paragraph_1_html" %></p>
<p><%= t "welcome_page.add_a_note.paragraph_2_html" %></p>
</div>
</div>

33
config/locales/en.yml
View file

@ -1156,7 +1156,7 @@ en:
1 million users, who add data based on local knowledge, GPS tracks, and more">created
by people like you</abbr>, 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 <em>real and current</em> -
@ -1184,17 +1184,7 @@ en:
What it <em>doesn't</em> 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.
<a href="https://www.openstreetmap.org/user/new">Sign up here</a>.
paragraph_2_html: |
With your user account, you can edit the map and <abbr title="Users on OpenStreetMap talk
over mailing lists, chat, and private messages sent on the website">collaborate
with other mappers</abbr>.
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 <strong>changeset</strong> is <abbr title='changesets can have comments, like "adding a
road here", that let other users know what you were intending to change and why'>group of
changes</abbr> 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 <a href='http://help.openstreetmap.org/'>the help website</a>.
section_6:
contributing:
title: Start Contributing
paragraph_1_html: |
You can zoom in anywhere in the world and click the <em>Edit</em> button to start contributing.
With your user account, you can edit the map and <abbr title="Users on OpenStreetMap talk
over mailing lists, chat, and private messages sent on the website">collaborate with other
mappers</abbr>. To start contributing, zoom in anywhere in the world and click the <em>Edit</em>
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 <em>Edit</em>
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 <em>Edit</em> 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

2
config/routes.rb
View file

@ -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