From cd4e0a769b6e881b82ee990380b4efb5492dd869 Mon Sep 17 00:00:00 2001
From: Wout Schellaert <wout.schellaert@gmail.com>
Date: Mon, 27 May 2019 13:11:23 +0200
Subject: [PATCH] Add board mails to contact page

---
 content/about/about.erb               |  33 +----
 content/contact.erb                   | 178 ++++++++++++++------------
 layouts/partials/_current_bestuur.erb |  32 +++++
 3 files changed, 129 insertions(+), 114 deletions(-)
 create mode 100644 layouts/partials/_current_bestuur.erb

diff --git a/content/about/about.erb b/content/about/about.erb
index 1c2bb32..ae74dd3 100644
--- a/content/about/about.erb
+++ b/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">
-    <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>
+  <%= render '/partials/_current_bestuur.*' %>
 
 </div>
diff --git a/content/contact.erb b/content/contact.erb
index 277f31e..b88841f 100644
--- a/content/contact.erb
+++ b/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,98 +41,112 @@ 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 -->
-<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'>
-        <div class='contact-circle is-centered'>
-          <div class='contact-circle-pulse grow'></div>
-          <%= fa option[:icon], size: @item[:icon_size], class: 'grow-large' %>
-        </div>
-      </a>
-      <h4 class='contact-description is-uppercase'><%= option[:description] %></h3>
-      <p class='has-text-centered'>
-        <a href='<%= option[:link] %>' class='contact-text-link is-link'><%= option[:action] %></a>
-      </p>
-    </li>
-  </div>
-<% end %>
-</ul>
+<div class="content">
+  <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>
 
-<!-- Extra information tiles -->
-<div id='contact-info' class='tile is-ancestor is-vertical'>
-  <div class='tile is-parent'>
-    <div class='tile is-parent is-vertical'>
-
-      <!-- Payment information -->
-      <div id='payment-info' class='tile is-child box content has-text-centered'>
-        <h1 class='title has-text-centered'>Pay us</h1>
-        <div class='is-divider'></div>
-        <p id='banknumber' class='is-size-5'>
-          BE32 9799 9370 6502
-        </p>
-        <p class='is-size-5'>
-            <b>Please include your Tab name in the description of the transaction</b>
-        </p>
-        <a class='button' href='https://zeus.ugent.be/tab/'>
-          <%= fa :euro, fw: true %> Use Tab
+  <!-- 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'>
+          <div class='contact-circle is-centered'>
+            <div class='contact-circle-pulse grow'></div>
+            <%= fa option[:icon], size: @item[:icon_size], class: 'grow-large' %>
+          </div>
         </a>
-      </div>
-
-      <!-- Calling information -->
-      <div id='calling-info' class='tile is-child box content has-text-centered'>
-        <h1 class='title has-text-centered'>Call us</h1>
-        <div class='is-divider'></div>
-        <p id='phone-number' class='is-size-5'>
-          +32 9 264 47 51<br/>
-          Intern: 4751
+        <h4 class='contact-description is-uppercase'><%= option[:description] %></h3>
+        <p class='has-text-centered'>
+          <a href='<%= option[:link] %>' class='contact-text-link is-link'><%= option[:action] %></a>
         </p>
-      </div>
+      </li>
     </div>
+  <% end %>
+  </ul>
 
