Merge remote-tracking branch 'upstream/pull/4812'

[rails.git] / app / views / site / welcome.html.erb

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index dc6a519dfeed144f584cd803b96cf47dff8bbc68..22783ce2d19de49fbbe44a8d2ca6f4a143b3045a 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -6,68 +6,64 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
-<p><%= t ".introduction_html" %></p>
+<p class="lead"><%= t ".introduction" %></p>
 
-<h3><%= t ".whats_on_the_map.title" %></h3>
+<h2><%= t ".whats_on_the_map.title" %></h2>
 
-<div class=' clearfix'>
-  <div class='col6 inner11'>
-    <div class='center clearfix inner11'>
-      <span class='sprite small check'></span>
-    </div>
-    <p><%= t ".whats_on_the_map.on_html" %></p>
+<div class='row'>
+  <div class='col-sm'>
+    <span class='d-block mx-auto sprite check'></span>
+    <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 inner11'>
-    <div class='center clearfix inner11'>
-      <span class='sprite small x'></span>
-    </div>
-    <p><%= t ".whats_on_the_map.off_html" %></p>
+  <div class='col-sm'>
+    <span class='d-block mx-auto sprite x'></span>
+    <p><%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %></p>
   </div>
 </div>
 
-<h3><%= t ".basic_terms.title" %></h3>
+<h2><%= t ".basic_terms.title" %></h2>
 
-<p><%= t ".basic_terms.paragraph_1_html" %></p>
+<p><%= t ".basic_terms.paragraph_1" %></p>
 
-<div class='col12 clearfix icon-list'>
-  <div class='clearfix'>
-    <span class='sprite small term editor'></span>
-    <p><%= t ".basic_terms.editor_html" %></p>
-  </div>
-  <div class='clearfix'>
-    <span class='sprite small term node'></span>
-    <p><%= t ".basic_terms.node_html" %></p>
-  </div>
-  <div class='clearfix'>
-    <span class='sprite small term way'></span>
-    <p><%= t ".basic_terms.way_html" %></p>
-  </div>
-  <div class='clearfix'>
-    <span class='sprite small term tag'></span>
-    <p><%= t ".basic_terms.tag_html" %></p>
-  </div>
-</div>
+<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>
 
-<div class='col12 clearfix icon-list'>
-  <h3><%= t ".rules.title" %></h3>
-  <span class='sprite small term rules'></span>
-  <p><%= t ".rules.paragraph_1_html" %></p>
+<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='col12 clearfix icon-list'>
-  <h3><%= t ".questions.title" %></h3>
-  <span class='sprite small term question'></span>
-  <p><%= t ".questions.paragraph_1_html", :help_url => help_path %></p>
-</div>
+<%= render "any_questions" %>
 
-<div class='clearfix center'>
-  <a href="<%= edit_path %>" class="button start-mapping"><%= t ".start_mapping" %></a>
+<div class='text-center mb-3'>
+<% if params[:oauth_return_url] %>
+  <a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
+<% else %>
+  <a class="btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
+<% end %>
 </div>
 
-<div class='note-box'>
-  <div class='inner22'>
-    <h3><%= t ".add_a_note.title" %></h3>
-    <p><%= t ".add_a_note.paragraph_1_html" %></p>
-    <p><%= t ".add_a_note.paragraph_2_html", :map_url => root_path %></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>