Browse files

Things are looking quite tidy! No mail yet, though. Pony won't instal…

…l. And still haven't started loading in the blogger stuff. But the path is clear!
  • Loading branch information...
1 parent bf31e52 commit 2e92178b0af6fd48a4b081ac06ed82fb1cd0b12f @chadoh committed Apr 18, 2010
View
2 README
@@ -4,4 +4,4 @@ I could probably do a lot of this more easily, but it's largely a learning excer
I'm making it with Sinatra, Sass (2.whatever), and Haml. It's my first time using these languages.
-I also plan to embed a wave (for my personal site) and somehow integrate with Blogger (for Lisa's personal site).
+Lisa's site will pull from Blogger for her blog, and mine will embed a Gwave.
View
7 README~
@@ -0,0 +1,7 @@
+This is my (& Lisa's) eventual personal site. It'll be forked at some point.
+
+I could probably do a lot of this more easily, but it's largely a learning excercise.
+
+I'm making it with Sinatra, Sass (2.whatever), and Haml. It's my first time using these languages.
+
+I also plan to embed a wave (for my personal site) and somehow integrate with Blogger (for Lisa's personal site).
View
8 TODO
@@ -1,14 +1,10 @@
make contact form functional
-Look into Heroku
+Use blogger data api to reproduce blogger content natively
-Link to blogger profile for blog page
+Look into Heroku
Later
- Use blogger data api to reproduce blogger content natively
- http://code.google.com/apis/blogger/
- (can this pull profile information, too?)
-
Clear up styles.sass, remove duplication
FORK into chadoh
View
5 TODO~
@@ -1,11 +1,10 @@
make contact form functional
-Look into Heroku
+Use blogger data api to reproduce blogger content natively
-Link to blogger profile for blog page
+Look into Heroku
Later
- Use blogger data api to reproduce blogger content natively
http://code.google.com/apis/blogger/
(can this pull profile information, too?)
View
14 controls.rb
@@ -18,7 +18,7 @@ def current_tab_if(route)
end
get "/" do
- haml :home
+ haml :language_assistance
end
get "/:page/?" do
@@ -34,10 +34,10 @@ def current_tab_if(route)
end
post "/contact" do
- #Pony.mail {
- # :to => "chad.ostrowski@gmail.com",
- # :from => '"' + params[:name] + '" <' + params[:email] + '>',
- # :subject => "Email submitted on Lisli.net",
- # :message => params[:message]
- #}
+ if false
+ Pony.mail :to => "chad.ostrowski@gmail.com",
+ :from => '"' + params[:name] + '" <' + params[:email] + '>',
+ :subject => "Email submitted on Lisli.net",
+ :message => params[:message]
+ end
end
View
14 controls.rb~
@@ -33,11 +33,11 @@ not_found do
haml :not_found
end
-post "/contact/?" do
- #Pony.mail {
- # :to => "chad.ostrowski@gmail.com",
- # :from => '"' + params[:name] + '" <' + params[:email] + '>',
- # :subject => "Email submitted on Lisli.net",
- # :message => params[:message]
- #}
+post "/contact" do
+ if false
+ Pony.mail :to => "chad.ostrowski@gmail.com",
+ :from => '"' + params[:name] + '" <' + params[:email] + '>',
+ :subject => "Email submitted on Lisli.net",
+ :message => params[:message]
+ end
end
View
BIN public/images/books-737655.JPG
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/images/n9350941_51902742_7663.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/images/rtpw-button4-200x92.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 views/about_blurb.haml
@@ -2,12 +2,12 @@
%dl
%dt.profile-img
%a(href="http://www.blogger.com/profile/01577315972236522609")
- %img(src="http://2.bp.blogspot.com/_gbC2Pbzuwyg/StaHW-YmOTI/AAAAAAAABeY/IeBWdSVEARo/S220/n9350941_51902742_7663.jpg" width="80" height="73" alt="My Photo" id="")
+ %img(src="/images/n9350941_51902742_7663.jpg" width="80" height="73" alt="My Photo" id="")
%dd.profile-data
%strong Name:
Lisli
%p.profile-textblock
- Lisa enjoys mixing genres, languages, high and low culture, and urban and rural settings. After graduating from Penn State with degrees in English and Spanish, she spent a brief stint as a copy editor at a small-town newspaper, then left for a job that offered health insurance and paid more than a pittance. Now, she tries to distract herself from her day job (that has nothing to do with her degrees) by reading, writing, finding freelance projects, sewing, and playing music with the Roaring Kittens (http://www.myspace.com/theroaringkittens).
+ Lisa enjoys mixing genres, languages, high and low culture, and urban and rural settings. After graduating from Penn State with degrees in English and Spanish, she spent a brief stint as a copy editor at a small-town newspaper, then left for a job that offered health insurance and paid more than a pittance. Now, she tries to distract herself from her day job (that has nothing to do with her degrees) by reading, writing, finding freelance projects, sewing, and playing music with the Roaring Kittens.
%p.profile-link
%a(href="http://www.blogger.com/profile/01577315972236522609")
View my complete profile
View
4 views/about_blurb.haml~
@@ -2,12 +2,12 @@
%dl
%dt.profile-img
%a(href="http://www.blogger.com/profile/01577315972236522609")
- %img(src="http://2.bp.blogspot.com/_gbC2Pbzuwyg/StaHW-YmOTI/AAAAAAAABeY/IeBWdSVEARo/S220/n9350941_51902742_7663.jpg" width="80" height="73" alt="My Photo" id="")
+ %img(src="/images/n9350941_51902742_7663.jpg" width="80" height="73" alt="My Photo" id="")
%dd.profile-data
%strong Name:
Lisli
%p.profile-textblock
Lisa enjoys mixing genres, languages, high and low culture, and urban and rural settings. After graduating from Penn State with degrees in English and Spanish, she spent a brief stint as a copy editor at a small-town newspaper, then left for a job that offered health insurance and paid more than a pittance. Now, she tries to distract herself from her day job (that has nothing to do with her degrees) by reading, writing, finding freelance projects, sewing, and playing music with the Roaring Kittens (http://www.myspace.com/theroaringkittens).
%p.profile-link
- %a(href="http://www.blogger.com/profile/01577315972236522609"
+ %a(href="http://www.blogger.com/profile/01577315972236522609")
View my complete profile
View
1 views/contact.haml
@@ -6,3 +6,4 @@
%input{ :name => "email", :id => "email", :type => "text" }
%label{ :for => "message" } Your message to me
%textarea{ :name => "message", :id => "message" }
+ %input{ :type => "submit", :value => "Send" }
View
1 views/contact.haml~
@@ -6,3 +6,4 @@
%input{ :name => "email", :id => "email", :type => "text" }
%label{ :for => "message" } Your message to me
%textarea{ :name => "message", :id => "message" }
+ %input.fancy-button{ :type => "submit", :value => "Send" }
View
4 views/language_assistance.haml
@@ -3,8 +3,8 @@
.post-body
%div
%div(style="clear:both;")
- %a(href="http://www.lisli.net/uploaded_images/books-737655.JPG")
- %img(style="cursor: pointer; width: 400px; height: 327px;" src="http://www.lisli.net/uploaded_images/books-737374.JPG" alt="Tools (books) of the trade")
+ %a(href="/images/books-737655.JPG")
+ %img(style="cursor: pointer; width: 400px; height: 327px;" src="/images/books-737655.JPG" alt="Tools (books) of the trade")
%br
%br
%p
View
4 views/language_assistance.haml~
@@ -3,8 +3,8 @@
.post-body
%div
%div(style="clear:both;")
- %a(href="http://www.lisli.net/uploaded_images/books-737655.JPG")
- %img(style="cursor: pointer; width: 400px; height: 327px;" src="http://www.lisli.net/uploaded_images/books-737374.JPG" alt="" border="0")
+ %a(href="/images/books-737374.JPG")
+ %img(style="cursor: pointer; width: 400px; height: 327px;" src="/images/books-737374.JPG" alt="Tools (books) of the trade")
%br
%br
%p
View
7 views/layout.haml
@@ -12,13 +12,13 @@
#nav
%ul
%li
- %a{ :title => "Wonderings and Wanderings", :href => "/", :class => current_tab_if('/') }
+ %a{ :href => "/thoughts", :class => current_tab_if('/thoughts') }
Thoughts
%li
- %a{ :title => "Meet your host!", :href => "/language_assistance", :class => current_tab_if('/language_assistance') }
+ %a{ :href => "/", :class => current_tab_if('/') }
Language Assistance
%li
- %a{ :title => "Send me an email", :href => "/contact", :class => current_tab_if('/contact')}
+ %a{ :href => "/contact", :class => current_tab_if('/contact')}
Contact
#content
#main
@@ -29,6 +29,7 @@
#profile-container
=haml :about_blurb, :layout => false
=haml :links, :layout => false
+ =haml :printed_word, :layout => false
-# figure this out later
=haml :previous_posts, :layout => false
=haml :archives, :layout => false
View
7 views/layout.haml~
@@ -12,13 +12,13 @@
#nav
%ul
%li
- %a{ :title => "Wonderings and Wanderings", :href => "/", :class => current_tab_if('/') }
+ %a{ :href => "/thoughts", :class => current_tab_if('/thoughts') }
Thoughts
%li
- %a{ :title => "Meet your host!", :href => "/language_assistance", :class => current_tab_if('/language_assistance') }
+ %a{ :href => "/language_assistance", :class => current_tab_if('/') }
Language Assistance
%li
- %a{ :title => "Send me an email", :href => "/contact", :class => current_tab_if(:href)}
+ %a{ :href => "/contact", :class => current_tab_if('/contact')}
Contact
#content
#main
@@ -29,6 +29,7 @@
#profile-container
=haml :about_blurb, :layout => false
=haml :links, :layout => false
+ =haml :printed_word, :layout => false
-# figure this out later
=haml :previous_posts, :layout => false
=haml :archives, :layout => false
View
11 views/links.haml
@@ -1,8 +1,11 @@
%h2 Links
%ul.links
%li
- %a{ :href => "http://www.jiggzy.com", :title => "Nick Cherry is an excellent person" }
- My original mentor
+ %a{ :href => "http://www.myspace.com/theroaringkittens", :title => "I am a kitten. Roar!" }
+ Hear me roar
%li
- %a{ :href => "http://www.problemchildmag.com", :title => "I'll be reworking it quite soon. As soon as the new MacBook Pros come out..." }
- A sweet literary magazine
+ %a{ :href => "http://www.twitter.com/lisa_alane", :title => "\"Tweet tweet!\" says the bird" }
+ Hear me chirp
+ %li
+ %a{ :href => "http://www.google.com/reader/shared/07996371268026532679", :title => "I like newspapers, but Greader's nice, too" }
+ Read like me
View
13 views/links.haml~
@@ -1,8 +1,11 @@
-
+%h2 Links
%ul.links
%li
- %a{ :href => "http://www.jiggzy.com", :title => "Nick Cherry is an excellent person" }
- My original mentor
+ %a{ :href => "http://www.myspace.com/theroaringkittens", :title => "I am a kitten. Roar!" }
+ Hear me roar
%li
- %a{ :href => "http://www.problemchildmag.com", :title => "I'll be reworking it quite soon. As soon as the new MacBook Pros come out..." }
- A sweet literary magazine
+ %a{ :href => "http://www.twitter.com/lisa_alane", :title => "\"Tweet tweet!\" says the bird" }
+ Hear me chirp
+ %li
+ %a{ :href => "http://www.google.com/reader/shared/07996371268026532679", :title => "I like newspapers, but this is nice, too" }
+ Read like me
View
4 views/printed_word.haml
@@ -0,0 +1,4 @@
+%ul
+ %p
+ %a(href="http://readtheprintedword.org")
+ %img(src="/images/rtpw-button4-200x92.png" alt="Read the Printed Word!" border="0" id="aeaoofnhgocdbnbeljkmbjdmhbcokfdb-mousedown")
View
29 views/styles.sass
@@ -79,7 +79,12 @@ h2
margin: 1.5em 0px 0.75em
a
text-decoration: none
- color = #58A
+ color: #58A
+ &:visited
+ color: #969
+ &:hover
+ color: #c60
+ text-decoration: underline
div
display: block
@@ -251,7 +256,6 @@ dt
padding-top: 3px
cursor: default !important
color: #000
- text-decoration: underline
width: 216px
margin-top: -1px
@@ -272,7 +276,7 @@ label
color: #fff
padding: 3px
input[type="text"], textarea
- width: 300px
+ width: 95%
border: 3px solid #666
font-size: 18px
padding: 7px
@@ -281,3 +285,22 @@ input[type="text"], textarea
margin: 2px 0 37px
textarea
height: 150px
+
+input[type="submit"]
+ background-color: #666
+ padding: 6px 12px
+ border: none
+ color: #fff
+ cursor: pointer
+ text-shadow: 0 1px 1px #000
+ -webkit-box-shadow: 0 1px 3px #999
+ -moz-box-shadow: 0 1px 3px #999
+ font: normal 16px Georgia, serif
+ text-decoration: none
+ letter-spacing: 1px
+ &:hover
+ -webkit-box-shadow: 0 0 7px #999
+ -moz-box-shadow: 0 0 7px #999
+ &:active
+ -webkit-box-shadow: -1px -1px 1px #999
+ -moz-box-shadow: -1px -1px 1px #999
View
29 views/styles.sass~
@@ -79,7 +79,12 @@ h2
margin: 1.5em 0px 0.75em
a
text-decoration: none
- color = #58A
+ color: #58A
+ &:visited
+ color: #969
+ &:hover
+ color: #c60
+ text-decoration: underline
div
display: block
@@ -251,7 +256,6 @@ dt
padding-top: 3px
cursor: default !important
color: #000
- text-decoration: underline
width: 216px
margin-top: -1px
@@ -272,7 +276,7 @@ label
color: #fff
padding: 3px
input[type="text"], textarea
- width: 300px
+ width: 95%
border: 3px solid #666
font-size: 18px
padding: 7px
@@ -281,3 +285,22 @@ input[type="text"], textarea
margin: 2px 0 37px
textarea
height: 150px
+
+input[type="submit"]
+ background-color: #666
+ padding: 6px 12px
+ border: none
+ color: #fff
+ cursor: pointer
+ text-shadow: 0 1px 1px #000
+ -webkit-box-shadow: 0 1px 3px #999
+ -moz-box-shadow: 0 1px 3px #999
+ font: normal 16px Georgia, serif
+ text-decoration: none
+ letter-spacing: 1px
+ &:hover
+ -webkit-box-shadow: 0 0 7px #999
+ -moz-box-shadow: 0 1px 3px #999
+ &:active
+ -webkit-box-shadow: -1px -1px 1px #999
+ -moz-box-shadow: -1px -1px 1px #999
View
8 views/thoughts.haml
@@ -0,0 +1,8 @@
+%h2 Thoughts
+%p
+ :textile
+ So I want to "embed a wave":http://code.google.com/apis/wave/embed/guide.html in this here page.
+
+ Doesn't seem very complicated, I agree. But! I need scripts on _this_ page that the other pages on the site don't have. These need to go in the &lt;head&gt;. But I insist that I shall only have one layout. And I don't want to clutter it up with logic.
+
+ At this point I'm thinking the best way to do this would be with helper functions? I'll create separate branches for each approach.

0 comments on commit 2e92178

Please sign in to comment.