-    <!-- Address information -->
-    <div id='address-info' class='tile is-parent'>
-      <div class='tile is-child box content'>
-        <h1 class='title has-text-centered'>Find us</h1>
-        <div class='is-divider'></div>
-        <p class='is-size-5'>
-          You can find our hiding place, or what we call <strong>'de kelder'</strong> at the basement level of following address:
-        </p>
-        <blockquote id='address' class='is-size-5'>
-          Krijgslaan 281<br/>
-          Campus Sterre S9<br/>
-          9000 Gent<br/>
-        </blockquote>
-        <div id='contact-location-buttons'>
-          <a class='button' href='https://www.google.com/maps/place/Zeus+WPI/@51.023115,3.7103,17z/data=!4m5!3m4!1s0x0:0x49fd54f81cafeb5f!8m2!3d51.0231149!4d3.7103?hl=en-US'>
-            <%= fa :'map-marker', fw: true %> Google Maps
-          </a>
-          <a class='button' href='https://soleway.ugent.be/routes/4370'>
-            <%= fa :'map-signs', fw: true %> Soleway
+  <div id="board">
+    <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'>
+
+        <!-- Payment information -->
+        <div id='payment-info' class='tile is-child box content has-text-centered'>
+          <h1 class='title has-text-centered'>Pay us</h1>
+          <div class='is-divider'></div>
+          <p id='banknumber' class='is-size-5'>
+            BE32 9799 9370 6502
+          </p>
+          <p class='is-size-5'>
+              <b>Please include your Tab name in the description of the transaction</b>
+          </p>
+          <a class='button' href='https://zeus.ugent.be/tab/'>
+            <%= fa :euro, fw: true %> Use Tab
           </a>
         </div>
+
+        <!-- Calling information -->
+        <div id='calling-info' class='tile is-child box content has-text-centered'>
+          <h1 class='title has-text-centered'>Call us</h1>
+          <div class='is-divider'></div>
+          <p id='phone-number' class='is-size-5'>
+            +32 9 264 47 51<br/>
+            Intern: 4751
+          </p>
+        </div>
+      </div>
+
+      <!-- Address information -->
+      <div id='address-info' class='tile is-parent'>
+        <div class='tile is-child box content'>
+          <h1 class='title has-text-centered'>Find us</h1>
+          <div class='is-divider'></div>
+          <p class='is-size-5'>
+            You can find our hiding place, or what we call <strong>'de kelder'</strong> at the basement level of following address:
+          </p>
+          <blockquote id='address' class='is-size-5'>
+            Krijgslaan 281<br/>
+            Campus Sterre S9<br/>
+            9000 Gent<br/>
+          </blockquote>
+          <div id='contact-location-buttons'>
+            <a class='button' href='https://www.google.com/maps/place/Zeus+WPI/@51.023115,3.7103,17z/data=!4m5!3m4!1s0x0:0x49fd54f81cafeb5f!8m2!3d51.0231149!4d3.7103?hl=en-US'>
+              <%= fa :'map-marker', fw: true %> Google Maps
+            </a>
+            <a class='button' href='https://soleway.ugent.be/routes/4370'>
+              <%= fa :'map-signs', fw: true %> Soleway
+            </a>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
 
-  <!-- Mattermost information -->
-  <div id='mattermost-info' class='tile is-parent'>
-    <div class='tile is-child box content'>
-      <h1 class='title has-text-centered'>Mattermost info</h1>
-      <div class='is-divider'></div>
-      <p id='mattermost-info-text' class='is-size-5'>
-        You can register with any valid email address.
-      </p>
+    <!-- Mattermost information -->
+    <div id='mattermost-info' class='tile is-parent'>
+      <div class='tile is-child box content'>
+        <h1 class='title has-text-centered'>Mattermost info</h1>
+        <div class='is-divider'></div>
+        <p id='mattermost-info-text' class='is-size-5'>
+          You can register with any valid email address.
+        </p>
+      </div>
     </div>
   </div>
-</div>
 
-<!-- Embedded Google Maps -->
-<div class="map-wrapper box">
-    <%= render '/partials/_map.erb', location: "Zeus WPI" %>
-</div>
+  <!-- Embedded Google Maps -->
+  <div class="map-wrapper box">
+      <%= render '/partials/_map.erb', location: "Zeus WPI" %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/_current_bestuur.erb b/layouts/partials/_current_bestuur.erb
new file mode 100644
index 0000000..782b3ec
--- /dev/null
+++ b/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>
\ No newline at end of file