Add board mails to contact page

content/about/about.erb

@@ -34,37 +34,6 @@ narrow_page: true
     Mail us all at: <a href='mailto:bestuur@zeus.ugent.be'>bestuur@zeus.ugent.be</a>
   </blockquote>
 
-  <table class="table board-table">
+  <%= render '/partials/_current_bestuur.*' %>
-    <thead>
-      <tr>
-        <th>Function</th>
-        <th>Name</th>
-        <th>E-mail</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% current_bestuur.each do |lid| %>
-      <tr>
-        <td>
-          <%= lid[:rol] %>
-        </td>
-        <td>
-          <%= lid[:naam] %>
-        </td>
-        <td>
-          <%= lid[:mail] %>
-        </td>
-        <td>
-          <% if lid[:mail] %>
-          <a href="mailto:<%= lid[:mail] %>">
-            <%= fa :envelope %>
-          </a>
-          <% end %>
-        </td>
-      </tr>
-      <% end %>
-    </tbody>
-  </table>
 
 </div>

content/contact.erb

@@ -10,7 +10,7 @@ contact_links:
     description: Facebook
     action: Like us
   - icon: envelope
-    link: ../about#board
+    link: ../contact#board
     description: Email
     action: Mail us
   - icon: twitter
@@ -41,12 +41,14 @@ contact_links:
 <script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
 <% end %>
 
-<h1 class='title is-1 has-text-centered'>Contact us</h1>
-<h2 class='subtitle is-4 has-text-centered has-text-weight-light'>bleep bloop</h1>
 
-<!-- Contact buttons -->
+<div class="content">
-<ul id='contact-icons' class='columns is-centered is-multiline'>
+  <h1 class='title is-1 has-text-centered'>Contact us</h1>
-<% @item[:contact_links].each do |option| %>
+  <h2 class='subtitle is-4 has-text-centered has-text-weight-light'>bleep bloop</h1>
+
+  <!-- Contact buttons -->
+  <ul id='contact-icons' class='columns is-centered is-multiline'>
+  <% @item[:contact_links].each do |option| %>
     <div class='column is-one-quarter-desktop is-one-third-tablet is-half-mobile'>
       <li id='<%= option[:description] %>' class='contact-circle-option'>
         <a href='<%= option[:link] %>' class='contact-circle-wrapper'>
@@ -61,11 +63,22 @@ contact_links:
         </p>
       </li>
     </div>
-<% end %>
+  <% end %>
-</ul>
+  </ul>
 
-<!-- Extra information tiles -->
+  <div id="board">
-<div id='contact-info' class='tile is-ancestor is-vertical'>
+    <h2>The board (<%= pretty_year @config[:academic_year] %>)</h2>
+    <blockquote>
+      Mail us all at: <a href='mailto:bestuur@zeus.ugent.be'>bestuur@zeus.ugent.be</a>
+    </blockquote>
+
+    <%= render '/partials/_current_bestuur.*' %>
+  </div>
+
+
+  <!-- Extra information tiles -->
+  <h2>Varia</h2>
+  <div id='contact-info' class='tile is-ancestor is-vertical'>
     <div class='tile is-parent'>
       <div class='tile is-parent is-vertical'>
 
@@ -130,9 +143,10 @@ contact_links:
         </p>
       </div>
     </div>
-</div>
+  </div>
 
-<!-- Embedded Google Maps -->
+  <!-- Embedded Google Maps -->
-<div class="map-wrapper box">
+  <div class="map-wrapper box">
       <%= render '/partials/_map.erb', location: "Zeus WPI" %>
+  </div>
 </div>

layouts/partials/_current_bestuur.erb

@@ -0,0 +1,32 @@
+<table class="table board-table">
+  <thead>
+    <tr>
+      <th>Function</th>
+      <th>Name</th>
+      <th>E-mail</th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% current_bestuur.each do |lid| %>
+    <tr>
+      <td>
+        <%= lid[:rol] %>
+      </td>
+      <td>
+        <%= lid[:naam] %>
+      </td>
+      <td>
+        <%= lid[:mail] %>
+      </td>
+      <td>
+        <% if lid[:mail] %>
+        <a href="mailto:<%= lid[:mail] %>">
+          <%= fa :envelope %>
+        </a>
+        <% end %>
+      </td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>