Update homepage

diff --git a/pages/0-home.md b/pages/0-home.md
index 1d0fc63696aefb0d98794e9c54764486b5967b11..aef8cf168f814556597594a39e7828d1e43de790 100644 (file)
--- a/pages/0-home.md
+++ b/pages/0-home.md
@@ -7,8 +7,6 @@ Craftsmanship and clean software design. This site is meant to showcase
 some of my own thoughts and projects regarding those concepts as well
 as many others.
 
-<div class="left-col">
-
 ## Post Topics
 
 This blog is meant to cover a range of topics that I find incredibly
@@ -19,10 +17,6 @@ interesting. Below is a subset of the topics that I intend to cover:
 * Compiler Internals 
 * Systems Programming
 
-</div> 
-
-<div class="right-col">
-
 ## Interesting Projects
 
 Check out some of my projects on GitHub:
@@ -31,5 +25,3 @@ Check out some of my projects on GitHub:
 * Opts: A dead-simple options parsing library written in ANSI C.
 * Parse-Utils: A collection of C++ classes for implementing recursive descent parsers.
 
-</div>
-

diff --git a/site/articles.html b/site/articles.html
index a78d23441ad29cd6d29f612a11220df9eb5a4e35..6d2f1c258fd6467e8b73fece62893dd62713b744 100644 (file)
--- a/site/articles.html
+++ b/site/articles.html
@@ -19,21 +19,15 @@
     <div class="menu">
         <span class='left'>
 <a id='menuitem0' href='home.html'>home</a>
-<a id='menuitem1' href='projects.html'>projects</a>
-<a id='menuitem2' href='articles.html'>articles</a>
+<a id='menuitem1' href='articles.html'>articles</a>
+<a id='menuitem2' href='projects.html'>projects</a>
 <a id='menuitem3' href='prototypes.html'>prototypes</a>
 </span>
 
     </div>
 
     <div class="content">
-        <div class="nav">
-            <ul>
-                <li><a href="" class="thisPage">link1</a></li>
-                <li><a href="">link2</a></li>
-                <li><a href="">link3</a></li>
-            </ul>
-        </div>
+        
 
         <div class="main">
             <h1>Articles</h1>

diff --git a/site/home.html b/site/home.html
index 8397adc94170fb4e32a6df873a03171f2a793f15..2c455ec5e97dac6fa106530f8f6ff367843dfd6a 100644 (file)
--- a/site/home.html
+++ b/site/home.html
@@ -19,49 +19,43 @@
     <div class="menu">
         <span class='left'>
 <a id='menuitem0' href='home.html'>home</a>
-<a id='menuitem1' href='projects.html'>projects</a>
-<a id='menuitem2' href='articles.html'>articles</a>
+<a id='menuitem1' href='articles.html'>articles</a>
+<a id='menuitem2' href='projects.html'>projects</a>
 <a id='menuitem3' href='prototypes.html'>prototypes</a>
 </span>
 
     </div>
 
     <div class="content">
-        <div class="nav">
-            <ul>
-                <li><a href="" class="thisPage">link1</a></li>
-                <li><a href="">link2</a></li>
-                <li><a href="">link3</a></li>
-            </ul>
-        </div>
+        
 
         <div class="main">
             <h1>Home</h1>
 <p>Welcome! I am Michael D. Lowis and this is my personal web page. I am an Embedded Software Engineer, currently employed at Gentex Corporation in Zeeland, MI. I have a keen interest in the concepts of Software Craftsmanship and clean software design. This site is meant to showcase some of my own thoughts and projects regarding those concepts as well as many others.</p>
-<div class="left-col">
-
-## Post Topics
-
-This blog is meant to cover a range of topics that I find incredibly
-interesting. Below is a subset of the topics that I intend to cover:
-
-* Programming Language Design 
-* Software Construction Tools 
-* Compiler Internals 
-* Systems Programming
-
-</div> 
-<div class="right-col">
-
-## Interesting Projects
-
-Check out some of my projects on GitHub:
-
-* Data Structures: A collection of classic data structures written in ANSI C.  
-* Opts: A dead-simple options parsing library written in ANSI C.
-* Parse-Utils: A collection of C++ classes for implementing recursive descent parsers.
-
-</div>
+<h2>Post Topics</h2>
+<p>This blog is meant to cover a range of topics that I find incredibly interesting. Below is a subset of the topics that I intend to cover:</p>
+<ul>
+<li>
+Programming Language Design 
+</li><li>
+Software Construction Tools 
+</li><li>
+Compiler Internals 
+</li><li>
+Systems Programming
+</li>
+</ul>
+<h2>Interesting Projects</h2>
+<p>Check out some of my projects on GitHub:</p>
+<ul>
+<li>
+Data Structures: A collection of classic data structures written in ANSI C.  
+</li><li>
+Opts: A dead-simple options parsing library written in ANSI C.
+</li><li>
+Parse-Utils: A collection of C++ classes for implementing recursive descent parsers.
+</li>
+</ul>
 
 
         </div>

