Resolve conflict

[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 8190ac1f87deb73607c90054d5f2a92dd9a9ba54..4edcf361ebb26a4a902fa0afd46e4983b0cc8e18 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -1,94 +1,67 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "welcome" %>
+<% end %>
+
 <% content_for :heading do %>
-  <h2><%= t "welcome_page.title" %></h2>
-  <h3><%= t "welcome_page.subtitle" %></h3>
+  <h1><%= t "welcome_page.title" %></h1>
 <% end %>
 
-<div class='pad2'>
-  <p><%= t "welcome_page.introduction_html" %></p>
-</div>
+<p><%= t "welcome_page.introduction_html" %></p>
 
-<div class='pad2 drop'>
-  <h3><%= t "welcome_page.section_1.title" %></h3>
-  <div class='center'>
-    <span class='sprite large one-map'></span>
-  </div>
-  <p><%= t "welcome_page.section_1.paragraph_1_html" %></p>
-  <p><%= t "welcome_page.section_1.paragraph_2_html" %></p>
-</div>
+<h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
 
-<div class='pad2 drop clearfix'>
-  <h3><%= t "welcome_page.section_2.title" %></h3>
-  <div class='col6 pad1'>
-    <div class='center pad1'>
+<div class=' clearfix'>
+  <div class='col6 inner11'>
+    <div class='center clearfix inner11'>
       <span class='sprite small check'></span>
     </div>
-    <p><%= t "welcome_page.section_2.on_html" %></p>
+    <p><%= t "welcome_page.whats_on_the_map.on_html" %></p>
   </div>
-  <div class='col6 pad1'>
-    <div class='center pad1'>
+  <div class='col6 inner11'>
+    <div class='center clearfix inner11'>
       <span class='sprite small x'></span>
     </div>
-    <p><%= t "welcome_page.section_2.off_html" %></p>
+    <p><%= t "welcome_page.whats_on_the_map.off_html" %></p>
   </div>
 </div>
 
-<% if @user %>
-  <div class='pad2 drop'>
-    <h3><%= t "welcome_page.section_3.title" %></h3>
-    <p><%= t "welcome_page.section_3.paragraph_2_html" %></p>
+<h3><%= t "welcome_page.basic_terms.title" %></h3>
+
+<p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
+
+<div class='col12 clearfix icon-list'>
+  <div class='clearfix'>
+    <span class='sprite small term editor'></span>
+    <p><%= t "welcome_page.basic_terms.editor_html" %></p>
   </div>
-<% else %>
-  <div class='pad2 drop'>
-    <h3><%= t "welcome_page.section_3.title_no_user" %></h3>
-    <p><%= t "welcome_page.section_3.paragraph_1_html" %></p>
-    <p><%= t "welcome_page.section_3.paragraph_2_html" %></p>
+  <div class='clearfix'>
+    <span class='sprite small term node'></span>
+    <p><%= t "welcome_page.basic_terms.node_html" %></p>
   </div>
-<% end %>
-
-<div class='pad2 drop'>
-  <h3><%= t "welcome_page.section_4.title" %></h3>
-  <p><%= t "welcome_page.section_4.paragraph_1_html" %></p>
-  <div class='col12 clearfix'>
-    <p>
-      <span class='sprite small term editor'></span>
-      <%= t "welcome_page.section_4.editor_html" %>
-    </p>
-    <p>
-      <span class='sprite small term node'></span>
-      <%= t "welcome_page.section_4.node_html" %>
-    </p>
-    <p>
-      <span class='sprite small term way'></span>
-      <%= t "welcome_page.section_4.way_html" %>
-    </p>
-    <p>
-      <span class='sprite small term changeset'></span>
-      <%= t "welcome_page.section_4.changeset_html" %>
-    </p>
+  <div class='clearfix'>
+    <span class='sprite small term way'></span>
+    <p><%= t "welcome_page.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>
   </div>
 </div>
 
-<div class='pad2 drop'>
-  <h3><%= t "welcome_page.section_5.title" %></h3>
-  <div class='center pad1'>
-    <span class='sprite small term question'></span>
-  </div>
-  <p><%= t "welcome_page.section_5.paragraph_1_html" %></p>
+<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", :help_url => help_path %></p>
 </div>
 
-<div class='pad2 drop'>
-  <h3><%= t "welcome_page.section_6.title" %></h3>
-  <% if @user %>
-    <p><%= t "welcome_page.section_6.paragraph_1_html" %></p>
-  <% else %>
-    <p><%= t "welcome_page.section_6.paragraph_1_no_user_html" %></p>
-  <% end %>
+<div class='clearfix center'>
+  <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>
 </div>
 
-<div class='note-box pad2 drop'>
-  <div class='pad1'>
-    <h3><%= t "welcome_page.section_7.title" %></h3>
-    <p><%= t "welcome_page.section_7.paragraph_1_html" %></p>
-    <p><%= t "welcome_page.section_7.paragraph_2_html" %></p>
+<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>