Fix Sinatra app to use Deck and markdown without conflict

railsbridge-boston · Aug 15, 2012 · 447ebf7 · 447ebf7
1 parent a244d26
commit 447ebf7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/config.ru b/config.ru
@@ -1,3 +1,3 @@
 require './web'
-run Sinatra::Application
+run RubyWorkshop
 
diff --git a/views/workshop/curriculum.markdown b/views/workshop/curriculum.markdown
@@ -1030,4 +1030,4 @@ Add flash notice to app/views/layouts/application.html.erb
 
 
 
-[http://bit.ly/ruby-resources](http://bit.ly/ruby-resources)
+[http://bit.ly/ruby-resources](http://bit.ly/ruby-resources)
diff --git a/views/workshop/workshop.markdown b/views/workshop/workshop.markdown
@@ -1,3 +1,7 @@
+<div class="alert alert-info">
+<strong>Note to attendees</strong>: This is material that we expect you to read during the workshop, not before it.  It may not be in its final state. So please wait until then to study this material.
+</div>
+
 # Slide Decks:
 
 ## All-Hands Workshop Intro:

diff --git a/web.rb b/web.rb
@@ -68,6 +68,7 @@ def initialize
       slides = Deck::Slide.split(File.read("views/#{page}.deck.markdown"))
       Deck::SlideDeck.new(:slides => slides).to_pretty
     elsif File.exist? "views/#{page}.markdown"
+      @markdown = true
       markdown page.intern
     else
       forward