Merge pull request #69 from jasonaowen/2016-talks

Add 2016 recordings
bangbangcon · Mar 9, 2017 · 3d6d3b1 · 3d6d3b1
2 parents 9c34454 + 51bd9cf
commit 3d6d3b1
Show file tree

Hide file tree

Showing 12 changed files with 733 additions and 457 deletions.
diff --git a/2014/javascripts/recordings.js b/2014/javascripts/recordings.js
diff --git a/2014/recordings.html b/2014/recordings.html
@@ -14,7 +14,7 @@
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script type="text/javascript" src="./javascripts/recordings.js"></script>
+    <script type="text/javascript" src="../js/recordings.js"></script>
     <title>Talk Recordings and Transcripts - !!Con</title>
   </head>
 
@@ -46,6 +46,17 @@ <h3 class="talk-info"></h3>
             <div style="clear:both"></div>
           </div>
 
+          <script defer="defer">
+            jQuery.getJSON('talks.json', function(talks) {
+              generateTalks(
+                '#talk-template',
+                '#talk_container',
+                talks,
+                "../2014-transcripts/"
+              );
+            });
+          </script>
+
           <footer>
             Hosted on
             <a href="https://github.com/hausdorff/bangbangcon.github.io" target="_source">