X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8bd001f1282b7a33a71c0565504e160dbe567d5d..ca719af262380a906103e7aec9befb4c903693a1:/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 dc6a519df..33c9a7e24 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -6,68 +6,88 @@

<%= t ".title" %>

<% end %> -

<%= t ".introduction_html" %>

+

<%= t ".introduction" %>

-

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

+

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

-
-
-
- -
-

<%= t ".whats_on_the_map.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 ".whats_on_the_map.off_html" %>

+
+ + + + +

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

-

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

+

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

-

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

+

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

-
-
- -

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

-
-
- -

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

-
-
- -

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

-
-
- -

<%= t ".basic_terms.tag_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.paragraph_1_html" %>

+

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

- -

<%= t ".questions.paragraph_1_html", :help_url => help_path %>

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

-

<%= t ".add_a_note.paragraph_2_html", :map_url => root_path %>

-
+
+

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