Merge pull request #21 from Liongrass/master

fix issues arising from events/calendar conflict

Author: Liongrass

_data/settings.yml

@@ -3,7 +3,7 @@ tagline: 'BitDevs is a community for those interested in discussing and particip
 
 menu:
   - {name: 'About', url: '/about'}
-  - {name: 'Events', url: '/events'}
+  - {name: 'Calendar', url: '/calendar'}
   - {name: 'Map', url: '/map'}
   - {name: 'Meetup', url: 'https://www.meetup.com/Vancouver-Bitcoiners', external: true}
   - {name: 'Cities', url: '/cities'}

events.md renamed to calendar.md

@@ -7,4 +7,4 @@ BitDevs Vancouver is typically held once a month. You can subscribe to event ann
 
 You can also find the BitDevs events and a collection of other Bitcoin events around Vancouver in the calendar below. You can [add the corresponding ical file to your calendar here](https://calendar.google.com/calendar/ical/mktcedcb09dvpumtk6gqd8sc58%40group.calendar.google.com/public/basic.ics).
 
-<iframe src="https://calendar.google.com/calendar/embed?src=mktcedcb09dvpumtk6gqd8sc58%40group.calendar.google.com&ctz=America%2FVancouver" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+<iframe src="https://calendar.google.com/calendar/embed?src=mktcedcb09dvpumtk6gqd8sc58%40group.calendar.google.com&ctz=America%2FVancouver" style="border: 0" width="100%" height="600" frameborder="0" scrolling="no"></iframe>

events.html

@@ -0,0 +1,18 @@
+---
+layout: default
+title: Meetings
+---
+
+<div class="Home">
+  <div class="Home-posts">
+    <h2 class="Home-posts-title">Socratic Seminars</h2>
+    {% for post in site.posts %}
+      {% if post.type == "socratic" %}
+        <div class="Home-posts-post">
+          <span class="Home-posts-post-date">{{ post.date | date_to_string }}</span>
+          <span class="Home-posts-post-arrow">&raquo;</span>
+          <a class="Home-posts-post-title" href="{{ post.url }}">{{ post.title }}</a>
+        </div>
+      {% endif %}
+    {% endfor %}
+</div>