Merge pull request #189 from bjc-edc/middle-school

Middle school

sparks/student-pages/U2/L3/01-visualizing-sound-data.html

@@ -43,8 +43,8 @@ <h2>Visualizing Sound Data</h2>
 		<div class="vocabFullWidth">
 			<ul>
 				<li>An <strong>oscilloscope</strong> is an instrument that graphs a signal's intensity over time.</li>
-				<div class="todo">Add pic of oscilloscope with superimposed sound wave. https://commons.wikimedia.org/wiki/File:Tektronix_Oscilloscope_475A.jpg</div>
-
+				<div class="sidenote"><small>Image from Wikipedia user Pittigrilli.</div>
+				<img class="indent" src="/bjc-r/sparks/img/U2/lab03/Tektronix_Oscilloscope_475A.png" alt="real oscilloscope with many buttons and knobs and a display screen showing the plot of a wave" title="real oscilloscope with many buttons and knobs and a display screen showing the plot of a wave" />
 			</ul>
 		</div>
 		<div class="todo">clarify that here, our intensity is volume/loudness</div>

sparks/student-pages/U2/L3/02-oscilloscope.html

@@ -38,7 +38,7 @@ <h2>Oscilloscope</h2>
 		</p>
 
 		<div class="forYouToDo">
-			<ol start="4">
+			<ol start="1">
 				<li>
 					<div class="sidenote">
 						<p>You learned about global variables in <a href="/bjc-r/sparks/student-pages/U2/L1/06-storing-songs.html?topic=sparks%2F2-sequencing-iteration.topic&course=sparks.html" title="Unit 2 Lab 1 Activity 6: Storing Songs">Unit 2 Lab 1 Activity 6: Storing Songs</a>.</p>
@@ -114,7 +114,7 @@ <h2>Oscilloscope</h2>
 		</div>
 
 		<div class="forYouToDo">
-			<ol start="4">
+			<ol start="3">
 				<li>Build this in Snap<em>!</em></li>
 				<li>Talk, sing, and make noise! If your computer's microphone is detecting sound and your Snap<em>!</em> code is working, you should see the frequencies displayed on the Snap<em>!</em> stage.</li>
 				<li>Troubleshoot any problems with your code.</li>

sparks/student-pages/U2/L3/03-spectrum-analyzer.html

@@ -52,7 +52,7 @@ <h3>Creating the Spectrum Analyzer</h3>
 				<li>If your project isn't open already, log in to Snap<em>!</em>, and open your "Sparks-Sound-Visualizer" project.</li>
 				<li>
 					Since you will reuse your oscilloscope code, preserve it by creating two copies of everything inside the <code>forever</code> block. Put one copy inside a <code>show volume samples</code> command block and one copy inside a <code>show frequencies</code> command block.<br />
-					<img class="" src="/bjc-r/sparks/img/U2/lab03/show-volume-samples-code.png" alt="show volume samples:
+					<img class="indent" src="/bjc-r/sparks/img/U2/lab03/show-volume-samples-code.png" alt="show volume samples:
 warp {
 	go to x: (-240) y: (0)
 	clear
@@ -67,7 +67,7 @@ <h3>Creating the Spectrum Analyzer</h3>
 					<div class="sidenote">There are helpful Snap<em>!</em> tricks for a few of these things:
 					<ul>
 						<li>To rename a variable <em>and</em> alle the places is appears at the same time, right-click the variable and choose "rename all..."</li>
-						<li>To change from one block (like <img class="nopadtb" src="/bjc-r/img/3-lists/times.png" alt="× (times)" title="× (times)" />) to a similar block (like <img class="nopadtb" src="/bjc-r/img/3-lists/minus.png" alt="- (minus)" title="- (minus)" /> ), right-click the block, choose "relabel..." and choose the new block you want in its place.</li>
+						<li>To change from one block (like <img class="nopadtb" src="/bjc-r/img/blocks/times.png" alt="× (times)" title="× (times)" />) to a similar block (like <img class="nopadtb" src="/bjc-r/img/blocks/minus.png" alt="- (minus)" title="- (minus)" /> ), right-click the block, choose "relabel..." and choose the new block you want in its place.</li>
 					</ul>
 					</div>
 					The <code>show frequencies</code> will have a few critial differences:

topic/sparks/2-sequencing-iteration.topic

@@ -42,11 +42,12 @@ heading: Lab 2: Graphics and Animation
 //raw-html: <div class="todo"><a href="/bjc-r/cur/programming/3.5-T1PP/1-choosing-a-project.html" target="_blank">List of old Programming Project options</a></div>
 
 heading:  Lab 3: Make Some Noise
-	resource: Visualizing Sound Data [/bjc-r/sparks/student-pages/U2/L3/01-visualizing-sound-data.html]
-	resource: Oscilloscope [/bjc-r/sparks/student-pages/U2/L3/02-oscilloscope.html]
-	resource: Spectrum Analyzer [/bjc-r/sparks/student-pages/U2/L3/03-spectrum-analyzer.html]
-	resource: Switching Back and Forth [/bjc-r/sparks/student-pages/U2/L3/04-switching.html]
-	resource: Creating Sound Waves [/bjc-r/sparks/student-pages/U2/L3/05-sound-generator.html]
+	raw-html: <div class="todo"></div>
+	//resource: Visualizing Sound Data [/bjc-r/sparks/student-pages/U2/L3/01-visualizing-sound-data.html]
+	//resource: Oscilloscope [/bjc-r/sparks/student-pages/U2/L3/02-oscilloscope.html]
+	//resource: Spectrum Analyzer [/bjc-r/sparks/student-pages/U2/L3/03-spectrum-analyzer.html]
+	//resource: Switching Back and Forth [/bjc-r/sparks/student-pages/U2/L3/04-switching.html]
+	//resource: Creating Sound Waves [/bjc-r/sparks/student-pages/U2/L3/05-sound-generator.html]
 
 heading:  Lab 4: Transmitting Data
 	// resource: Finding the Best Routing Strategy //[]