Restructure posts into sections, create event pages for Melbourne and…

… Brisbane, add filtering to sections & speakers, add judges, add Google Map with jekyll-maps

Gemfile

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 
 gem "jekyll"
 gem "jekyll-paginate"
+gem "jekyll-maps"
 
 gem "bundler"
 gem "rake"

_config.yml

@@ -3,7 +3,15 @@ baseurl: ""
 url: "https://internetfreedomhack.netlify.com"
 
 collections:
-- speakers
+  speakers:
+    output: false
+  judges:
+    output: false
+  events:
+    output: true
+    permalink: /:name
+  sections:
+    output: true
 
 # THEME-SPECIFIC CONFIGURATION
 theme_settings:
@@ -81,7 +89,14 @@ highlighter: rouge
 sass:
   sass_dir: _sass
   style: :compressed
-plugins: [jekyll-paginate]
+plugins:
+  - jekyll-paginate
+  - jekyll-maps
 exclude:
   - Gemfile
   - Gemfile.lock
+
+# PLUGIN SETTINGS
+maps:
+  google:
+    api_key: AIzaSyD_W96n1fsjwSnQp8Sghfi1EEdfMqsaZdQ

_events/brisbane.md

@@ -0,0 +1,9 @@
+---
+layout: event
+title: Brisbane
+city: brisbane
+location:
+  latitude: -32.5519657
+  longitude: 144.5057256
+  title: ThoughtWorks Brisbane
+---

_events/melbourne.md

@@ -0,0 +1,9 @@
+---
+layout: event
+title: Melbourne
+city: melbourne
+location:
+  latitude: -37.8166797
+  longitude: 144.9617733
+  title: ThoughtWorks Melbourne
+---

_includes/header.html

@@ -15,18 +15,16 @@ <h1 class="site-title">
 	</div>
 	<nav class="site-nav">
 		<ul>
-			{% for page in site.pages %}
-			{% if page.title and page.hide != true %}
+			{% for event in site.events %}
 			<li>
-				<a class="page-link" href="{{ page.url | relative_url }}">
-					{{ page.title }}
+				<a class="page-link" href="{{ event.url | relative_url }}">
+					{{ event.title }}
 				</a>
 			</li>
-			{% endif %}
 			{% endfor %}
 			<!-- Social icons from Font Awesome, if enabled  -->
 			{% include icons.html %}
-            
+
             <!-- Search bar -->
             {% if site.theme_settings.search %}
             <li>
@@ -40,5 +38,5 @@ <h1 class="site-title">
             {% endif %}
 		</ul>
 	</nav>
-    
+
 </header>

_includes/section.html

@@ -0,0 +1,12 @@
+<div class="post-teaser">
+  <header>
+    <h1>
+      <a class="post-link" href="{{ section.url | relative_url }}">
+        {{ section.title }}
+      </a>
+    </h1>
+  </header>
+  <div class="excerpt">
+    {{ section.content | markdownify }}
+  </div>
+</div>

_judges/liam_pomfret.md

@@ -0,0 +1,10 @@
+---
+name: Liam Pomfret
+job_and_qualifications: HDR Student - PhD, Associate Lecturer in Marketing
+cities:
+  - melbourne
+---
+
+Liam Pomfret is an Associate Lecturer in Marketing and a PhD candidate in the UQ Business School at The University of Queensland. His research looks into the antecedent social factors influencing consumers' privacy protection and sharing behaviours in social media. He currently serves on the boards of both the Australian Privacy Foundation and Electronic Frontiers Australia, and is a founding member of Digital Rights Watch Australia. He previously stood for Pirate Party Australia as a senate candidate for Queensland in the 2013 Federal Election.
+
+Subject: **Systems of Change for promoting Social Good**

_judges/matthew_rimmer.md

