From d8fa58deb90ef30e9c08098da4f5aa694483c0eb Mon Sep 17 00:00:00 2001
From: Wesley Moore <wes@wezm.net>
Date: Sun, 13 Jan 2013 18:12:45 +1100
Subject: [PATCH] Consolidate Contact page into About page

---
 content/about.html   | 56 ++++++++++++++++++++++++++++++++++++++++----
 content/contact.html | 52 ----------------------------------------
 content/contact.yaml |  2 --
 layouts/_header.html |  1 -
 4 files changed, 52 insertions(+), 59 deletions(-)
 delete mode 100644 content/contact.html
 delete mode 100644 content/contact.yaml

diff --git a/content/about.html b/content/about.html
index d20b536..a849a5e 100644
--- a/content/about.html
+++ b/content/about.html
@@ -1,12 +1,60 @@
+Me
+--
+
 <div class="vcard">
   <img src="/images/Photo%20of%20Wesley%20Moore.jpg" width="256" height="256" alt="Photo of Wesley Moore" class="photo" />
-  <p>WezM.net is <span class="fn">Wesley Moore</span>'s personal home page, a <span class="title">programmer</span> from <span class="adr"><span class="locality">Melbourne</span> <span class="country-name">Australia</span></span>. Here you will find posts about various projects I'm working on, useful tips I've discovered as well as some random excerpts from other things going on in my life.</p>
+  <p>WezM.net is <span class="fn">Wesley Moore</span>’s personal
+  home page, a <span class="title">programmer</span> from <span
+  class="adr"><span class="locality">Melbourne</span> <span
+  class="country-name">Australia</span></span>. Here you will find posts
+  about various projects I'm working on, useful tips I've discovered as
+  well as some random posts about other things going on in my life.</p>
 </div>
 
-Contact Me
-----------
+### Contact
 
-See the [contact page](/contact/).
+Find me on the Internet in one of these places:
+
+<ul>
+ <li>Email –
+    <script type="text/javascript">
+    //<![CDATA[
+
+    function hiveware_enkoder(){var i,j,x,y,x=
+    "x=\"783d2238383538353535393537353838363538353735383837353935243f7a5c223d78" +
+    "3534353a35343534353538353538357a3f245e393a35663434353835363538383836353835" +
+    "363534383735393539353935343538353b353935363538353735323538353a353935343538" +
+    "35373538353835353836353738353534353435363538383835353833353935393538353735" +
+    "3935353536353235393533353435383537353935363537383535343534353538333538353b" +
+    "35383835353935383836353438373538383935383537353938333538383635343837353838" +
+    "37353735393539353835373539353535363532353935393538353735393833353635353835" +
+    "353438383538353335353837353435343534353b3535383435353564383838683934343a38" +
+    "3b356635323564383b35653937353835373539353b3964393b346435663937386738323535" +
+    "383434343564393b3566343934393934343a383a346738653837386738393936383a356438" +
+    "3b3464356635343435383339323837343a3439343734393464393a34673935393738343935" +
+    "39363b245e3d7b3f29293d6871742a6b3f323d6b3e7a306e677069766a373935387a307577" +
+    "647576742a6b2e342b2b3d217b3b34653534343b343b3564396639683d29293f7b3d243d6b" +
+    "2d3f342b7d7b2d3f77706775656372672a2927292d3f6c2a7471687d2b32363f2d6b3d6a76" +
+    "6970676e307a3e6b3d323f6b2a74713d6b3f406c2f2f3d2b32362d6b2e6a766970676e307a" +
+    "2a706b6f306a76634f753d783b27273d793b5c223d7b21213d2b6c2a764374636a65307a3f" +
+    "2d7b7d2b693b6874676e656c2e783c693b303d6928726f663b2978286570616373656e3233" +
+    "3c6a2866693b322d296928744165646f43726168632e783d6a7b292b2b6a2865646f437261" +
+    "68436d6f72662e676e697274533d2b793b34393d2b6a29797d29223b793d27273b666f7228" +
+    "693d303b693c782e6c656e6774683b692b3d3331297b666f72286a3d4d6174682e6d696e28" +
+    "782e6c656e6774682c692b3331293b2d2d6a3e3d693b297b792b3d782e636861724174286a" +
+    "293b7d7d793b\";y='';for(i=0;i<x.length;i+=2){y+=unescape('%'+x.substr(i,2)" +
+    ");}y";
+    while(x=eval(x));}hiveware_enkoder();
+
+    //]]>
+    </script>
+  </li>
+  <li>App.net – <a href="https://alpha.app.net/wezm">https://alpha.app.net/wezm</a></li>
+  <li>Twitter – <a href="http://twitter.com/wezm">http://twitter.com/wezm</a></li>
+  <li>Facebook – <a href="http://www.facebook.com/wjmoore">http://www.facebook.com/wjmoore</a></li>
+  <li>GitHub – <a href="https://github.com/wezm">https://github.com/wezm</a></li>
+  <li>StackOverflow – <a href="http://stackoverflow.com/users/38820/wes">http://stackoverflow.com/users/38820/wes</a></li>
+</ul>
 
 This Site
 ---------
