Clean up TOC on Installfest site by making some changes:

Komodo edit page no longer has 'PowerPC' variant, instead linking to Komodo Edit 8 (which is supposedly universal) Removed highly useless "Diagnostics for Windows" page Don't show 'Windows Colors' on TOC when linked from 'Configure Git' (you can now use the method link_without_toc to shadily provide a link without making an entry in the TOC) Inline 'Intel or PowerPC?' page onto the 'Panther' page.
btelles · Mar 5, 2013 · 619c60d · 619c60d
1 parent 2489e87
commit 619c60d
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 42 deletions.
diff --git a/app.rb b/app.rb
@@ -31,7 +31,7 @@ def initialize
   attr_writer :default_site
 
   def default_site
-    if (host && sites.include?(site = host.split(".").first))
+    if host && sites.include?(site = host.split(".").first)
       site
     else
       @default_site

diff --git a/lib/step.rb b/lib/step.rb
@@ -107,6 +107,10 @@ def link name
     end
   end
 
+  def link_without_toc name
+    link name
+  end
+
   def next_step name
     div :class => "step next_step" do
       h1 do

diff --git a/public/css/step.css b/public/css/step.css
@@ -51,6 +51,19 @@ img.noborder {
   border: 5px solid maroon;
 }
 
+.pertinent-info {
+  padding: 1em;
+  font-size: 0.8em;
+  font-color: rgb(60, 60, 60);
+  border: 3px solid grey;
+  border-radius: 10px;
+}
+
+.pertinent-info h3 {
+  text-align: center;
+  margin: 0;
+}
+
 .tip {
   padding: 1em;
   border: 10px solid #eee;

diff --git a/sites/installfest/configure_git.step b/sites/installfest/configure_git.step
@@ -24,7 +24,7 @@ git config --global color.branch auto
   important do
     message "If you are using Windows, you may need to install AnsiCon to see colors (otherwise you'll see gibberish).  If you didn't do this earlier, then you should do it now."
 
-    link "windows_colors"
+    link_without_toc "windows_colors"
   end
 end
 
diff --git a/sites/installfest/create_and_deploy_a_rails_app.step b/sites/installfest/create_and_deploy_a_rails_app.step
@@ -49,7 +49,6 @@ If `rails server` starts up with no errors, you're golden! It'll look something
 message "If it does, congratulations! You've successfully installed Ruby AND Rails and started your server."
 
 tip "If it doesn't work..." do
-  link "diagnostics_for_windows"
   link "diagnostics_for_rvm"
 end
 

diff --git a/sites/installfest/diagnostics_for_windows.step b/sites/installfest/diagnostics_for_windows.step
diff --git a/sites/installfest/install_komodo_edit_for_mac.step b/sites/installfest/install_komodo_edit_for_mac.step
@@ -7,16 +7,7 @@ MARKDOWN
 important "Microsoft Word and other word processing programs, including TextEdit and Notepad, will not work."
 
 step "Download KomodoEdit" do
-
-  link "intel_or_ppc_mac"
-
-  option "Intel Mac CPU" do
-    message "Download the [KomodoEdit installer](http://downloads.activestate.com/Komodo/releases/7.1.3/Komodo-Edit-7.1.3-11027-macosx-x86.dmg)"
-  end
-
-  option "PowerPC" do
-    message "Download the [KomodoEdit installer for PowerPC](http://downloads.activestate.com/Komodo/releases/5.2.4/Komodo-Edit-5.2.4-4343-macosx-powerpc.dmg)."
-  end
+  message "Download the [KomodoEdit installer](http://downloads.activestate.com/Komodo/releases/8.0.0c1/Komodo-Edit-8.0.0-rc1-11879-macosx.dmg)."
 end
 
 step 'Select "Open with DiskImageMounter" in the file save dialog' do
@@ -35,5 +26,3 @@ end
 step "Unmount the installer disk image" do
   message "by dragging it from your desktop to the trash"
 end
-
-
diff --git a/sites/installfest/intel_or_ppc_mac.step b/sites/installfest/intel_or_ppc_mac.step
diff --git a/sites/installfest/osx_panther.step b/sites/installfest/osx_panther.step
@@ -26,7 +26,18 @@ step "Git " do
 
     message %q{Click "Download the packages here" which will take you to a list of downloads. Pick Intel if you have an Intel Mac, and Universal Binary if you have a PowerPC Mac.}
 
-    link "intel_or_ppc_mac"
+    message <<-MESSAGE, class: "pertinent-info"
+
+### Do I have an Intel or PowerPC Mac?
+
+PowerPC (PPC) Macs are Apple's older line of machines with Motorola chips. Macs purchased since 2006 are almost all Intel. To find out for sure:
+
+* Click on the Apple menu in the top left corner of your screen.
+* Select "About this Mac."
+* It should have a line that starts with "Processor." If somewhere in that line it says "Intel," then you have an Intel Mac. Otherwise, you have a PPC Mac.
+
+For more information, see the [Apple Transition Timeline](http://en.wikipedia.org/wiki/Apple%E2%80%93Intel_transition#Timeline) or the [exhaustive list of Macintosh models](http://en.wikipedia.org/wiki/Timeline_of_Macintosh_models#2000s) on Wikipedia.
+    MESSAGE
   end
 
   option "Tiger" do

diff --git a/sites/installfest/ubuntu.step b/sites/installfest/ubuntu.step
@@ -46,7 +46,7 @@ step "Install git" do
 end
 
 step "Configure Git" do
-  link "configure_git"
+  link_without_toc "configure_git"
 end
 
 step "Install RVM" do