Merge pull request #17 from RevolutionVA/development

Board members & Schedule

Author: lynnaloo

controllers/about.js

@@ -11,7 +11,8 @@ module.exports = () => {
         socialMedia: content.getSocialMedia(),
         pages: content.getPages(),
         organizers: content.getOrganizers(),
-        volunteers: content.getVolunteers()
+        volunteers: content.getVolunteers(),
+        boardMembers: content.getBoardMembers()
     })
         .then(results => ({
             locals: {
@@ -21,6 +22,7 @@ module.exports = () => {
             },
             intro: results.pages.about.intro,
             organizers: results.organizers,
-            volunteers: results.volunteers
+            volunteers: results.volunteers,
+            boardMembers: results.boardMembers
         }));
 }

public/css/print.css

@@ -0,0 +1,11 @@
+header.site-header {
+	display: none;
+}
+
+a[href]:after {
+	content: none !important;
+}
+
+.heart.unchecked {
+	display: none;
+}

public/css/print.css.map

@@ -608,6 +608,8 @@ hr {
 	}
 }
 
+
+
 .btn-toggle {
 	&.closed .fa-minus {
 		display: none;

public/css/print.scss

@@ -89,7 +89,7 @@ jQuery(function ($) {
             favorite(heart.data('heart'), !heart.hasClass('unchecked'));
         });
 
-        var favorites = (window.localStorage.getItem('revConfSchedule') || '').split(',') || [],
+        var favorites = (window.localStorage.getItem('revConfSchedule') || '').split(','),
             saveTimeout = false;
 
         favorites = Array.isArray(favorites) ? favorites : [];

public/css/style.css.map

@@ -78,6 +78,16 @@ module.exports = function () {
                 });
         },
 
+        getBoardMembers: function () {
+
+            return getType('humans')
+                .then(data => {
+                    return data
+                        .filter(h => h.role.includes('Board Member'))
+                        .sort((h1, h2) => h1.lastName > h2.lastName);
+                });
+        },
+
         getSpeakers: function () {
 
             return getTalksBySpeaker()

public/css/style.scss

@@ -1,6 +1,7 @@
 <% include ../partials/header.ejs %>
 <%
 organizers = organizers || [];
+boardMembers = boardMembers || [];
 volunteers = volunteers || [];
 %>
 <div class="page-sections">
@@ -23,6 +24,18 @@ volunteers = volunteers || [];
                     </div>
                 </div>
 
+                <% if(boardMembers.length) { %>
+                <h3 class="h2 league-gothic">Our Board Members</h3>
+                <div class="organizers">
+                    <div class="row">
+                        <% boardMembers.forEach(function(human) { %>
+                        <%- include('../partials/human.ejs', {human: human}) %>
+                        <% }); %>
+                    </div>
+                </div>
+                <% } %>
+
+                <% if(volunteers.length) { %>
                 <h3 class="h2 league-gothic">Our Volunteers</h3>
                 <div class="organizers">
                     <div class="row">
@@ -31,6 +44,7 @@ volunteers = volunteers || [];
                         <% }); %>
                     </div>
                 </div>
+                <% } %>
 
             </div>
         </div>

public/js/main.js

@@ -22,6 +22,7 @@ bodyClass = bodyClass || [];
     <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 
     <link rel="stylesheet" href="/css/style.css"/>
+    <link rel="stylesheet" href="/css/print.css" media="print"/>
 
     <link rel="apple-touch-icon" sizes="57x57" href="/icons/apple-touch-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="/icons/apple-touch-icon-60x60.png">
@@ -87,5 +88,8 @@ bodyClass = bodyClass || [];
         <li class="nav-item" data-section-id="location">
             <a class="nav-link" href="/#location"><span>Location</span></a>
         </li>
+        <li class="nav-item">
+            <a class="nav-link" href="/schedule"><span>Schedule</span></a>
+        </li>
     </ul>
 </header>