Update bundle

[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 59d0db062d3e10ac59d5c89f34076b2c750dc4e8..07b2f9e52170d18f923847cf168119813649c9da 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,43 +1,42 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "about" %>
-<% end %>
+<div class='attr'>
+  <div class='byosm'>
+    <%= t "about_page.copyright_html" %>
+  </div>

 
 

-<div id='content-body'>
-  <div class='attr'>
-    <div class='byosm'>
-      <%= t "about_page.copyright_html" %>
-    </div>
+  <div class='user-image'></div>

 
 

-    <div class='user-image'></div>
+  <h1><%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
+</div>

 
 

-    <strong>
-      <%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %>
-    </strong>
+<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>

   </div>
 
   </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>
-    </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>
-    </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>
+  </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>
-    </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>

   </div>
   </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>
   </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.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>
+</div>