fixed up post layout

aeoth · aeoth · commit cdcc842093a6 · 2011-12-14T14:23:35.000+11:00
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: layout
 ---
 <div class="entry-container">
 	<div class='entry'>
diff --git a/_site/config.ru b/_site/config.ru
@@ -4,7 +4,13 @@ require "rack/rewrite"
 
 use Rack::Static, :urls => ["/css", "/img", "/js" ]
 use Rack::Rewrite do
-  #rewrite %r{/(.*)}, '/$1.html', :if => lambda { File.exists?('/$1.html')}
+  rewrite %r{/(.+)}, lambda { 	|match, rack_env| 
+		if File.exists?('_site/' + match[1] + '.html')
+			return '/' + match[1] + '.html' 
+		else
+			return '/' + match[1]
+		end
+	}
 end
 
 run Rack::Jekyll.new
diff --git a/_site/idea1.html b/_site/idea1.html
@@ -1,4 +1,26 @@
-<div class="entry-container">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta content="en-au" http-equiv="Content-Language" />
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+		<title>Code52</title>
+		<link rel="stylesheet" type="text/css" href="/css/style.css" />
+	</head>
+	<body>
+		<div id="container">
+			<div id="side">
+				code
+				<h1>52</h1>
+				<h2>a new coding project every week</h2>
+				
+				<ul>
+					<li><a href="#">about</a></li>
+					<li><a href="#">submit an idea</a></li>
+					<li><a href="#">past ideas</a></li>
+				</ul>
+			</div>
+			<div id="content">
+				<div class="entry-container">
 	<div class='entry'>
 		<h1> Idea 1: Cupcake ipsum dolor sit amet marshmallow. </h1>
 		<span class="postdate">14 December, 2011
@@ -34,4 +56,9 @@ <h1> Idea 1: Cupcake ipsum dolor sit amet marshmallow. </h1>
     })();
 </script>
 <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+			</div>
+
+		</div>
+	</body>
+</html>
diff --git a/config.ru b/config.ru
@@ -4,7 +4,13 @@ require "rack/rewrite"
 
 use Rack::Static, :urls => ["/css", "/img", "/js" ]
 use Rack::Rewrite do
-  #rewrite %r{/(.*)}, '/$1.html', :if => lambda { File.exists?('/$1.html')}
+  rewrite %r{/(.+)}, lambda { 	|match, rack_env| 
+		if File.exists?('_site/' + match[1] + '.html')
+			return '/' + match[1] + '.html' 
+		else
+			return '/' + match[1]
+		end
+	}
 end
 
 run Rack::Jekyll.new
