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

[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 da775e3393e24ce54d4def93860ade09622309f5..4617935e768cc49c6a80ca9c9a151a47d1233532 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -3,65 +3,69 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= t "welcome_page.title" %></h2>
+  <h1><%= t ".title" %></h1>
 <% end %>
 
-<p><%= t "welcome_page.introduction_html" %></p>
+<p><%= t ".introduction_html" %></p>
 
-<h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
+<h3><%= t ".whats_on_the_map.title" %></h3>
 
-<div class=' clearfix'>
-  <div class='col6 inner11'>
-    <div class='center clearfix inner11'>
+<div class='row'>
+  <div class='col'>
+    <div class='center'>
       <span class='sprite small check'></span>
     </div>
-    <p><%= t "welcome_page.whats_on_the_map.on_html" %></p>
+    <p><%= t ".whats_on_the_map.on_html" %></p>
   </div>
-  <div class='col6 inner11'>
-    <div class='center clearfix inner11'>
+  <div class='col'>
+    <div class='center'>
       <span class='sprite small x'></span>
     </div>
-    <p><%= t "welcome_page.whats_on_the_map.off_html" %></p>
+    <p><%= t ".whats_on_the_map.off_html" %></p>
   </div>
 </div>
 
-<h3><%= t "welcome_page.basic_terms.title" %></h3>
+<h3><%= t ".basic_terms.title" %></h3>
 
-<p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
+<p><%= t ".basic_terms.paragraph_1_html" %></p>
 
-<div class='col12 clearfix icon-list'>
+<div class='clearfix icon-list'>
   <div class='clearfix'>
     <span class='sprite small term editor'></span>
-    <p><%= t "welcome_page.basic_terms.editor_html" %></p>
+    <p><%= t ".basic_terms.editor_html" %></p>
   </div>
   <div class='clearfix'>
     <span class='sprite small term node'></span>
-    <p><%= t "welcome_page.basic_terms.node_html" %></p>
+    <p><%= t ".basic_terms.node_html" %></p>
   </div>
   <div class='clearfix'>
     <span class='sprite small term way'></span>
-    <p><%= t "welcome_page.basic_terms.way_html" %></p>
+    <p><%= t ".basic_terms.way_html" %></p>
   </div>
   <div class='clearfix'>
     <span class='sprite small term tag'></span>
-    <p><%= t "welcome_page.basic_terms.tag_html" %></p>
+    <p><%= t ".basic_terms.tag_html" %></p>
   </div>
 </div>
 
-<div class='col12 clearfix icon-list'>
-  <h3><%= t "welcome_page.questions.title" %></h3>
+<div class='clearfix icon-list'>
+  <h3><%= t ".rules.title" %></h3>
+  <span class='sprite small term rules'></span>
+  <p><%= t ".rules.paragraph_1_html" %></p>
+</div>
+
+<div class='clearfix icon-list'>
+  <h3><%= t ".questions.title" %></h3>
   <span class='sprite small term question'></span>
-  <p><%= t "welcome_page.questions.paragraph_1_html" %></p>
+  <p><%= t ".questions.paragraph_1_html", :help_url => help_path %></p>
 </div>
 
 <div class='clearfix center'>
-  <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>
+  <p><a href="<%= edit_path %>" class="button start-mapping"><%= t ".start_mapping" %></a></p>
 </div>
 
-<div class='note-box'>
-  <div class='inner22'>
-    <h3><%= t "welcome_page.add_a_note.title" %></h3>
-    <p><%= t "welcome_page.add_a_note.paragraph_1_html" %></p>
-    <p><%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %></p>
-  </div>
-</div>
\ No newline at end of file
+<div class='alert alert-primary'>
+  <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>