X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/af227e5aeb1650afe432486ccf81a486a4a27574..7fcb76aa9a627ef18bfdecf77dfb096ba03d0490:/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..886aaf006 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,41 +1,41 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "about" %>
-<% end %>
-
 <div class='attr'>
   <div class='byosm'>
-    <%= t "about_page.copyright_html" %>
+    <%= t ".copyright_html" %>
   </div>
 
   <div class='user-image'></div>
 
-  <strong>
-    <%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %>
-  </strong>
+  <h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
 </div>
 
 <div class='text'>
   <div class='section'>
-    <p><strong><%= t "about_page.lede_text" %></strong></p>
-    <h2><div class='icon local'></div><%= t "about_page.local_knowledge_title" %></h2>
-    <p><%= t "about_page.local_knowledge_html" %></p>
+    <p><strong><%= t ".lede_text" %></strong></p>
+    <h2><div class='icon local'></div><%= t ".local_knowledge_title" %></h2>
+    <p><%= t ".local_knowledge_html" %></p>
   </div>
 
   <div class='section'>
-    <h2><div class='icon community'></div><%= t "about_page.community_driven_title" %></h2>
-    <p><%= t "about_page.community_driven_html", :diary_path => diary_path %></p>
+    <h2><div class='icon community'></div><%= t ".community_driven_title" %></h2>
+    <p><%= t ".community_driven_html", :diary_path => diary_entries_path %></p>
   </div>
 
   <div class='section' id='open-data'>
-    <h2><div class='icon open'></div><%= t "about_page.open_data_title" %></h2>
-    <p><%= t "about_page.open_data_html", :copyright_path => copyright_path %></p>
+    <h2><div class='icon open'></div><%= t ".open_data_title" %></h2>
+    <p><%= t ".open_data_html", :copyright_path => copyright_path %></p>
   </div>
-</div>
 
-<% 5.times do |i| %>
-  <div class='caption photo-<%= i %>'>
-    <%= t "about_page.photo_caption_#{i}_html" %>
+  <div class='section' id='legal'>
+    <h2><div class='icon legal'></div><%= t ".legal_title" %></h2>
+    <p><%= t ".legal_html" %></p>
   </div>
-<% end %>
 
-<a class='next' id='next-photo' href='#'><%= t "about_page.next" %></a>
+  <div class='section' id='partners'>
+    <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
+    <p><%= t "layouts.hosting_partners_html",
+             :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+             :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+             :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+    </p>
+  </div>
+</div>