@@ -0,0 +1,8 @@
+---
+name: Matthew Rimmer
+job_and_qualifications: Professor, Intellectual Property and Innovation, Faculty of Law at Queensland University of Technology (QUT)
+cities:
+  - brisbane
+---
+
+Dr Matthew Rimmer is a Professor in Intellectual Property and Innovation Law at the Faculty of Law, at the Queensland University of Technology (QUT). He is a leader of the QUT Intellectual Property and Innovation Law research program, and a member of the QUT Digital Media Research Centre (QUT DMRC) the QUT Australian Centre for Health Law Research (QUT ACHLR), and the QUT International Law and Global Governance Research Program. Rimmer has published widely on copyright law and information technology, patent law and biotechnology, access to medicines, plain packaging of tobacco products, intellectual property and climate change, and Indigenous Intellectual Property. He is currently working on research on intellectual property, the creative industries, and 3D printing; intellectual property and public health; and intellectual property and trade, looking at the Trans-Pacific Partnership, the Trans-Atlantic Trade and Investment Partnership, and the Trade in Services Agreement.

_layouts/event.html

@@ -0,0 +1,57 @@
+---
+layout: default
+---
+
+<div class="home">
+  {% if site.theme_settings.header_text %}
+  <div class="call-out"
+  style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_text_feature_image }}')">
+    {{ site.theme_settings.header_text }}
+  </div>
+  {% endif %}
+
+  <div class="posts">
+    {% for section in site.sections %}
+      {% if section.cities contains page.city %}
+        {% include section.html section=section %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  <section class="speakers-or-judges">
+    <h1>Speakers</h1>
+    {% for person in site.speakers %}
+      {% if person.cities contains page.city %}
+        {% include speaker_or_judge.html person=person %}
+      {% endif %}
+    {% endfor %}
+    <h1>Judges</h1>
+    {% for person in site.judges %}
+      {% if person.cities contains page.city %}
+        {% include speaker_or_judge.html person=person %}
+      {% endif %}
+    {% endfor %}
+  </section>
+
+  <section class="location">
+    <h1>Location</h1>
+    {% google_map %}
+  </section>
+
+  {% if paginator.total_pages > 1 %}
+  <div class="pagination">
+    {% if paginator.previous_page %}
+    <a href="{{ paginator.previous_page_path | relative_url | replace: '//', '/' }}" class="button" >
+      <i class="fa fa-chevron-left"></i>
+      {{ site.theme_settings.str_previous_page }}
+    </a>
+    {% endif %}
+    {% if paginator.next_page %}
+    <a href="{{ paginator.next_page_path | relative_url | replace: '//', '/' }}" class="button" >
+      {{ site.theme_settings.str_next_page }}
+      <i class="fa fa-chevron-right"></i>
+    </a>
+    {% endif %}
+  </div>
+  {% endif %}
+</div>

_layouts/home.html

@@ -9,45 +9,4 @@
     {{ site.theme_settings.header_text }}
   </div>
   {% endif %}
-
-  <div class="posts">
-    {% for post in paginator.posts %}
-    <div class="post-teaser">
-      <header>
-        <h1>
-          <a class="post-link" href="{{ post.url | relative_url }}">
-            {{ post.title }}
-          </a>
-        </h1>
-      </header>
-      <div class="excerpt">
-        {{ post.content }}
-      </div>
-    </div>
-    {% endfor %}
-  </div>
-
-  <section class="speakers-or-judges">
-    <h1>Speakers</h1>
-    {% for person in site.speakers %}
-      {% include speaker_or_judge.html person=person %}
-    {% endfor %}
-  </section>
-
-  {% if paginator.total_pages > 1 %}
-  <div class="pagination">
-    {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path | relative_url | replace: '//', '/' }}" class="button" >
-      <i class="fa fa-chevron-left"></i>
-      {{ site.theme_settings.str_previous_page }}
-    </a>
-    {% endif %}
-    {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path | relative_url | replace: '//', '/' }}" class="button" >
-      {{ site.theme_settings.str_next_page }}
-      <i class="fa fa-chevron-right"></i>
-    </a>
-    {% endif %}
-  </div>
-  {% endif %}
 </div>

_layouts/section.html

