Merge remote-tracking branch 'openstreetmap/pull/1045'

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

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

 <% end %>
 
 <p><%= t "welcome_page.introduction_html" %></p>
 <% end %>
 
 <p><%= t "welcome_page.introduction_html" %></p>


@@ -48,10 +48,16 @@
   </div>
 </div>
 
   </div>
 </div>
 

+<div class='col12 clearfix icon-list'>
+  <h3><%= t "welcome_page.rules.title" %></h3>
+  <span class='sprite small term rules'></span>
+  <p><%= t "welcome_page.rules.paragraph_1_html" %></p>
+</div>
+

 <div class='col12 clearfix icon-list'>
   <h3><%= t "welcome_page.questions.title" %></h3>
   <span class='sprite small term question'></span>
 <div class='col12 clearfix icon-list'>
   <h3><%= t "welcome_page.questions.title" %></h3>
   <span class='sprite small term question'></span>

-  <p><%= t "welcome_page.questions.paragraph_1_html" %></p>
+  <p><%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %></p>

 </div>
 
 <div class='clearfix center'>
 </div>
 
 <div class='clearfix center'>


@@ -64,4 +70,4 @@
     <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>
     <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>