Merge branch 'master' of https://git.heroku.com/teachingkids into cedar

site/2010/11/06/ruby-conf-kids.html

@@ -31,7 +31,7 @@ <h3 id='web_game_development'>Web Game Development</h3>
 
 <h3 id='building_curcuits'>Building Curcuits</h3>
 
-<p>On Saturday, we had just two kids and Max led some soldering, kicking off the activities with a series of videos for inspiration:</p>
+<p>On Saturday, we had just two kids and Max led some soldering, kicking off the activities with a series of videos for inspiration.</p>
 
 <p><img alt='soldering' src='images/soldering.png' /></p>
       </div>

site/index.html

@@ -95,7 +95,7 @@ <h3 id='web_game_development'>Web Game Development</h3>
 
 <h3 id='building_curcuits'>Building Curcuits</h3>
 
-<p>On Saturday, we had just two kids and Max led some soldering, kicking off the activities with a series of videos for inspiration:</p>
+<p>On Saturday, we had just two kids and Max led some soldering, kicking off the activities with a series of videos for inspiration.</p>
 
 <p><img alt='soldering' src='images/soldering.png' /></p></p>
 

site/languages.html

@@ -12,11 +12,10 @@ <h1>Languages and Learning Environments</h1>
 <p class='left'>The following environments and languages have been suggested as good for teaching kids</p>
 <h3>Ruby</h3>
 <ul>
-  <li>Shoes (Desktop apps for Mac, Win, Linux.  Easy to create graphics and get started quickly.)</li>
-  <li>Sinatra (for easy web apps)</li>
+  <li<a href="http://shoesrb.com/">Shoes</a> (Desktop apps for Mac, Win, Linux.  Easy to create graphics and get started quickly.)</li>
   <li>
-    <a href="http://tryruby.hobix.com/">Online IRB</a>
-    One teacher said this wasn't "fun & easy" enough for middle- and high-school kids, but might be a good tool to offer at some point.
+    <a href="http://tryruby.org/">Try Ruby</a>
+    One teacher said this wasn't "fun & easy" enough for middle- and high-school kids, but great for motivated self-study.
   </li>
 </ul>
 <h3>Other languages</h3>
@@ -37,6 +36,7 @@ <h3>Other languages</h3>
   </li>
 </ul>
 <div class='clear'></div>
+
       </div>
     </div>
   </body>

site/lessons.html

@@ -10,9 +10,10 @@
       <div id="main">
         <h1>Lessons</h1>
 <ul>
+  <li><a href="http://csta.acm.org/Curriculum/sub/ACMK12CSModel.html">CSTA model curriculum</a> includes K-12 lesson plans
   <li>
-    <a href="http://github.com/railsbridge/teachingkids/tree/master">teachingkids</a>
-    Our online lesson repository
+    <a href="http://github.com/railsbridge/teachingkids/tree/master">Shoes lesson repository</a>: a series of activities
+
   </li>
 </ul>
 

src/_posts/2010-11-06-ruby-conf-kids.markdown

@@ -21,7 +21,7 @@ Next we had the kids use a scripting language, called Pie, where you can use a h
 Lessons learned: browser-based development is awesome for the quick start.  The Pie Bakery needs better error reporting and Flicker integration, since it is a drag to get URLs out of Flickr.
 
 ### Building Curcuits
-On Saturday, we had just two kids and Max led some soldering, kicking off the activities with a series of videos for inspiration:
+On Saturday, we had just two kids and Max led some soldering, kicking off the activities with a series of videos for inspiration.
 
 
 ![soldering](images/soldering.png)

src/languages.html

@@ -6,11 +6,10 @@ <h1>Languages and Learning Environments</h1>
 <p class='left'>The following environments and languages have been suggested as good for teaching kids</p>
 <h3>Ruby</h3>
 <ul>
-  <li>Shoes (Desktop apps for Mac, Win, Linux.  Easy to create graphics and get started quickly.)</li>
-  <li>Sinatra (for easy web apps)</li>
+  <li<a href="http://shoesrb.com/">Shoes</a> (Desktop apps for Mac, Win, Linux.  Easy to create graphics and get started quickly.)</li>
   <li>
-    <a href="http://tryruby.hobix.com/">Online IRB</a>
-    One teacher said this wasn't "fun & easy" enough for middle- and high-school kids, but might be a good tool to offer at some point.
+    <a href="http://tryruby.org/">Try Ruby</a>
+    One teacher said this wasn't "fun & easy" enough for middle- and high-school kids, but great for motivated self-study.
   </li>
 </ul>
 <h3>Other languages</h3>
@@ -30,4 +29,4 @@ <h3>Other languages</h3>
     (snap together blocks to make stories, games, & animations)
   </li>
 </ul>
-<div class='clear'></div>
+<div class='clear'></div>

src/lessons.html

@@ -4,8 +4,9 @@
 --- 
 <h1>Lessons</h1>
 <ul>
+  <li><a href="http://csta.acm.org/Curriculum/sub/ACMK12CSModel.html">CSTA model curriculum</a> includes K-12 lesson plans
   <li>
-    <a href="http://github.com/railsbridge/teachingkids/tree/master">teachingkids</a>
-    Our online lesson repository
+    <a href="http://github.com/railsbridge/teachingkids/tree/master">Shoes lesson repository</a>: a series of activities
+
   </li>
 </ul>