Merge pull request #300 from github/slide-page-fixes

Bug fix for slide, slide-only modes with `?teacher=` feature

Author: Jordan McCullough

_javascript/curriculum.js

@@ -3,9 +3,7 @@ $(function(){
 
 	// Bind checkbox/label click for slide toggle
 	$("#slide-only-toggle").change(function(){
-		var checkState = $("#slide-only-toggle").attr("checked");
-		$(".materials > *").toggleClass("hidden");
-		$(".slide").toggleClass("hidden");
+		$(".materials > *").not(".slide").toggleClass("hidden");
 	});
 
 	// Parse username from querystring
@@ -21,7 +19,7 @@ $(function(){
 			url: "https://api.github.com/users/"+username,
 			success: function(data, textStatus, jqXHR){
 				$("#teacher-name").html(data.name);
-				
+
 				$("<span/>",
 				{
 					text: data.login
@@ -86,7 +84,6 @@ $(function(){
 				}).appendTo("#teacher-following");
 
 				$("#teacher").toggleClass("hidden");
-				$("#teacher").toggleClass("slide");
 
 				updateSlideSize();
 			}
@@ -130,7 +127,7 @@ $(function(){
 				even = $("hr:even");
 
 		even.each(function(index){
-			$(this).nextUntil("hr").wrapAll("<div class='slide'><div class='alignment'></div>");
+			$(this).nextUntil("hr").wrapAll("<div class='slide'><div class='alignment'></div></div>");
 		});
 
 		$(".slide").css("height", h + "px");

_layouts/curriculum.html

@@ -66,9 +66,9 @@ <h4 class="modal-title" id="timerModalLabel">Help / Shortcuts</h4>
 </div>
 
 <div class="col-content deck  col-md-12 col-sm-12 col-xs-12 materials curriculum shift-left">
-  <div id="teacher" class="hidden">
+  <div id="teacher" class="slide hidden">
     <div class="alignment">
-      <div id="teacher-avatar" class=""></div>
+      <div id="teacher-avatar"></div>
       <div class="" id="teacher-info">
 
         <h3 id="teacher-name"></h3>