Permalink
Browse files

Discovered other things that need to be done (see TODO). Using Markdo…

…wn instead of Textile, to no avail.
  • Loading branch information...
1 parent 2e92178 commit 96b3f81c054873508f41e7279081886a6d4ae3a6 @chadoh committed Apr 19, 2010
Showing with 20 additions and 6 deletions.
  1. +5 −1 TODO
  2. +11 −1 controls.rb
  3. +1 −1 views/layout.haml
  4. +1 −1 views/styles.sass
  5. +2 −2 views/thoughts.haml
View
6 TODO
@@ -1,4 +1,8 @@
-make contact form functional
+make "current_tab_if" helper work with arrays
+
+fix bad markup being created by markdown/textile (unmatched closing </p>s!)
+
+make contact form functional (install pony successfully)
Use blogger data api to reproduce blogger content natively
View
@@ -5,6 +5,7 @@
#require 'pony'
set :sass, { :style => :compact }
+set :haml, { :ugly => true }
get "/styles.css" do
content_type 'text/css', :charset => 'utf-8'
@@ -13,7 +14,16 @@
helpers do
def current_tab_if(route)
- "current" if request.path_info == route
+ flag = ""
+ #if route.length > 1
+ # for x in route
+ # flag = route.length
+ #flag = "current" if request.path_info == route[x]
+ # end
+ #else
+ flag = "current" if request.path_info == route
+ #end
+ flag
end
end
View
@@ -15,7 +15,7 @@
%a{ :href => "/thoughts", :class => current_tab_if('/thoughts') }
Thoughts
%li
- %a{ :href => "/", :class => current_tab_if('/') }
+ %a{ :href => "/", :class => current_tab_if(['/', '/language_assistance']) }
Language Assistance
%li
%a{ :href => "/contact", :class => current_tab_if('/contact')}
View
@@ -69,7 +69,7 @@ iframe
#header
border: 1px solid #888
- margin: 0px auto
+ margin: 10px auto 0
width: 660px
h2
View
@@ -1,7 +1,7 @@
%h2 Thoughts
%p
- :textile
- So I want to "embed a wave":http://code.google.com/apis/wave/embed/guide.html in this here page.
+ :markdown
+ 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.

0 comments on commit 96b3f81

Please sign in to comment.