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

[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..e6c65a99239526629cf72bdfa06e1d6cc9569201 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -1,18 +1,32 @@
 <% 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>
+<% sites = %w[beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki] %>
+<% sites.prepend("welcome") if current_user %>
+
+<% sites.in_groups_of(3, false) do |group| %>
+  <div class="card-deck mb-4">
+    <% group.each do |site| %>
+      <div class='<%= site %> help-item card'>
+        <div class='card-body'>
+          <h6 class='card-title'>
+            <a href='<%= t ".#{site}.url" %>'>
+              <%= t ".#{site}.title" %>
+            </a>
+          </h3>
+          <p class='card-text'><%= t ".#{site}.description" %></p>
+        </div>
+        <div class="card-footer">
+          <small>
+            <a href='<%= t ".#{site}.url" %>'>
+              <%= t ".#{site}.url" %>
+            </a>
+          </small>
+        </div>
+      </div>
+    <% end %>

   </div>
   </div>

-  <% end %>

 <% end %>
 <% end %>