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

[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 f47068252590c673228f9c9d325bf8c161b2d58a..c1a61362fdaa36ce61cb41610acc56b9e02b9a16 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -3,35 +3,33 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t "fixthemap.title" %></h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <% end %>
 

-<h3><%= t "layouts.intro_header" %></h3>
+<h2><%= t "layouts.intro_header" %></h2>
+<p class="lead"><%= t "layouts.intro_text" %></p>

 
 

-<p><%= t "layouts.intro_text" %></p>
+<h2><%= t ".how_to_help.title" %></h2>

 
 

-<h3><%= t "fixthemap.how_to_help.title" %></h3>
-
-<div class='clearfix'>
-  <div class='col6 inner11'>
-    <h3><%= t "fixthemap.how_to_help.join_the_community.title" %></h3>
-    <%= t "fixthemap.how_to_help.join_the_community.explanation_html" %>
-    <div class='clearfix center'>
-      <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
-    </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>

-  <div class='col6 inner11'>
-    <h3><%= t "site.welcome.add_a_note.title" %></h3>
-    <p><%= t "site.welcome.add_a_note.paragraph_1_html" %></p>
-    <p><%= t "fixthemap.how_to_help.add_a_note.instructions_html", :map_url => root_path %></p>
+  <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>
 
   </div>
 </div>
 

-<h3><%= t "fixthemap.other_concerns.title" %></h3>
-<p><%= t "fixthemap.other_concerns.explanation_html" %></p>
+<h2><%= t ".other_concerns.title" %></h2>
+<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>

 
 

-<div class='col12 clearfix icon-list'>
-  <h3><%= t "site.welcome.questions.title" %></h3>
-  <span class='sprite small term question'></span>
-  <p><%= t "site.welcome.questions.paragraph_1_html", :help_url => help_path %></p>
-</div>
+<%= render "any_questions" %>