diff --git a/site/projects.html b/site/projects.html
index fb850414b0c3d57eabd07437244e3b2c116daab9..84b14a32f882f07aacf175497bfad88b53adea9f 100644 (file)
--- a/site/projects.html
+++ b/site/projects.html
@@ -19,21 +19,15 @@
     <div class="menu">
         <span class='left'>
 <a id='menuitem0' href='home.html'>home</a>
-<a id='menuitem1' href='projects.html'>projects</a>
-<a id='menuitem2' href='articles.html'>articles</a>
+<a id='menuitem1' href='articles.html'>articles</a>
+<a id='menuitem2' href='projects.html'>projects</a>
 <a id='menuitem3' href='prototypes.html'>prototypes</a>
 </span>
 
     </div>
 
     <div class="content">
-        <div class="nav">
-            <ul>
-                <li><a href="" class="thisPage">link1</a></li>
-                <li><a href="">link2</a></li>
-                <li><a href="">link3</a></li>
-            </ul>
-        </div>
+        
 
         <div class="main">
             <h1>Projects</h1>

diff --git a/site/prototypes.html b/site/prototypes.html
index 9db9864f2c9a836881d9dad558fa5f46dcd11dae..6ecd5ad8f8b3e8874c9aa816ab94eddea09249bc 100644 (file)
--- a/site/prototypes.html
+++ b/site/prototypes.html
@@ -19,21 +19,15 @@
     <div class="menu">
         <span class='left'>
 <a id='menuitem0' href='home.html'>home</a>
-<a id='menuitem1' href='projects.html'>projects</a>
-<a id='menuitem2' href='articles.html'>articles</a>
+<a id='menuitem1' href='articles.html'>articles</a>
+<a id='menuitem2' href='projects.html'>projects</a>
 <a id='menuitem3' href='prototypes.html'>prototypes</a>
 </span>
 
     </div>
 
     <div class="content">
-        <div class="nav">
-            <ul>
-                <li><a href="" class="thisPage">link1</a></li>
-                <li><a href="">link2</a></li>
-                <li><a href="">link3</a></li>
-            </ul>
-        </div>
+        
 
         <div class="main">
             <h1>Prototypes</h1>

diff --git a/templates/page.erb b/templates/page.erb
index a34d16cfa8a4a37165860bbf7a9b3adc46cfb8e2..cf634ecb2319a11799c4a0194d7d9a7f76398646 100644 (file)
--- a/templates/page.erb
+++ b/templates/page.erb
@@ -21,13 +21,7 @@
     </div>
 
     <div class="content">
-        <div class="nav">
-            <ul>
-                <li><a href="" class="thisPage">link1</a></li>
-                <li><a href="">link2</a></li>
-                <li><a href="">link3</a></li>
-            </ul>
-        </div>
+        
 
         <div class="main">
             <%= @contents %>

diff --git a/update.rb b/update.rb
index a722cb013bd3bf1999af02deab8d6d1292b62121..633501f750b004d359569ea5bfd37cca227229be 100755 (executable)
--- a/update.rb
+++ b/update.rb
@@ -54,7 +54,7 @@ class Page
   
   def getmenu()
     menu = "<span class='left'>\n"
-    Dir.glob('pages/*.md').each_with_index do |e,idx|
+    Dir.glob('pages/*.md').sort.each_with_index do |e,idx|
         page = e.match(/\d+-(.+).md/)[1]
         menu += "<a id='menuitem#{idx}' href='#{page}.html'>#{page}</a>\n" 
     end
@@ -84,8 +84,3 @@ Dir.glob('pages/*.md').each do |md|
   puts "#{md} -> #{html}"
   Page.new(md).save(html)
 end
-
-# Generate Home Page
-# Generate Articles Page
-# Generate Projects Page
-# Generate Prototypes Page
\ No newline at end of file