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

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

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index 70118b9806afaad9c15fdf7412efb48263f46ffe..1e943c7cc8dc8eccffa8856a10cdb387cac7b1a4 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -13,22 +13,23 @@
 
 <div class='row'>
   <div class='col-sm'>
-    <h5><%= t ".how_to_help.join_the_community.title" %></h5>
+    <h3 class='fs-5'><%= t ".how_to_help.join_the_community.title" %></h3>
     <p><%= t ".how_to_help.join_the_community.explanation_html" %></p>
     <p class='text-center'>
       <a class="btn btn-primary" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
     </p>
   </div>
   <div class='col-sm'>
-    <h5><%= t "site.welcome.add_a_note.title" %></h5>
-    <p><%= t "site.welcome.add_a_note.paragraph_1_html" %></p>
-    <p><%= t ".how_to_help.add_a_note.instructions_html", :map_url => root_path %></p>
+    <h3 class='fs-5'><%= t "site.welcome.add_a_note.title" %></h3>
+    <p><%= t "site.welcome.add_a_note.para_1" %></p>
+    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1") %></p>
   </div>
 </div>
 
 <h2><%= t ".other_concerns.title" %></h2>
-<p><%= t ".other_concerns.explanation_html" %></p>
+<p>
+  <%= t ".other_concerns.concerns_html", :copyright_link => link_to(t(".other_concerns.copyright"), copyright_path),
+                                         :working_group_link => link_to(t(".other_concerns.working_group"), t(".other_concerns.working_group_url")) %>
+</p>
 
-<h2><%= t "site.welcome.questions.title" %></h2>
-<span class='sprite small term question float-start'></span>
-<p><%= t "site.welcome.questions.paragraph_1_html", :help_url => help_path %></p>
+<%= render "any_questions" %>