Use layout file

7 files changed, 81 insertions, 171 deletions

diff --git a/app.coffee b/app.coffee
index 1170843c..9d8ab3ba 100644
--- a/app.coffee
+++ b/app.coffee
@@ -24,10 +24,11 @@ passport.deserializeUser((id, done) ->
   done(null, user)
 )
 
-app.engine('html', engines.hogan)
+app.engine('html', require('mmm').__express)
 app.enable('trust proxy')
 app.set('view engine', 'html')
 app.set('views', __dirname + '/views')
+app.set('layout', 'layout')
 app.use(express.static(__dirname + '/public'))
 app.use(require('connect-assets')(src: 'public'))
 app.use(express.bodyParser())
diff --git a/public/css/index.less b/public/css/index.less
index 1ac812d0..1c72317c 100644
--- a/public/css/index.less
+++ b/public/css/index.less
@@ -7,3 +7,7 @@ footer {
   padding: 10px 0px 2px 5px; 
   margin: 0 -20px 0 -20px;
 }
+
+b.price { color: white; }
+div.directory img { width: 150px; height: 150px; float: left; padding-right: 20px; }
+div.row-fluid td.first { text-align: right; }
diff --git a/views/_header.html b/views/_header.html
deleted file mode 100644
index ab242716..00000000
--- a/views/_header.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="navbar navbar-inverse">
-  <div class="navbar-inner">
-    <div class="container-fluid">
-      <a class="brand" href="/">VanBTC</a>
-      <div class="nav-collapse collapse">
-        <p class="navbar-text pull-right">
-          <a href="/login" class="navbar-link">Login</a>
-        </p>
-        <ul class="nav">
-          <li><a href="/about">Info</a></li>
-          <li><a href="/merchants">Merchants</a></li>
-          <li><a href="/exchangers">Exchangers</a></li>
-        </ul>
-      </div><!--/.nav-collapse -->
-    </div>
-  </div>
-</div>
diff --git a/views/exchangers.html b/views/exchangers.html
index b9db0d74..e0e7ecbb 100644
--- a/views/exchangers.html
+++ b/views/exchangers.html
@@ -7,33 +7,11 @@
     <link href="img/favicon.ico" rel="shortcut icon" />
     {{#css}}index{{/css}}
     <style>
-      div.row-fluid img { width: 150px; height: 150px; float: left; padding-right: 20px; }
-      b.price { color: white; }
-      p.labels { overflow: hidden; float: left; text-align: right; padding-right: 5px; }
-      div.row-fluid td.first { text-align: right; }
     </style>
   </head>
   <body>
-    <div class="navbar navbar-inverse">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <a class="brand" href="/">VanBTC</a>
-          <div class="nav-collapse collapse">
-            <p class="navbar-text pull-right">
-              Exchange Rate: <b class="price">$12.50</b> |
-              <a href="/login" class="navbar-link">Login</a>
-            </p>
-            <ul class="nav">
-              <li><a href="/about">Info</a></li>
-              <li><a href="/merchants">Merchants</a></li>
-              <li><a href="/exchangers">Exchangers</a></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
 
-    <div class="container-fluid">
+    <div class="container-fluid directory">
       <div class="row-fluid">
         <div class="span6">
           <h1>Exchangers</h1>
diff --git a/views/index.html b/views/index.html
index fbe36d96..216a6abb 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,65 +1,31 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-		<meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-    <title>Vancouver Bitcoin</title>
-    <link href="img/favicon.ico" rel="shortcut icon" />
-    {{#css}}index{{/css}}
-  </head>
-  <body>
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <a class="brand" href="/">VanBTC</a>
-          <div class="nav-collapse collapse">
-            <p class="navbar-text pull-right">
-              <a href="/login" class="navbar-link">Login</a>
-            </p>
-            <ul class="nav">
-              <li><a href="/about">Info</a></li>
-              <li><a href="/merchants">Merchants</a></li>
-              <li><a href="/exchangers">Exchangers</a></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span12">
+      <div class="hero-unit">
+        <h1>Vancouver Bitcoin</h1>
+        <p>We help local businesses accept bitcoins by providing them with payment software and paying cash for their bitcoins.  We also sell bitcoins to the public through a network of qualified local exchangers.</p>
+        <p><a href="/about" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
       </div>
-    </div>
 
-    <div class="container-fluid">
       <div class="row-fluid">
-        <div class="span12">
-          <div class="hero-unit">
-            <h1>Vancouver Bitcoin</h1>
-            <p>We help local businesses accept bitcoins by providing them with payment software and paying cash for their bitcoins.  We also sell bitcoins to the public through a network of qualified local exchangers.</p>
-            <p><a href="/about" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-          </div>
-          <div class="row-fluid">
-            <div class="span4">
-              <h2>Info</h2>
-              <p>New to bitcoins?  We'll explain why you might want to use them and point you to some useful resources.</p>
-              <p><a class="btn" href="/about">Go &raquo;</a></p>
-            </div><!--/span-->
-            <div class="span4">
-              <h2>Merchants</h2>
-              <p>You can spend your bitcoins in town to support local merchants and improve the local economy.  Want to accept bitcoins in your store?  Check out our <a href="/merchants/new">Point of Sale</a> application.</p>
-              <p><a class="btn" href="/merchants">Go &raquo;</a></p>
-            </div><!--/span-->
-            <div class="span4">
-              <h2>Exchangers</h2>
-              <p>Looking to buy or sell bitcoins?  Our trusted exchangers will give you a fair price and a professional experience.</p>
-              <p><a class="btn" href="/exchangers">Go &raquo;</a></p>
-            </div><!--/span-->
-          </div><!--/row-->
-          <!--/row-->
-        </div><!--/span-->
-      </div><!--/row-->
+        <div class="span4">
+          <h2>Info</h2>
+          <p>New to bitcoins?  We'll explain why you might want to use them and point you to some useful resources.</p>
+          <p><a class="btn" href="/about">Go &raquo;</a></p>
+        </div>
 
-      <hr>
+        <div class="span4">
+          <h2>Merchants</h2>
+          <p>You can spend your bitcoins in town to support local merchants and improve the local economy.</p>
+          <p><a class="btn" href="/merchants">Go &raquo;</a></p>
+        </div>
 
-      <footer>
-        <p>&copy; VanBTC 2012</p>
-      </footer>
+        <div class="span4">
+          <h2>Exchangers</h2>
+          <p>Looking to buy or sell bitcoins?  Our trusted exchangers will give you a fair price and a professional experience.</p>
+          <p><a class="btn" href="/exchangers">Go &raquo;</a></p>
+        </div>
+      </div>
     </div>
-  </body>
-</html> 
+  </div>
+</div>
diff --git a/views/layout.html b/views/layout.html
index ad45585e..f2e7a1ef 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -8,8 +8,27 @@
     {{#css}}index{{/css}}
   </head>
   <body>
+    <div class="navbar navbar-inverse">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+          <a class="brand" href="/">VanBTC</a>
+          <div class="nav-collapse collapse">
+            <p class="navbar-text pull-right">
+              Exchange Rate: <b class="price">$12.50</b> |
+              <a href="/login" class="navbar-link">Login</a>
+            </p>
+            <ul class="nav">
+              <li><a href="/about">Info</a></li>
+              <li><a href="/merchants">Merchants</a></li>
+              <li><a href="/exchangers">Exchangers</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+
     <div class="container-fluid">
-      {{body}}
+      {{>content}}
     </div>
     <hr>
     <footer>
diff --git a/views/merchants.html b/views/merchants.html
index 4eff7bc2..896ecd65 100644
--- a/views/merchants.html
+++ b/views/merchants.html
@@ -1,74 +1,33 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-		<meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-    <title>Vancouver Bitcoin</title>
-    <link href="img/favicon.ico" rel="shortcut icon" />
-    {{#css}}index{{/css}}
-    <style>
-      div.span4 img { width: 150px; height: 150px; float: left; padding-right: 20px; }
-    </style>
-  </head>
-  <body>
-    <div class="navbar navbar-inverse">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <a class="brand" href="/">VanBTC</a>
-          <div class="nav-collapse collapse">
-            <p class="navbar-text pull-right">
-              <a href="/login" class="navbar-link">Login</a>
-            </p>
-            <ul class="nav">
-              <li><a href="/about">Info</a></li>
-              <li><a href="/merchants">Merchants</a></li>
-              <li><a href="/exchangers">Exchangers</a></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
+<div class="container-fluid directory">
+  <div class="row-fluid">
+    <div class="span6">
+      <h1>Merchants</h1>
+      <p>
+      Following is a directory of local shops and businesses in Vancouver that accept bitcoins for payment.  Would you like to be included here?  We'd love to have you!
+      </p>
+      <p><a class="btn" href="/merchants/new">Sign me up!</a></p>
+    </div>
+  </div>
+  <div class="row-fluid">
+    <div class="span4">
+      <h2>Pacific Bliss Massage</h2>
+      <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
+      <p style="overflow: hidden">
+      Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach!
+      </p>
     </div>
 
-    <div></div>
-
-    <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span6">
-          <h1>Merchants</h1>
-          <p>
-          Following is a directory of local shops and businesses in Vancouver that accept bitcoins for payment.  Would you like to be included here?  We'd love to have you!
-          </p>
-          <p><a class="btn" href="/merchants/new">Sign me up!</a></p>
-        </div>
-      </div>
-      <div class="row-fluid">
-        <div class="span4">
-          <h2>Pacific Bliss Massage</h2>
-          <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
-          <p style="overflow: hidden">
-          Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach!
-          </p>
-        </div>
-
-        <div class="span4">
-          <h2>Sweet Tooth Cafe</h2>
-          <img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" />
-          <p>
-          Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai and homemade soup to Italian specialty coffee drinks, all made right in front of you
-          </p>
-        </div>
-
-        <div class="span4">
-          <h2>Divan Kitchen</h2>
-          <img src="http://sphotos-g.ak.fbcdn.net/hphotos-ak-prn1/150071_116421141753535_3214357_n.jpg" />
-          <p>Authentic Turkish kebab and desserts</p>
-        </div>
-      </div>
-      <hr>
+    <div class="span4">
+      <h2>Sweet Tooth Cafe</h2>
+      <img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" />
+      <p>
+      Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai and homemade soup to Italian specialty coffee drinks, all made right in front of you
+      </p>
+    </div>
 
-      <footer>
-        <p>VanBTC</p>
-      </footer>
+    <div class="span4">
+      <h2>Divan Kitchen</h2>
+      <img src="http://sphotos-g.ak.fbcdn.net/hphotos-ak-prn1/150071_116421141753535_3214357_n.jpg" />
+      <p>Authentic Turkish kebab and desserts</p>
     </div>
-  </body>
-</html> 
+  </div>