Merge remote-tracking branch 'osmlab/iD-1.6.0'

[rails.git] / app / views / site / about.html.erb

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 066df724cc54c1b4bc23d9a213406da1f008417d..a3954b0ceb7e95d5af845ecf11e135e840946010 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "about" %>
-<% end %>
-
 <div class='attr'>
   <div class='byosm'>
     <%= t "about_page.copyright_html" %>
@@ -28,12 +24,14 @@
     <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>
   </div>
-</div>
 
-<% 5.times do |i| %>
-  <div class='caption photo-<%= i %>'>
-    <%= t "about_page.photo_caption_#{i}_html" %>
+  <div class='section' id='partners'>
+    <h2><div class='icon partners'></div><%= t "about_page.partners_title" %></h2>
+    <p><%= t 'layouts.partners_html',
+             :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
+             :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
+             :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
+             :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
+    </p>
   </div>
-<% end %>
-
-<a class='next' id='next-photo' href='#'><%= t "about_page.next" %></a>
+</div>