diff --git a/content/contact.html b/content/contact.html
deleted file mode 100644
index 04232de..0000000
--- a/content/contact.html
+++ /dev/null
@@ -1,52 +0,0 @@
-Feel free to get in touch via one of the following channels.
-
-Email
------
-
-<script type="text/javascript">
-//<![CDATA[
-
-function hiveware_enkoder(){var i,j,x,y,x=
-"x=\"783d2238383538353535393537353838363538353735383837353935243f7a5c223d78" +
-"3534353a35343534353538353538357a3f245e393a35663434353835363538383836353835" +
-"363534383735393539353935343538353b353935363538353735323538353a353935343538" +
-"35373538353835353836353738353534353435363538383835353833353935393538353735" +
-"3935353536353235393533353435383537353935363537383535343534353538333538353b" +
-"35383835353935383836353438373538383935383537353938333538383635343837353838" +
-"37353735393539353835373539353535363532353935393538353735393833353635353835" +
-"353438383538353335353837353435343534353b3535383435353564383838683934343a38" +
-"3b356635323564383b35653937353835373539353b3964393b346435663937386738323535" +
-"383434343564393b3566343934393934343a383a346738653837386738393936383a356438" +
-"3b3464356635343435383339323837343a3439343734393464393a34673935393738343935" +
-"39363b245e3d7b3f29293d6871742a6b3f323d6b3e7a306e677069766a373935387a307577" +
-"647576742a6b2e342b2b3d217b3b34653534343b343b3564396639683d29293f7b3d243d6b" +
-"2d3f342b7d7b2d3f77706775656372672a2927292d3f6c2a7471687d2b32363f2d6b3d6a76" +
-"6970676e307a3e6b3d323f6b2a74713d6b3f406c2f2f3d2b32362d6b2e6a766970676e307a" +
-"2a706b6f306a76634f753d783b27273d793b5c223d7b21213d2b6c2a764374636a65307a3f" +
-"2d7b7d2b693b6874676e656c2e783c693b303d6928726f663b2978286570616373656e3233" +
-"3c6a2866693b322d296928744165646f43726168632e783d6a7b292b2b6a2865646f437261" +
-"68436d6f72662e676e697274533d2b793b34393d2b6a29797d29223b793d27273b666f7228" +
-"693d303b693c782e6c656e6774683b692b3d3331297b666f72286a3d4d6174682e6d696e28" +
-"782e6c656e6774682c692b3331293b2d2d6a3e3d693b297b792b3d782e636861724174286a" +
-"293b7d7d793b\";y='';for(i=0;i<x.length;i+=2){y+=unescape('%'+x.substr(i,2)" +
-");}y";
-while(x=eval(x));}hiveware_enkoder();
-
-//]]>
-</script>
-
-App.net
--------
-
-[https://alpha.app.net/wezm](https://alpha.app.net/wezm)
-
-Twitter
--------
-
-[http://twitter.com/wezm](http://twitter.com/wezm)
-
-Facebook
---------
-
-[http://www.facebook.com/wjmoore](http://www.facebook.com/wjmoore)
-
diff --git a/content/contact.yaml b/content/contact.yaml
deleted file mode 100644
index 6aca353..0000000
--- a/content/contact.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
---- 
-title: Contact Me
diff --git a/layouts/_header.html b/layouts/_header.html
index e83d9af..ad4d512 100644
--- a/layouts/_header.html
+++ b/layouts/_header.html
@@ -3,7 +3,6 @@
   <span>Menu</span>
   <nav id="menu" class="inline">
     <li><a href="/articles/">Articles</a></li>
-    <li><a href="/contact/">Contact</a></li>
     <li><a href="/about/">About</a></li>
     <li><a href="/projects/">Projects</a></li>
     <li><a href="/weather/">Weather</a></li>