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

[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 28e0fe237b547d9fe3c2071513466ab9acddbe0a..c1a61362fdaa36ce61cb41610acc56b9e02b9a16 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -11,26 +11,25 @@
 
 <h2><%= t ".how_to_help.title" %></h2>
 
 
 <h2><%= t ".how_to_help.title" %></h2>
 

-<div class='container'>
-  <div class='row'>
-    <div class='col-sm'>
-      <h5><%= t ".how_to_help.join_the_community.title" %></h5>
-      <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>
-    </div>
+<div class='row'>
+  <div class='col-sm'>
+    <h5><%= t ".how_to_help.join_the_community.title" %></h5>
+    <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.para_1" %></p>
+    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note") %></p>

   </div>
 </div>
 
 <h2><%= t ".other_concerns.title" %></h2>
   </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" %>