Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Using rdiscount instead of bluecloth; added custom sidebar sections f…

…or Thoughts tab; made another fruitless stab at getting mail to work (will Pony 1.0 save the day? Here's hoping).
  • Loading branch information...
commit 0fa3c34a5e46b93305f9ca50236a7c3fce8cfb42 1 parent f56f4a4
@chadoh authored
View
3  Gemfile
@@ -4,6 +4,7 @@ gem "rack"
gem "haml"
gem "crack"
gem "rack-flash"
-gem "bluecloth"
+gem "rdiscount"
gem "shotgun"
gem 'pony'
+gem 'sinatra-content-for'
View
18 Gemfile.lock
@@ -1,10 +1,10 @@
---
dependencies:
- pony:
+ sinatra-content-for:
group:
- :default
version: ">= 0"
- bluecloth:
+ pony:
group:
- :default
version: ">= 0"
@@ -20,11 +20,15 @@ dependencies:
group:
- :default
version: ">= 0"
+ rack-flash:
+ group:
+ - :default
+ version: ">= 0"
sinatra:
group:
- :default
version: ">= 0"
- rack-flash:
+ rdiscount:
group:
- :default
version: ">= 0"
@@ -33,8 +37,6 @@ dependencies:
- :default
version: ">= 0"
specs:
-- bluecloth:
- version: 2.0.7
- crack:
version: 0.1.7
- haml:
@@ -49,11 +51,15 @@ specs:
version: 1.1.0
- rack-flash:
version: 0.1.1
+- rdiscount:
+ version: 1.6.3.1
- shotgun:
version: "0.6"
- sinatra:
version: "1.0"
-hash: 001cbe373b6a21d70502524e97c64e70de3f4c00
+- sinatra-content-for:
+ version: "0.2"
+hash: dcc4990e2b1a030cd53d4dbf7731d40d3770a80e
sources:
- Rubygems:
uri: http://rubygems.org
View
1  controls.rb
@@ -18,6 +18,7 @@
require 'crack'
require 'rack-flash'
require 'pony'
+require 'sinatra/content_for'
enable :sessions
View
5 views/blogger_shoutout.haml
@@ -0,0 +1,5 @@
+%h2
+ Visit on blogger
+%ul
+ :markdown
+ [Visit Lisa on Blogger](http://lisayoder.blogspot.com) to leave comments and to enjoy other Blogger perks.
View
2  views/layout.haml
@@ -31,10 +31,12 @@
#sidebar2
#profile-container
=haml :about_blurb, :layout => false
+ =yield_content :from_blogger
=haml :links, :layout => false
=haml :printed_word, :layout => false
-# figure this out later
=haml :previous_posts, :layout => false
=haml :archives, :layout => false
+ =yield_content :subscribe
#footer
%p
View
4 views/subscribe_to_posts.haml
@@ -0,0 +1,4 @@
+%a(href="http://feeds.feedburner.com/Lisli" title="Subscribe to my feed" rel="alternate" type="application/rss+xml")
+ %img(src="http://www.feedburner.com/fb/images/pub/feed-icon32x32.png" alt="" style="border:0")
+%a(href="http://feeds.feedburner.com/Lisli" title="Subscribe to my feed" rel="alternate" type="application/rss+xml")
+ Subscribe in a reader
View
4 views/thoughts.haml
@@ -1 +1,5 @@
+- content_for :from_blogger do
+ =haml :blogger_shoutout, :layout => false
+- content_for :subscribe do
+ =haml :subscribe_to_posts, :layout => false
= partial(:post, :collection => @posts)
Please sign in to comment.
Something went wrong with that request. Please try again.