Adding some blog formatting

merb · Oct 30, 2009 · 5b0a340 · 5b0a340
1 parent 902d554
commit 5b0a340
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 2 deletions.
diff --git a/404.html b/404.html
@@ -0,0 +1,17 @@
+---
+layout: default
+title: "404 - Not Found"
+current: "default"
+---
+<h1 class='home'>Page Not Found</h1>
+<div id='icons_top'>
+  <div id='icons_bottom'>
+    <dl style="text"></dl>
+    <dl style="text">
+      <dt></dt>
+    </dl>
+    <dl style="text"></dl>
+  </div>
+</div>
+<div id='content_top'>
+</div>
diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -0,0 +1,12 @@
+---
+layout: default
+current: blog
+---
+
+<div class='full_width' id='content_top'>
+  <div id='content_bottom'>
+    <div id='content_full'>
+      {{ content }}
+    </div>
+  </div>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -10,16 +10,17 @@
     <meta content='text/html;charset=utf-8' http-equiv='content-type' />
     <meta content='no' http-equiv='msthemecompatible' />
     <meta content='false' http-equiv='imagetoolbar' />
-    <link href="stylesheets/merb.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="/stylesheets/merb.css" media="screen" rel="stylesheet" type="text/css" />
   </head>
   <body>
     <div id='header'>
       <div class='wrap_to_center'>
         <div id='logo'>
-          <img alt='Merb' src='img/header_logo.png' />
+          <img alt='Merb' src='/img/header_logo.png' />
         </div>
         <ul id='nav'>
           <li><a href="index.html" {% if page.current == "home" %}id="active"{% endif %}>Home</a></li>
+          <!-- <li><a href="blog.html" {% if page.current == "blog" %}id="active"{% endif %}>Blog</a></li> -->
           <li><a href="why_merb.html" {% if page.current == "why_merb" %}id="active"{% endif %}>Why Merb?</a></li>
           <li><a href="features.html" {% if page.current == "features" %}id="active"{% endif %}>Features</a></li>
           <li><a href="contribute.html" {% if page.current == "contribute" %}id="active"{% endif %}>Contribute</a></li>

diff --git a/_posts/2009-10-29-merb-1-0-13-released.textile b/_posts/2009-10-29-merb-1-0-13-released.textile
@@ -0,0 +1,6 @@
+---
+layout: blog
+title: Merb 1.0.13 Released
+---
+
+h1. {{ page.title }}
diff --git a/blog.html b/blog.html
@@ -0,0 +1,19 @@
+---
+layout: default
+title: "Blog"
+current: "blog"
+---
+
+<div class='full_width' id='content_top'>
+  <div id='content_bottom'>
+    <div id='content_full'>
+      <h1>Blog</h1>
+
+      <ul>
+      {% for post in site.posts %}
+        <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+      {% endfor %}
+      </ul>
+    </div>
+  </div>
+</div>