Skip to content

Commit

Permalink
Fixing up some slides
Browse files Browse the repository at this point in the history
  • Loading branch information
jc00ke committed Mar 2, 2010
1 parent e643c0d commit 8be4f6a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
13 changes: 8 additions & 5 deletions haml/haml.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@
!SLIDE
:index can either be in (by default) views/ or in-file.

!SLIDE smaller
It can also be wherever you want
@@@ ruby
set :views, Proc.new{ File.join(root, "over_here") }

!SLIDE center
# Quick Aside #

Other configurations

* :environment
* :sessions
* :root
Expand Down Expand Up @@ -53,7 +56,7 @@ Other configurations

!SLIDE smaller
# Normal layout/template method #
## examples/normal_haml/app.rb ##
## examples/haml/app.rb ##
@@@ ruby

require 'rubygems'
Expand All @@ -74,10 +77,10 @@ Other configurations

!SLIDE smaller
# The Views #
## examples/normal_haml/views/* ##
## examples/haml/views/* ##

!SLIDE smaller
# examples/normal_haml/views/layout.haml #
# examples/haml/views/layout.haml #
!!!
%html
%head
Expand All @@ -86,7 +89,7 @@ Other configurations
%body= yield

!SLIDE smaller
# examples/normal_haml/views/index.haml #
# examples/haml/views/index.haml #

#index
Um, hi there.
Expand All @@ -97,7 +100,7 @@ Other configurations
public/ has all the static files (just like Rails)

!SLIDE smaller
# examples/normal_haml/views/styles.sass #
# examples/haml/views/styles.sass #

#index
:background-color #ccc
Expand Down
9 changes: 9 additions & 0 deletions outro/outro.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
!SLIDE
# Questions? #

!SLIDE bullets
# Thanks! #
* http://github.com/jc00ke/pdxrb_sinatra
* http://sinatra.com
* http://twitter.com/bmizerany
* http://rack.rubyforge.org
4 changes: 2 additions & 2 deletions resources/resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Resources #
## A list of lists ##

!SLIDE bullets incremental
!SLIDE bullets incremental smaller
# Example Apps #
* [Sinatra in the Wild](http://www.sinatrarb.com/wild.html)
* [Hancock](http://github.com/atmos/hancock) <– definitive Sinatra app
* [Hancock](http://github.com/atmos/hancock) <- definitive Sinatra app
* [Nesta](http://effectif.com/nesta)
* [Toopaste](http://github.com/zapnap/toopaste)
* [NYLS Upload Tool](http://upload.citylaw.org/)
Expand Down

0 comments on commit 8be4f6a

Please sign in to comment.