Merge remote-tracking branch 'upstream/pull/5341'

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

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 5097dd340464cf3d9a05463965d1827124a3acf7..b180eb1a58cd980f5316317444acb1a9941e9b16 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -1,18 +1,25 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t "help_page.title" %></h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <% end %>
 

-<p class='introduction'><%= t "help_page.introduction" %></p>
+<p class='introduction'><%= t ".introduction" %></p>

 
 

-<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'wiki'].each do |site| %>
-  <% unless site == 'welcome' && !@user %>
-  <div class='<%= site %> help-item'>
-  <h3>
-    <a href='<%= t "help_page.#{site}.url" %>'>
-      <%= t "help_page.#{site}.title" %>
-    </a>
-  </h3>
-  <p><%= t "help_page.#{site}.description" %></p>
-  </div>
+<% sites = %w[beginners_guide community mailing_lists irc switch2osm welcomemat wiki] %>
+<% sites.prepend("welcome") if current_user %>
+
+<div class="row row-cols-sm-3 g-4 mb-3">
+  <% sites.each do |site| %>
+    <div class="col">
+      <div class='<%= site %> help-item card h-100'>
+        <h6 class='card-header'>
+          <a href='<%= t ".#{site}.url" %>' class='stretched-link'>
+            <%= t ".#{site}.title" %>
+          </a>
+        </h6>
+        <div class='card-body'>
+          <p class='card-text'><%= t ".#{site}.description" %></p>
+        </div>
+      </div>
+    </div>

   <% end %>
   <% end %>

-<% end %>
+</div>