Merge branch 'master' into tooltips-enable-disable

[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 0c8075c6ef2261ad564ea40ff2454c77086e0d97..abf4c60c8bd4786310ede1b8b4f371141c3a07d8 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,42 +1,45 @@
-<div class='attr'>
-  <div class='byosm'>
-    <%= t "about_page.copyright_html" %>
+<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
+  <div class="container-lg attr">
+    <div class='row'>
+      <div class='col-sm-7 user-image'></div>
+      <div class='col-sm-5 px-5 py-3 byosm'>
+        <h5 class='text-white text-nowrap'><%= t ".copyright_html", :locale => @locale %></h5>
+      </div>
+    </div>
+    <div class='row'>
+      <div class="w-100 px-5 py-4 bg-dark">
+        <h1 class="text-white fw-light"><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
+      </div>
+    </div>
   </div>
 
-  <div class='user-image'></div>
+  <div class='bg-white px-5 py-4'>
+    <p class="lead"><%= t ".lede_text", :locale => @locale %></p>
 
-  <h1><%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
-</div>
+    <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %>
+      <p><%= t "site.about.local_knowledge_html", :locale => @locale %></p>
+    <% end %>
 
-<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>
+    <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %>
+      <p><%= t "site.about.community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
+    <% end %>
 
-  <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>
+    <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %>
+      <p><%= t "site.about.open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
+    <% end %>
 
-  <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='legal'>
-    <h2><div class='icon legal'></div><%= t "about_page.legal_title" %></h2>
-    <p><%= t "about_page.legal_html" %></p>
-  </div>
+    <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %>
+      <p><%= t "site.about.legal_1_html", :locale => @locale %></p>
+      <p><%= t "site.about.legal_2_html", :locale => @locale %></p>
+    <% end %>
 
-  <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'), "https://www.ucl.ac.uk"),
-             :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.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>
+    <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>
+      <p><%= t "layouts.hosting_partners_html", :locale => @locale,
+                                                :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
+                                                :fastly => link_to(t("layouts.partners_fastly", :locale => @locale), "https://www.fastly.com/"),
+                                                :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"),
+                                                :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
+      </p>
+    <% end %>
   </div>
-</div>
+<% end %>