Remove one commit that we don't want in 1.0.1.

steveklabnik · steveklabnik · commit 38136c162627 · 2011-10-08T20:57:02.000-04:00
This reverts commit 55edf54.
diff --git a/app/ui/tabs/lessons.rb b/app/ui/tabs/lessons.rb
@@ -10,30 +10,19 @@ class HH::SideTabs::Lessons < HH::SideTab
   # auxiliary function used by Kernel#lesson_set
   # stores the code of the DSL used to write the lessons
   def self.load_lesson name, blk
-    @@lessons << [@@difficulty, name, blk]
+    @@lessons << [name, blk]
   end
 
   # draws the lessons tab
   def content
     stack :margin => 10 do
-      title "Lessons", :font => "Phonetica"
+      title "Lessons"
       @@lessons = []
-      @@difficulty = "About Hackety"
-      para "So you want to learn some programming, eh? You've come to the right place!"
       Dir["#{HH::LESSONS}/*.rb"].each { |f| load f }
-
-      %w[beginner intermediate advanced expert].each do |d|
-        @@difficulty = d.capitalize
-        Dir["#{HH::LESSONS}/#{d}/*.rb"].each { |f| load f }
-      end
-
-      @@lessons.group_by{|i| i[0]}.each do |key, value|
-        para key.to_s
-        value.each do |v|
-          stack do
-            britelink "icon-file.png", v[1] do
-              HH::APP.start_lessons name, v[2]
-            end
+      @@lessons.sort{|a, b| a[0] <=> b[0]}.each do |name, blk|
+        stack do
+          britelink "icon-file.png", name do
+            HH::APP.start_lessons name, blk
           end
         end
       end
diff --git a/lessons/basic_programming.rb b/lessons/basic_programming.rb
@@ -1,4 +1,4 @@
-lesson_set "Beginner Programming" do
+lesson_set "2: Basic Programming" do
 
   lesson "Hello there!"
   page "Round One" do
diff --git a/lessons/basic_ruby.rb b/lessons/basic_ruby.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-lesson_set "Beginner Ruby" do
+lesson_set "3: Basic Ruby" do
 
   lesson "Hello there!"
   page "Let's get started" do
diff --git a/lessons/basic_shoes.rb b/lessons/basic_shoes.rb
@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-lesson_set "Beginner Shoes" do
+lesson_set "4: Basic Shoes" do
 
   lesson "Hello there!"
   page "Let's get started" do
diff --git a/lessons/tour.rb b/lessons/tour.rb
@@ -1,4 +1,4 @@
-lesson_set "A Tour of Hackety Hack" do
+lesson_set "1: A Tour of Hackety Hack" do
   lesson "Welcome!"
   page "Why hello there!" do 
     para "Welcome to the Hackety Hack tour!"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-lesson_set "Beginner Programming" do`
	`1`	`+lesson_set "2: Basic Programming" do`
`2`	`2`
`3`	`3`	`lesson "Hello there!"`
`4`	`4`	`page "Round One" do`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-lesson_set "A Tour of Hackety Hack" do`
	`1`	`+lesson_set "1: A Tour of Hackety Hack" do`
`2`	`2`	`lesson "Welcome!"`
`3`	`3`	`page "Why hello there!" do`
`4`	`4`	`para "Welcome to the Hackety Hack tour!"`