X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f5de157d2845ff1067b14604b2ca6c79ca7a7ac6..56e96d856c7fc168b37cf9d26a58a6da8094cedb:/app/views/site/welcome.html.erb?ds=inline diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index d97b08d9a..92220039a 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -1,95 +1,73 @@ +<% content_for :head do %> + <%= javascript_include_tag "welcome" %> +<% end %> + <% content_for :heading do %> -
<%= t "welcome_page.introduction_html" %>
-<%= t "welcome_page.introduction_html" %>
-<%= t "welcome_page.section_1.paragraph_1_html" %>
-<%= t "welcome_page.section_1.paragraph_2_html" %>
-<%= t "welcome_page.section_2.on_html" %>
+<%= t "welcome_page.whats_on_the_map.on_html" %>
<%= t "welcome_page.section_2.off_html" %>
+<%= t "welcome_page.whats_on_the_map.off_html" %>
<%= t "welcome_page.section_3.paragraph_2_html" %>
+<%= t "welcome_page.basic_terms.paragraph_1_html" %>
+ +<%= t "welcome_page.basic_terms.editor_html" %>
<%= t "welcome_page.section_3.paragraph_1_html" %>
-<%= t "welcome_page.section_3.paragraph_2_html" %>
+<%= t "welcome_page.basic_terms.node_html" %>
<%= t "welcome_page.section_4.paragraph_1_html" %>
-- - <%= t "welcome_page.section_4.editor_html" %> -
-- - <%= t "welcome_page.section_4.node_html" %> -
-- - <%= t "welcome_page.section_4.way_html" %> -
-- - <%= t "welcome_page.section_4.changeset_html" %> -
+<%= t "welcome_page.basic_terms.way_html" %>
+<%= t "welcome_page.basic_terms.tag_html" %>
<%= t "welcome_page.section_5.paragraph_1_html" %>
+<%= t "welcome_page.rules.paragraph_1_html" %>
+<%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>
<%= t "welcome_page.section_6.paragraph_1_html" %>
- <% else %> -<%= t "welcome_page.section_6.paragraph_1_no_user_html" %>
- <% end %> -<%= t "welcome_page.section_6.paragraph_2_html" %>
+ -<%= t "welcome_page.section_7.paragraph_1_html" %>
-<%= t "welcome_page.section_7.paragraph_2_html" %>
+<%= t "welcome_page.add_a_note.paragraph_1_html" %>
+<%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %>