X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/14936150ac8ab5cb4e8347b772b2c966f2add43f..dd1c07f609e4ebfb5398e84a007264c4ee8cf66d:/app/views/site/welcome.html.erb diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index b05620f59..33c9a7e24 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -11,16 +11,18 @@

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

-
-
- -
+
+ + + +

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

-
-
- -
+
+ + + +

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

@@ -29,43 +31,63 @@

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

-
-
- -

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

-
- <%= render "any_questions" %> -
+<%= render "any_questions" %> -
-

<%= t ".start_mapping" %>

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

<%= 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") %>

+ :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %>