Merge branch 'ml'

* ml: Redesign. Conflicts: .gitignore
waratuman · Jun 22, 2013 · 32238ff · 32238ff
2 parents 341bae0 + 63f339b
commit 32238ff
Show file tree

Hide file tree

Showing 107 changed files with 3,446 additions and 3,472 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 _site/
+.sass-cache/
 .tm_properties
 
 .DS_Store
diff --git a/_layouts/application.html b/_layouts/application.html
@@ -6,54 +6,39 @@
   <title>{{ page.title }}</title>
   <meta name="description" content="The blog of James R. Bracy (waratuman).">
   <meta name="author" content="James R. Bracy">
-  <link rel="stylesheet" href="/resources/css/application.css">
+  <link rel="stylesheet" href="/assets/application.css">
 </head>
 
 <body>
-  <div id='container' class='container'>
-    <div class='row'>
-      <div id="content" class='span12'>
+    <div id='header'>
+        <a href='/'>waratuman</a>
+    </div>
+
+    <div id='content'>
         {{ content }}
-      </div>
-      <div id='profile' class='span4'>
-        <address>
-          <strong><a href='/'>James R. Bracy</a></strong><br/>
-        </address>
-        <a href="https://twitter.com/#!/waratuman" target="_blank" class='link'>
-          <img src="/resources/images/twitter.png" alt="twitter" width="16" height="16" class='icon' />
-        </a>
-        <a href="https://www.facebook.com/waratuman" target="_blank" class='link'>
-          <img src="/resources/images/facebook.png" alt="facebook" width="16" height="16" class='icon' />
-        </a>
-        <a href="https://www.linkedin.com/in/waratuman" target="_blank" class='link'>
-          <img src="/resources/images/linkedin.png" alt="linked" width="16" height="16" class='icon' />
-        </a>
-
-        <div class='clear'></div>
-        <ul class='unstyled'>
-          <li><a href="/posts.html">All Posts</a></li>
-          <li><a href="/about.html">About</a></li>
-        </ul>
-      </div>
     </div>
 
-    <footer id="footer">
-      Copyright &copy; 2011 James R. Bracy
-    </footer>
-  </div>
-
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
-  <script>window.jQuery || document.write("<script src='/resources/js/jquery-1.5.1.min.js'>\x3C/script>")</script>
-
-  <script>
-    var _gaq=[["_setAccount","UA-12558350-1"],["_trackPageview"]]; // Change UA-XXXXX-X to be your site's ID 
-    (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
-    g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
-    s.parentNode.insertBefore(g,s)}(document,"script"));
-  </script>
-
-  <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
+    <div id='footer'>
+        <div class='left'>
+            <a href='/posts.html'>All Posts</a>
+            | <a href="https://twitter.com/#!/waratuman" target="_blank" class='link'>twitter</a>
+            | <a href="https://www.facebook.com/waratuman" target="_blank" class='link'>facebook</a>
+            | <a href="https://www.linkedin.com/in/waratuman" target="_blank" class='link'>linkedin</a>
+        </div>
+        <div class='right'>
+            Copyright &copy; 2013 James R. Bracy
+        </div>
+    </div>
+
+    <script type='text/javascript'>
+      var _gaq=[["_setAccount","UA-12558350-1"],["_trackPageview"]];
+      (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+      g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
+      s.parentNode.insertBefore(g,s)}(document,"script"));
+    </script>
+
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
 </body>
-</html>
+</html>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -2,9 +2,12 @@
 layout: application
 ---
 
-<div class="post">
-  <h1>{{ page.title }}</h1>
-
-  {{ content }}
-  <div class="clear"></div>
+<div class="post {{ page.font }}">
+    {% unless page.title_fr %}
+        <h1>{{ page.title }}</h1>
+        <hr/>
+    {% endunless %}
+
+    {{ content }}
+
 </div>
diff --git a/_posts/2010-01-12-installing-erlang-on-mac-os-x.markdown b/_posts/2010-01-12-installing-erlang-on-mac-os-x.markdown
@@ -2,6 +2,7 @@
 title: Installing Erlang on Mac OS X
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Erlang
   - Mac

diff --git a/_posts/2010-01-13-basic-set-manipulation-with-erlang.markdown b/_posts/2010-01-13-basic-set-manipulation-with-erlang.markdown
@@ -2,6 +2,7 @@
 title: Basic Set Manipulation With Erlang
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Erlang
   - Sets

diff --git a/_posts/2010-01-19-permutations-and-combinations.html b/_posts/2010-01-19-permutations-and-combinations.html
@@ -2,6 +2,7 @@
 title: Permuations and Combinations
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Erlang
   - Probability

diff --git a/_posts/2010-02-18-setting-up-clojure.markdown b/_posts/2010-02-18-setting-up-clojure.markdown
@@ -2,6 +2,7 @@
 title: Installing Clojure on Mac OS X
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Clojure
   - java

diff --git a/_posts/2010-02-24-parsing-iso8601-with-ragel.markdown b/_posts/2010-02-24-parsing-iso8601-with-ragel.markdown
@@ -2,6 +2,7 @@
 title: Parsing ISO8601 with Ragel
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Ragel
   - Clojure

diff --git a/_posts/2010-03-22-fear-and-burning-bridges.markdown b/_posts/2010-03-22-fear-and-burning-bridges.markdown
@@ -2,6 +2,7 @@
 title: Fear and Burning Bridges
 author: James R. Bracy
 layout: post
+published: false
 ---
 
 

diff --git a/_posts/2010-03-25-installing-ampq.markdown b/_posts/2010-03-25-installing-ampq.markdown
@@ -2,6 +2,7 @@
 title: Installing RabbitMQ on Mac OS X
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - AMQP
   - RabbitMQ

diff --git a/_posts/2010-05-14-ada.markdown b/_posts/2010-05-14-ada.markdown
@@ -2,6 +2,7 @@
 title: A Tangent into Ada
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Ada
   - gnat

diff --git a/_posts/2010-06-02-vectors_in_ada.markdown b/_posts/2010-06-02-vectors_in_ada.markdown
@@ -2,6 +2,7 @@
 title: Vectors in Ada
 author: James R. Bracy
 layout: post
+font: sans
 tags:
   - Ada
   - gnat

diff --git a/_posts/2010-07-28-markov-chains-nodejs-and-redis.md b/_posts/2010-07-28-markov-chains-nodejs-and-redis.md
@@ -2,6 +2,7 @@
 title: Markov Chains, Node.js, and Redis
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 Today's task is to create pseudo random text by using a [Markov Chain](http://en.wikipedia.org/wiki/Markov_chain). [Redis](http://code.google.com/p/redis/)

diff --git a/_posts/2010-09-14-solve-it-with-logic.md b/_posts/2010-09-14-solve-it-with-logic.md
@@ -2,6 +2,7 @@
 title: Solve it with Logic
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 Back during my freshman year of college the Computer Science 101 course

diff --git a/_posts/2010-09-16-algebraic-word-problems.md b/_posts/2010-09-16-algebraic-word-problems.md
@@ -2,6 +2,7 @@
 title: Algebraic Word Problems
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 The next section in the book *Problem Solving Through Recreation 

diff --git a/...2010-09-28-the-most-valuable-education.md → ...10-09-28-the-most-valuable-education.html b/...2010-09-28-the-most-valuable-education.md → ...10-09-28-the-most-valuable-education.html
@@ -35,4 +35,4 @@
 
 Maybe the idea would work, maybe it wouldn't. I don't see it working on a Ph.
 D. level. I'm sure there are more holes in the theory. But to me it seems like
-something worth trying.
+something worth trying.
diff --git a/_posts/2011-01-13-apple-push-with-heroku.md b/_posts/2011-01-13-apple-push-with-heroku.md
@@ -2,6 +2,7 @@
 title: Apple Push Notifications with Heroku
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 Most people think they can't deliver push notifications to [iOS](http://www.apple.com/iphone/ios4/) devices from

diff --git a/_posts/2011-02-22-redeemer.md b/_posts/2011-02-22-redeemer.md
@@ -2,6 +2,7 @@
 title: Redeemer & The Reason for God
 author: James R. Bracy
 layout: post
+published: false
 ---
 
 Since coming to New York City I have attended [Redeemer Presbyterian Church](http://www.redeemer.com/).

diff --git a/_posts/2012-02-24-backbonejs.md b/_posts/2012-02-24-backbonejs.md
@@ -2,6 +2,7 @@
 title: Backbone.js
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 Web applications are taking new paths. [JavaScript](http://en.wikipedia.org/wiki/JavaScript) is playing a more important

diff --git a/_posts/2012-04-13-user_authentication_with_rails_and_backbonejs.md b/_posts/2012-04-13-user_authentication_with_rails_and_backbonejs.md
@@ -2,6 +2,7 @@
 title: User Authentication with Rails and Backbone.js
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 [Backbone.js](http://documentcloud.github.com/backbone/) is a small framework

diff --git a/_posts/2012-10-26-postgis_and_rails.md b/_posts/2012-10-26-postgis_and_rails.md
@@ -2,6 +2,7 @@
 title: PostGIS and Rails
 author: James R. Bracy
 layout: post
+font: sans
 ---
 
 [PostGIS](http://postgis.refractions.net/) is and extension for

diff --git a/_posts/2013-06-08-the-cloud-currency.html b/_posts/2013-06-08-the-cloud-currency.html
@@ -0,0 +1,33 @@
+---
+title: The Cloud Currency
+title_fr: La devise du nuage
+author: James R. Bracy
+layout: post
+---
+
+<div class='left' lang='en'>
+    <h1>{{ page.title }}</h1>
+    <hr/>
+    <p>
+        <a href='http://bitcoin.org/en/'>Bitcoin</a> is quickly becoming the
+        currency of the internet. It will never replace federally issued
+        currency, however, features such as ease of sending money, low
+        transaction fees, security, pseudo-anonymity, instant transactions, and
+        no compliance requirements give <a href='http://bitcoin.org/en/'>Bitcoin</a>
+        a place in the financial industry. The <a href='http://en.wikipedia.org/wiki/Internet'>internet</a>
+        has changed a lot of industries, and now it's changing <a href='http://en.wikipedia.org/wiki/Financial_services'>another</a>.
+    </p>
+</div>
+<div class='mid'></div>
+<div class='right' lang='fr'>
+    <h1>{{ page.title_fr }}</h1>
+    <hr/>
+    <p>
+        Bitcoin est rapidement seyant la monnaie à le interréseau. Il ne sera
+        jamais substitut la monnaie fédéral, néanmoins, caractéristiques tel
+        que bas transaction frais, sécurité, anonymat, transaction instant, et
+        aucune règle, donner Bitcoin un place au secteur de la finance. Les
+        interréseau a changé beaucoup secteur, et actuellement il est change
+        un autre.
+    </p>
+</div>
diff --git a/_posts/2013-06-08-the-cloud-currency.md b/_posts/2013-06-08-the-cloud-currency.md