@@ -0,0 +1,27 @@
+---
+layout: default
+---
+<article {% if page.feature-img %}class="feature-image"{% endif %}>
+  <header style="background-image: url('{{ site.baseurl }}/{{ page.feature-img }}')">
+    <h1 class="title">{{ page.title }}</h1>
+    {% if page.subtitle %}<h2 class="subtitle">{{ page.subtitle }}</h2>{% endif %}
+    <p class="meta">
+      {{ page.date | date: "%B %-d, %Y" }}
+      {% if page.author %} - {{ page.author }}{% endif %}
+    </p>
+  </header>
+  <section class="post-content">{{ content }}</section>
+  {% include tags_list.html tags=page.tags tag_count=page.tags.size %}
+</article>
+
+<!-- Disqus -->
+{% if site.theme_settings.disqus_shortname %}
+<div class="comments">
+  {% include disqus.html %}
+</div>
+{% endif %}
+
+<!-- Post navigation -->
+{% if site.theme_settings.post_navigation %}
+  {% include post_nav.html %}
+{% endif %}

_posts/2018-03-09-rsvp.md → _sections/rsvp_melbourne.md

@@ -1,6 +1,8 @@
 ---
-layout: post
+layout: section
 title: RSVP
+cities:
+  - melbourne
 ---
 
 We need developers, experience designers, visual designers, quality analysts, business analysts, puzzle solvers, ideas people, managers, and anyone else with an interest in collaborative development, or the causes of privacy, digital rights, transparency, or accountability. We'll form teams – you don't need to be an expert in any field.

_posts/2018-03-08-suggest-an-idea.md → _sections/suggest-an-idea.md

@@ -1,6 +1,9 @@
 ---
-layout: post
+layout: section
 title: Suggest an idea
+cities:
+  - melbourne
+  - brisbane
 ---
 
 Internet freedom means a lot of things.

_speakers/liam_pomfret.md

@@ -1,6 +1,8 @@
 ---
 name: Liam Pomfret
 job_and_qualifications: HDR Student - PhD, Associate Lecturer in Marketing
+cities:
+  - melbourne
 ---
 
 Liam Pomfret is an Associate Lecturer in Marketing and a PhD candidate in the UQ Business School at The University of Queensland. His research looks into the antecedent social factors influencing consumers' privacy protection and sharing behaviours in social media. He currently serves on the boards of both the Australian Privacy Foundation and Electronic Frontiers Australia, and is a founding member of Digital Rights Watch Australia. He previously stood for Pirate Party Australia as a senate candidate for Queensland in the 2013 Federal Election.

_speakers/matthew_rimmer.md

@@ -1,6 +1,8 @@
 ---
 name: Matthew Rimmer
 job_and_qualifications: Professor, Intellectual Property and Innovation, Faculty of Law at Queensland University of Technology (QUT)
+cities:
+  - brisbane
 ---
 
-Dr Matthew Rimmer is a Professor in Intellectual Property and Innovation Law at the Faculty of Law, at the Queensland University of Technology (QUT). He is a leader of the QUT Intellectual Property and Innovation Law research program, and a member of the QUT Digital Media Research Centre (QUT DMRC) the QUT Australian Centre for Health Law Research (QUT ACHLR), and the QUT International Law and Global Governance Research Program. Rimmer has published widely on copyright law and information technology, patent law and biotechnology, access to medicines, plain packaging of tobacco products, intellectual property and climate change, and Indigenous Intellectual Property. He is currently working on research on intellectual property, the creative industries, and 3D printing; intellectual property and public health; and intellectual property and trade, looking at the Trans-Pacific Partnership, the Trans-Atlantic Trade and Investment Partnership, and the Trade in Services Agreement. 
+Dr Matthew Rimmer is a Professor in Intellectual Property and Innovation Law at the Faculty of Law, at the Queensland University of Technology (QUT). He is a leader of the QUT Intellectual Property and Innovation Law research program, and a member of the QUT Digital Media Research Centre (QUT DMRC) the QUT Australian Centre for Health Law Research (QUT ACHLR), and the QUT International Law and Global Governance Research Program. Rimmer has published widely on copyright law and information technology, patent law and biotechnology, access to medicines, plain packaging of tobacco products, intellectual property and climate change, and Indigenous Intellectual Property. He is currently working on research on intellectual property, the creative industries, and 3D printing; intellectual property and public health; and intellectual property and trade, looking at the Trans-Pacific Partnership, the Trans-Atlantic Trade and Investment Partnership, and the Trade in Services Agreement.