<% end %>
<% content_for :heading do %>
- <h2><%= t "welcome_page.title" %></h2>
- <h3><%= t "welcome_page.subtitle" %></h3>
+ <h1><%= t ".title" %></h1>
<% end %>
-<div class='pad2'>
- <p><%= t "welcome_page.introduction_html" %></p>
-</div>
+<p class="lead"><%= t ".introduction" %></p>
-<div class='pad2 drop'>
- <h3><%= t "welcome_page.section_1.title" %></h3>
- <div class='center'>
- <span class='sprite large one-map'></span>
- </div>
- <p><%= t "welcome_page.section_1.paragraph_1_html" %></p>
- <p><%= t "welcome_page.section_1.paragraph_2_html" %></p>
-</div>
+<h2><%= t ".whats_on_the_map.title" %></h2>
-<div class='pad2 drop clearfix'>
- <h3><%= t "welcome_page.section_2.title" %></h3>
- <div class='col6 pad1'>
- <div class='center pad1'>
- <span class='sprite small check'></span>
+<div class='row'>
+ <div class='col-sm'>
+ <div>
+ <span class='sprite check mx-auto'></span>
</div>
- <p><%= t "welcome_page.section_2.on_html" %></p>
+ <p><%= t ".whats_on_the_map.on_the_map_html", :real_and_current => tag.em(t(".whats_on_the_map.real_and_current")) %></p>
</div>
- <div class='col6 pad1'>
- <div class='center pad1'>
- <span class='sprite small x'></span>
+ <div class='col-sm'>
+ <div>
+ <span class='sprite x mx-auto'></span>
</div>
- <p><%= t "welcome_page.section_2.off_html" %></p>
+ <p><%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %></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 %>
+<h2><%= t ".basic_terms.title" %></h2>
-<div class='pad2 drop'>
- <h3><%= t "welcome_page.section_4.title" %></h3>
- <p><%= t "welcome_page.section_4.paragraph_1_html" %></p>
- <div class='col12 clearfix'>
- <p>
- <span class='sprite small term editor'></span>
- <%= t "welcome_page.section_4.editor_html" %>
- </p>
- <p>
- <span class='sprite small term node'></span>
- <%= t "welcome_page.section_4.node_html" %>
- </p>
- <p>
- <span class='sprite small term way'></span>
- <%= t "welcome_page.section_4.way_html" %>
- </p>
- <p>
- <span class='sprite small term changeset'></span>
- <%= t "welcome_page.section_4.changeset_html" %>
- </p>
- </div>
+<p><%= t ".basic_terms.paragraph_1" %></p>
+
+<ul class='list-unstyled'>
+ <li class='d-flex align-items-center gap-2 mb-2'>
+ <span class='flex-shrink-0 align-self-start sprite editor'></span>
+ <span><%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %></span>
+ </li>
+ <li class='d-flex align-items-center gap-2 mb-2'>
+ <span class='flex-shrink-0 align-self-start sprite node'></span>
+ <span><%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %></span>
+ </li>
+ <li class='d-flex align-items-center gap-2 mb-2'>
+ <span class='flex-shrink-0 align-self-start sprite way'></span>
+ <span><%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %></span>
+ </li>
+ <li class='d-flex align-items-center gap-2 mb-2'>
+ <span class='flex-shrink-0 align-self-start sprite tag'></span>
+ <span><%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %></span>
+ </li>
+</ul>
+
+<h2><%= t ".rules.title" %></h2>
+<div class='d-flex align-items-center gap-2'>
+ <span class='flex-shrink-0 align-self-start sprite rules'></span>
+ <p><%= t ".rules.para_1_html", :imports_link => link_to(t(".rules.imports"), t(".rules.imports_url")),
+ :automated_edits_link => link_to(t(".rules.automated_edits"), t(".rules.automated_edits_url")) %></p>
</div>
-<div class='pad2 drop'>
- <h3><%= t "welcome_page.section_5.title" %></h3>
- <div class='center pad1'>
- <span class='sprite small term question'></span>
- </div>
- <p><%= t "welcome_page.section_5.paragraph_1_html" %></p>
+<div class='clearfix'>
+ <%= render "any_questions" %>
</div>
-<div class='pad2 drop'>
- <h3><%= t "welcome_page.section_6.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>
- </p>
- <button class="edit-located edit-geocoded edit-geolocated start-mapping">Start Mapping</button>
- <% else %>
- <p><%= t "welcome_page.section_6.paragraph_1_no_user_html" %></p>
- <% end %>
+<div class='clearfix text-center'>
+ <p class="display-5">
+<% if params[:oauth_return_url] %>
+ <a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
+<% else %>
+ <a class="button btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
+<% end %>
+ </p>
</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>
- </div>
+<div class='alert alert-primary'>
+ <h2><%= t ".add_a_note.title" %></h2>
+ <p><%= t ".add_a_note.para_1" %></p>
+ <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
+ :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %></p>
</div>
projects / rails.git / blobdiff