X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef880621a40a6065699ee69e3ba69c7a64a2afde..dca0be1886d9b9fcd2cab1b7c82ac4132fbf722b:/app/views/site/welcome.html.erb?ds=sidebyside

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 4377da670..92220039a 100644
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -3,98 +3,71 @@
 <% 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.one_map_many_uses.title" %></h3>
-  <div class='center one-map'>
-    <div class='sprite large one-map'>
-      <span class='one-map-name one-map-project-name'><%= t "layouts.project_name.title" %></span>
-      <% t("welcome_page.one_map_many_uses.names").sample(6).each_with_index do |name, i| %>
-        <span class='one-map-name one-map-name-<%= i+1 %>'><%= name %></span>
-      <% end %>
-    </div>
-  </div>
-  <p><%= t "welcome_page.one_map_many_uses.paragraph_1_html" %></p>
-</div>
+<h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
 
-<div class='pad2 drop clearfix'>
-  <h3><%= t "welcome_page.whats_on_the_map.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.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.whats_on_the_map.off_html" %></p>
   </div>
 </div>
 
-<div class='pad2 drop'>
-  <h3><%= t "welcome_page.basic_terms.title" %></h3>
-  <p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
-  <div class='col12 clearfix'>
-    <p>
-      <span class='sprite small term editor'></span>
-      <%= t "welcome_page.basic_terms.editor_html" %>
-    </p>
-    <p>
-      <span class='sprite small term node'></span>
-      <%= t "welcome_page.basic_terms.node_html" %>
-    </p>
-    <p>
-      <span class='sprite small term way'></span>
-      <%= t "welcome_page.basic_terms.way_html" %>
-    </p>
-    <p>
-      <span class='sprite small term changeset'></span>
-      <%= t "welcome_page.basic_terms.changeset_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>
+  <div class='clearfix'>
+    <span class='sprite small term node'></span>
+    <p><%= t "welcome_page.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>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term tag'></span>
+    <p><%= t "welcome_page.basic_terms.tag_html" %></p>
+  </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='pad2 drop'>
+<div class='col12 clearfix icon-list'>
   <h3><%= t "welcome_page.questions.title" %></h3>
-  <div class='center pad1'>
-    <span class='sprite small term question'></span>
-  </div>
-  <p><%= t "welcome_page.questions.paragraph_1_html" %></p>
+  <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.contributing.title" %></h3>
-  <% if @user %>
-    <p>
-      <%= t "welcome_page.contributing.paragraph_1_html" %>
-      <span class='edit-located'><%= t "welcome_page.contributing.paragraph_located" %></span>
-      <span class='edit-geocoded'><%= t "welcome_page.contributing.paragraph_geocoded_html" %></span>
-      <span class='edit-geolocated'><%= t "welcome_page.contributing.paragraph_geolocated" %></span>
-    </p>
-    <div class='center'>
-      <a href="<%= edit_path %>" class="edit-located edit-geocoded edit-geolocated start-mapping"><%= t "welcome_page.contributing.start_mapping" %></a>
-    </div>
-  <% else %>
-    <p><%= t "welcome_page.contributing.paragraph_1_no_user_html" %></p>
-    <div class='center'>
-      <a href="<%= user_new_path %>" class="sign-up"><%= t "welcome_page.contributing.sign_up" %></a>
-    </div>
-  <% 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'>
+<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" %></p>
+    <p><%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %></p>
   </div>
 </div>