Merge branch 'master' into moderation

[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 d16e8525705589cd884382b1a7d392132e1722c4..ebc1877f3b5427b3b14f7dc29ea5df9ffa3da1be 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" %>
@@ -9,9 +5,7 @@
 
   <div class='user-image'></div>
 
-  <strong>
-    <%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %>
-  </strong>
+  <h1><%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
 </div>
 
 <div class='text'>
@@ -30,12 +24,19 @@
     <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='legal'>
+    <h2><div class='icon legal'></div><%= t "about_page.legal_title" %></h2>
+    <p><%= t "about_page.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 "about_page.partners_title" %></h2>
+    <p><%= t 'layouts.partners_html',
+             :ucl => link_to(t('layouts.partners_ucl'), "http://www.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'), "https://hardware.openstreetmap.org/thanks/") %>
+    </p>
+  </div>
+</div>