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

[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 b943e01f8d529648860c5cdec43c12d236b29742..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>


@@ -12,7 +12,7 @@
 
 <div class=' clearfix'>
   <div class='col6 inner11'>
 
 <div class=' clearfix'>
   <div class='col6 inner11'>

-    <div class='center clearfix pad1'>
+    <div class='center clearfix inner11'>

       <span class='sprite small check'></span>
     </div>
     <p><%= t "welcome_page.whats_on_the_map.on_html" %></p>
       <span class='sprite small check'></span>
     </div>
     <p><%= t "welcome_page.whats_on_the_map.on_html" %></p>


@@ -48,20 +48,26 @@
   </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'>
   <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>
 </div>
 
 </div>
 
 <div class='clearfix center'>
   <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>
 </div>
 

-<div class='note-box drop'>
+<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>
   <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" %></p>
+    <p><%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %></p>

   </div>
   </div>

-</div>
\ No newline at end of file
+</div>