X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/af227e5aeb1650afe432486ccf81a486a4a27574..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/views/site/about.html.erb?ds=sidebyside
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index d16e85257..f6f6ba137 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,41 +1,77 @@
-<% content_for :head do %>
- <%= javascript_include_tag "about" %>
-<% end %>
-
-
-
- <%= t "about_page.copyright_html" %>
-
+<% I18n.with_locale @locale do %>
+ <%= tag.div :lang => @locale, :dir => t("html.dir") do %>
+
+
+
+
+
+ <%= t ".heading_html", :copyright => tag.span(t(".copyright_symbol_html")),
+ :br => tag.br %>
+
+
+
+
+
+
<%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name") %>
+
+
+
-
+
+
<%= t ".lede_text" %>
-
- <%= raw t "about_page.used_by", :name => "OpenStreetMap" %>
-
-
+ <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %>
+
<%= t "site.about.local_knowledge_html" %>
+ <% end %>
-
-
-
<%= t "about_page.lede_text" %>
-
<%= t "about_page.local_knowledge_title" %>
-
<%= t "about_page.local_knowledge_html" %>
-
+ <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %>
+
+ <%= t "site.about.community_driven_1_html", :osm_blog_link => link_to(t("site.about.community_driven_osm_blog"),
+ t("site.about.community_driven_osm_blog_url")),
+ :user_diaries_link => link_to(t("site.about.community_driven_user_diaries"),
+ diary_entries_path),
+ :community_blogs_link => link_to(t("site.about.community_driven_community_blogs"),
+ t("site.about.community_driven_community_blogs_url")),
+ :osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"),
+ t("site.about.community_driven_osm_foundation_url")) %>
+
+ <% end %>
-
-
<%= t "about_page.community_driven_title" %>
-
<%= t "about_page.community_driven_html", :diary_path => diary_path %>
-
+ <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %>
+
+ <%= t "site.about.open_data_1_html", :open_data => tag.i(t("site.about.open_data_open_data")),
+ :copyright_license_link => link_to(t("site.about.open_data_copyright_license"),
+ copyright_path) %>
+ <% end %>
-
-
<%= t "about_page.open_data_title" %>
-
<%= t "about_page.open_data_html", :copyright_path => copyright_path %>
-
-
+ <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %>
+
+ <%= t "site.about.legal_1_1_html", :openstreetmap_foundation_link => link_to(t("site.about.legal_1_1_openstreetmap_foundation"),
+ t("site.about.legal_1_1_openstreetmap_foundation_url")),
+ :terms_of_use_link => link_to(t("site.about.legal_1_1_terms_of_use"),
+ t("site.about.legal_1_1_terms_of_use_url")),
+ :aup_link => link_to(t("site.about.legal_1_1_aup"),
+ t("site.about.legal_1_1_aup_url")),
+ :privacy_policy_link => link_to(t("site.about.legal_1_1_privacy_policy"),
+ t("site.about.legal_1_1_privacy_policy_url")) %>
+
+
+ <%= t "site.about.legal_2_1_html", :contact_the_osmf_link => link_to(t("site.about.legal_2_1_contact_the_osmf"),
+ t("site.about.legal_2_1_contact_the_osmf_url")) %>
+
+
+ <%= t "site.about.legal_2_2_html", :registered_trademarks_link => link_to(t("site.about.legal_2_2_registered_trademarks"),
+ t("site.about.legal_2_2_registered_trademarks_url")) %>
+
+ <% end %>
-<% 5.times do |i| %>
-
- <%= t "about_page.photo_caption_#{i}_html" %>
-
+ <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>
+
<%= t "layouts.hosting_partners_html", :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+ :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
+ :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+ :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+
+ <% end %>
+
+ <% end %>
<% end %>
-
-