X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6a3824fcbff42e58df930483edd350b9daec3aa9..326d4ecec0ca0817567912f5d45b904df4c5b054:/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 eacccf578..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,44 +31,58 @@

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

    +

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