X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1a51f2187127f7376e2118b5a4ced49123b0504a..ca719af262380a906103e7aec9befb4c903693a1:/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 98cfba529..33c9a7e24 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -3,102 +3,91 @@ <% end %> <% content_for :heading do %> -

<%= t "welcome_page.title" %>

-

<%= t "welcome_page.subtitle" %>

+

<%= t ".title" %>

<% end %> -
-

<%= t "welcome_page.introduction_html" %>

-
+

<%= t ".introduction" %>

-
-

<%= t "welcome_page.section_1.title" %>

-
- -
-

<%= t "welcome_page.section_1.paragraph_1_html" %>

-

<%= t "welcome_page.section_1.paragraph_2_html" %>

-
+

<%= t ".whats_on_the_map.title" %>

-
-

<%= t "welcome_page.section_2.title" %>

-
-
- -
-

<%= t "welcome_page.section_2.on_html" %>

+
+
+ + + + +

<%= t ".whats_on_the_map.on_the_map_html", :real_and_current => tag.em(t(".whats_on_the_map.real_and_current")) %>

-
-
- -
-

<%= t "welcome_page.section_2.off_html" %>

+
+ + + + +

<%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %>

-<% if @user %> -
-

<%= t "welcome_page.section_3.title" %>

-

<%= t "welcome_page.section_3.paragraph_2_html" %>

-
-<% else %> -
-

<%= t "welcome_page.section_3.title_no_user" %>

-

<%= t "welcome_page.section_3.paragraph_1_html" %>

-

<%= t "welcome_page.section_3.paragraph_2_html" %>

-
-<% end %> +

<%= t ".basic_terms.title" %>

-
-

<%= t "welcome_page.section_4.title" %>

-

<%= 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 ".basic_terms.paragraph_1" %>

-
-

<%= t "welcome_page.section_5.title" %>

-
- -
-

<%= t "welcome_page.section_5.paragraph_1_html" %>

+
    +
  • + + + + + <%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %> +
    • +
  • + + + + + <%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %> +
    • +
  • + + + + + + + + <%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %> +
    • +
  • + + + + + <%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %> +
    • +
+ +

<%= t ".rules.title" %>

+
+ + + + +

<%= t ".rules.para_1_html", :imports_link => link_to(t(".rules.imports"), t(".rules.imports_url")), + :automated_edits_link => link_to(t(".rules.automated_edits"), t(".rules.automated_edits_url")) %>

-
-

<%= t "welcome_page.section_6.title" %>

- <% if @user %> -

- <%= t "welcome_page.section_6.paragraph_1_html" %> - <%= t "welcome_page.section_6.paragraph_located" %> - <%= t "welcome_page.section_6.paragraph_geocoded_html" %> - <%= t "welcome_page.section_6.paragraph_geolocated" %> -

- - <% else %> -

<%= t "welcome_page.section_6.paragraph_1_no_user_html" %>

- <% end %> +<%= render "any_questions" %> + +
+<% if params[:oauth_return_url] %> + <%= t ".continue_authorization" %> +<% else %> + <%= t ".start_mapping" %> +<% end %>
-
-
-

<%= t "welcome_page.section_7.title" %>

-

<%= t "welcome_page.section_7.paragraph_1_html" %>

-

<%= t "welcome_page.section_7.paragraph_2_html" %>

-
+
+

<%= t ".add_a_note.title" %>

+

<%= t ".add_a_note.para_1" %>

+

<%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path), + :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %>