Merge pull request #173 from bsidesnyc/master

Added new floor layouts, plus various optimizations
bsidesnyc · Sep 28, 2024 · 6af80d4 · 6af80d4
2 parents 2694792 + fcfb0a1
commit 6af80d4
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 91 deletions.
diff --git a/_config.yml b/_config.yml
@@ -233,10 +233,6 @@ directionDetailsCards:
  - {title: "Public Transit", information: "The closest subway station is <b>59 St. - Columbus Circle</b> (A,B,C & D lines). From this stop, it is less than a .5 mile walk."}
  - {title: "Hotels", information: "<a href='https://www.marriott.com/en-us/hotels/nycft-fairfield-inn-and-suites-new-york-manhattan-central-park/overview/'>Fairfield Inn & Suites New York Manhattan/Central Park</a> is right next door."}
 
-# Logistics Venue Map
-venueMapTitle: "Get around John Jay College"
-venueMapImage: "map.png"
-
 #-----------------------------------------------
 # Partners
 #-----------------------------------------------
@@ -283,17 +279,23 @@ priceInfo: 'Tickets are FREE! If you want to support the conference, you can don
 #-----------------------------------------------
 # Venue
 #-----------------------------------------------
-venueBlockTitle: "John Jay College of Criminal Justice"
-venueBlockAddress: "524 W. 59th Street, New York, NY"
-venueImageAtrium: "atrium.jpg"
-venueRoomImage1: "240.jpg"
-venueRoomImage2: "L615.jpg"
-venueRoomImage3: "L763.jpg"
-venueRoomImage4: "bsidesnyc-johnjay-moot.jpg"
-venueTitle: "John Jay College of Criminal Justice"
-venueFeatures: ["Guest Wi-Fi will be available." ]
-venueRooms:
-  - {id: "0", name: "Lynn & Jules Kroll Atrium", image: "atrium.jpg", link: "http://www.locationsnewyorkcity.com/mainlocation/lynn-jules-kroll-atrium/"}
+venueTitle: John Jay College of Criminal Justice
+venueAddress: 524 W. 59th Street, New York, NY
+venuePhotosPrimary: atrium.jpg
+venuePhotosSecondary:
+  - 240.jpg
+  - L615.jpg
+  - L763.jpg
+venueMapsIntro: "Tracks are split across multiple floors. You'll enter and register on the Ground floor where the Red Track (L.63), Keynote (L.63), and Entrepreneur Track (L.61) are. Go down via stairs or elevator to Lower Level (L2) for the Blue Track (L2.84) and Other Track (L2.85). Go up via elevator to the 6th Floor for the Villages (Moot Court) and to the 9th for CTF."
+venueFloorMaps:
+  - name: Ground Floor (L)
+    image: bsidesnyc-johnjay-ground-floor.png
+  - name: Lower Level (L2)
+    image: bsidesnyc-johnjay-L2.png
+  - name: 6th Floor
+    image: bsidesnyc-johnjay-6th.png
+  - name: 9th Floor
+    image: bsidesnyc-johnjay-9th.png
 
 #-----------------------------------------------
 # Volunteers
@@ -302,19 +304,52 @@ volunteersTitle: "Want to Volunteer?"
 volunteersSlackUrl: https://join.slack.com/t/bsidesnyc/shared_invite/zt-2g5pte0rr-apFan_yKvoAWMHF_OM67IA
 volunteersSubscribeTitle: "Join the Team"
 
-
-#-----------------------------------------------
-# Food Trucks
 #-----------------------------------------------
-foodtruckBlurb: "Food Trucks are outside on the north west portion of W58th Street between 10th and 11th Avenues"
-foodtruckCoordinates: 40.7709122,-73.9899159
-foodtruckStreetAddress: 40.770603, -73.989948
-foodtruckLocality: New York, NY
-foodtruckButtonText: View Map
-foodtruck1Name: Wraps and Kebabs
-foodtruck1Description: Wraps & Kebabs food truck is the first & only Halal Authentic Egyptian food truck in NYC
-foodtruck2Name: Stuf’d
-foodtruck2Description: Gourmet Street Eats, sandwiches and grilled cheese.
+# CTF 
+#-----------------------------------------------
+ctfHeader: Game On! 
+ctfHeaderMessage: We are so excited to offer multiple Capture The Flag (CTF) competitions. Play one or play them all! All CTFs require a laptop and have both offensive and defensive challenges.
+ctfHeaderMessageFloor: Visit the CTF on the 9th floor
+# Really we don't want an odd number of CTFs. If we have odd, it'll look a little strange 
+# on the desktop version
+ctfs:
+  #
+  # CTFd 
+  #
+  - logo: ctfd.svg
+    header: Play Whenever
+    features:
+      - Jeopardy-Style CTF
+      - Reverse engineering, vulnerable web applications, and more
+      - Play all day or casually pick up a challenge
+      - Individual or team-based
+      - Compare your progress against others on leaderboard
+    registration: # No more than 2 registration buttons
+      - url: https://ctfd.io
+        disabled: true 
+        title: Register Now
+    registrationMessage: Registration opens day of event
+    url: https://ctfd.io
+  #
+  # Pros Vs Joes
+  #
+  - logo: PvJlogo.png 
+    header: Full Day Event
+    features:
+      - Register before BSidesNYC to participate
+      - Offensive vs Defensive Style CTF
+      - Team based activities
+      - "\"Joes\" learn and face challenges"
+      - "\"Pros\" flex their skills and help the Joes"
+    registration: # No more than 2 registration buttons
+      - url: https://forms.gle/68pwNwQARzPMuMjY7 
+        disabled: false
+        title: Pro Registration 
+      - url: https://forms.gle/MaHcxPg9nZPDv98X9 
+        disabled: false
+        title: Joe Registration
+    registrationMessage: 
+    url: http://prosversusjoes.net/
 
 # Tweets Feed Block
 tweetsFeedImage: "twitter-feed.jpg"

diff --git a/_includes/ctf.html b/_includes/ctf.html
@@ -2,53 +2,39 @@
 <section id="about-ctf" class="about-ctf" style="background-color: white">
     <div class="content-wrapper">
         <div class="col-md-8 col-md-offset-2">
-            <h3>Game On!</h3>
-            <p>We are so excited to offer multiple Capture The Flag (CTF) competitions. Play one or play them all! All CTFs require a laptop and have both offensive and defensive challenges.</p>
-            <!-- CTFd Start -->
-            <div class="col-md-6">
-                <div class="ctf-header ctf-img-wrapper">
-                    <img class="img-responsive" src="{{ site.baseurl }}/img/ctf/ctfd.svg">  
-                </div>
-                <div class="ctf-content">
-                    <h4>Play Whenever</h4>
-                    <ul>
-                        <li>Jeopardy-Style CTF</li>
-                        <li>Reverse engineering, vulnerable web applications, and more</li>
-                        <li>Play all day or casually pick up a challenge</li>
-                        <li>Individual or team-based</li>
-                        <li>Compare your progress against others on leaderboard</li>
-                    </ul>
-                </div>
-                <div class="ctf-footer">
-                    <a href="{{ site.ctfdUrl }}" class="btn btn-primary disabled" target="_blank">Register Now</a><br>
-                    <small>Registration opens day of event</small><br>
-                    <a href="https://ctfd.io">Learn more</a> 
-                </div>
-            </div>
-            <!-- CTFd End -->
-            <!-- Pros v Joes Start -->
+            <h3>{{ site.ctfHeader }}</h3>
+            <p>{{ site.ctfHeaderMessage }}</p>
+            <p>{{ site.ctfHeaderMessageFloor }}</p>
+
+            {% for ctf in site.ctfs %}
+
+            <!-- ctf start -->
             <div class="col-md-6">
                 <div class="ctf-header ctf-img-wrapper">
-                    <img class="img-responsive" src="{{ site.baseurl }}/img/ctf/PvJlogo.png">  
+                    <img class="img-responsive" src="{{ site.baseurl }}/img/ctf/{{ ctf.logo }}">  
                 </div>
                 <div class="ctf-content">
-                    <h4>Full Day Event</h4>
+                    <h4>{{ ctf.header }}</h4>
                     <ul>
-                        <li>Register before BSidesNYC to participate</li>
-                        <li>Offensive vs Defensive Style CTF</li>
-                        <li>Team based activities</li>
-                        <li>"Joes" learn and face challenges</li>
-                        <li>"Pros" flex their skills and help the Joes</li>
+                        {% for feature in ctf.features %}
+                        <li>{{ feature }}</li>
+                        {% endfor %}
                     </ul>
                 </div>
                 <div class="ctf-footer">
-                    <a href="https://forms.gle/68pwNwQARzPMuMjY7" class="btn btn-primary" target="_blank">Pro Registration</a>
-                    <a href="https://forms.gle/MaHcxPg9nZPDv98X9" class="btn btn-primary" target="_blank">Joe Registration</a><br> 
-                    <a href="http://prosversusjoes.net/">Learn more</a> 
+                    {% for registration in ctf.registration %}
+                    <a href="{{ registration.url }}" class="btn btn-primary {% if registration.disabled %}disabled{% endif %}" target="_blank">{{ registration.title }}</a>
+                    {% endfor %}
+                    <br>
+                    {% if ctf.registrationMessage %}
+                    <small>{{ ctf.registrationMessage }}</small><br>
+                    {% endif %}
+                    <a href="{{ ctf.url }}">Learn more</a> 
                 </div>
             </div>
-            <!-- Pros v Joes End -->
-
+            <!-- ctf end -->
+
+            {% endfor %}
         </div>
     </div>
 </section>

diff --git a/_includes/venue-map.html b/_includes/venue-map.html
@@ -4,27 +4,19 @@
         <div class="row">
             <div class="col-lg-6 col-lg-offset-3 col-xs-12">
                 <h3>Maps</h3>
-                <p>Tracks are split across multiple floors. You'll enter and register on the Ground floor where the Red Track (L.63), Keynote (L.63), and Entrepreneur Track (L.61) are. Go down via stairs or elevator to Lower Level (L2) for the Blue Track (L2.84) and Other Track (L2.85). Go up via elevator to the 6th Floor for the Villages (Moot Court) and CTF (Quad). </p>
+                <p>{{ site.venueMapsIntro }}</p>
             </div>
         </div>
+
+        {% for map in site.venueFloorMaps %}
         <div class="row">
             <div class="col-lg-6 col-lg-offset-3 col-xs-12">
-                <h4>Ground Floor (L)</h4>
-                <img class="animated venue-map" data-animation="fadeIn" src="/img/venue/bsidesnyc-johnjay-ground-floor.png">
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-6 col-lg-offset-3 col-xs-12">
-                <h4>Lower Level (L2)</h4>
-                <img class="animated venue-map" data-animation="fadeIn" src="/img/venue/bsidesnyc-johnjay-L2.png">
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-6 col-lg-offset-3 col-xs-12">
-                <h4>6th Floor</h4>
-                <img class="animated venue-map" data-animation="fadeIn" src="/img/venue/bsidesnyc-johnjay-6th.png">
+                <h4>{{ map.name }}</h4>
+                <img class="animated venue-map" data-animation="fadeIn" src="{{ site.baseUrl }}/img/venue/{{ map.image }}">
             </div>
         </div>
+        {% endfor %}
+
     </div>
 </section>
 <!-- End Venue Section -->
diff --git a/_includes/venue.html b/_includes/venue.html
@@ -2,27 +2,23 @@
 <section id="venue">
     <div class="content-wrapper">
         <div class="col-lg-10 col-lg-offset-1">
-            <h4>{{ site.venueBlockTitle }}</h4>
-            <p>{{ site.venueBlockAddress }}</p>
+            <h4>{{ site.venueTitle }}</h4>
+            <p>{{ site.venueAddress }}</p>
 
             <div class="row venue-row">
                 <div class="col-md-8 col-sm-8 venue-col">
                     <div class="venue-elem-wrapper">
-                        <div class="venue-elem image-section venue-big-elem venue-img animated hiding" data-animation="fadeIn" data-delay="0" style="background-image: url({{ site.baseurl }}/img/venue/{{ site.venueImageAtrium }})"></div>
+                        <div class="venue-elem image-section venue-big-elem venue-img animated hiding" data-animation="fadeIn" data-delay="0" style="background-image: url({{ site.baseurl }}/img/venue/{{ site.venuePhotosPrimary }})"></div>
                     </div>
                 </div>
                 <div class="col-md-4 col-sm-4 venue-col venue-small-col">
+
+                    {% for image in site.venuePhotosSecondary %}
                     <div class="venue-elem-wrapper col-md-12 col-sm-12 col-xs-6">
-                        <div class="venue-elem image-section venue-small-elem venue-img animated hiding" data-animation="fadeIn" data-delay="150" style="background-image: url({{ site.baseurl }}/img/venue/{{ site.venueRoomImage1 }})"></div>
-                    </div>
-                    <div class="venue-elem-wrapper col-md-12 col-sm-12 col-xs-6">
-                        <div class="venue-elem image-section venume-small-elem venue-img animated hiding" data-animation="fadeIn" data-delay="0" style="background-image: url({{ site.baseurl }}/img/venue/{{ site.venueRoomImage4 }})"></div>
-                    <div class="venue-elem-wrapper col-md-12 col-sm-12 col-xs-6">
-                        <div class="venue-elem image-section venue-small-elem venue-img animated hiding" data-animation="fadeIn" data-delay="0" style="background-image: url({{ site.baseurl }}/img/venue/{{ site.venueRoomImage3 }})"></div>
-                    </div>
-                    <div class="venue-elem-wrapper col-md-12 col-sm-12 col-xs-6">
-                        <div class="venue-elem image-section venue-small-elem venue-img animated hiding" data-animation="fadeIn" data-delay="0" style="background-image: url({{ site.baseurl }}/img/venue/{{ site.venueRoomImage2 }})"></div>
+                        <div class="venue-elem image-section venue-small-elem venue-img animated hiding" data-animation="fadeIn" data-delay="150" style="background-image: url({{ site.baseurl }}/img/venue/{{ image }})"></div>
                     </div>
+                    {% endfor %}
+
                 </div>
             </div>
         </div>

diff --git a/img/venue/bsidesnyc-johnjay-6th.png b/img/venue/bsidesnyc-johnjay-6th.png
diff --git a/img/venue/bsidesnyc-johnjay-9th.png b/img/venue/bsidesnyc-johnjay-9th.png
diff --git a/img/venue/bsidesnyc-johnjay-L2.png b/img/venue/bsidesnyc-johnjay-L2.png
diff --git a/img/venue/bsidesnyc-johnjay-ground-floor.png b/img/venue/bsidesnyc-johnjay-ground-floor.png