From 3f04802ed84a5116d7fdd50c1434cff9231137b1 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 28 Nov 2012 20:17:08 -0800 Subject: Use layout file --- app.coffee | 3 +- public/css/index.less | 4 +++ views/_header.html | 17 --------- views/exchangers.html | 24 +------------ views/index.html | 84 +++++++++++++------------------------------ views/layout.html | 21 ++++++++++- views/merchants.html | 99 +++++++++++++++------------------------------------ 7 files changed, 81 insertions(+), 171 deletions(-) delete mode 100644 views/_header.html 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 @@ -
-
-
- VanBTC -
-

- Login -

- -
-
-
-
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 @@ {{#css}}index{{/css}} -
-
-
- VanBTC -
-

- Exchange Rate: $12.50 | - Login -

- -
-
-
-
-
+

Exchangers

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 @@ - - - - - - Vancouver Bitcoin - - {{#css}}index{{/css}} - - -
-
-
- VanBTC -
-

- Login -

- -
-
+
+
+
+
+

Vancouver Bitcoin

+

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.

+

Learn more »

-
-
-
-
-

Vancouver Bitcoin

-

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.

-

Learn more »

-
-
-
-

Info

-

New to bitcoins? We'll explain why you might want to use them and point you to some useful resources.

-

Go »

-
-
-

Merchants

-

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 Point of Sale application.

-

Go »

-
-
-

Exchangers

-

Looking to buy or sell bitcoins? Our trusted exchangers will give you a fair price and a professional experience.

-

Go »

-
-
- -
-
+
+

Info

+

New to bitcoins? We'll explain why you might want to use them and point you to some useful resources.

+

Go »

+
-
+
+

Merchants

+

You can spend your bitcoins in town to support local merchants and improve the local economy.

+

Go »

+
-
-

© VanBTC 2012

-
+
+

Exchangers

+

Looking to buy or sell bitcoins? Our trusted exchangers will give you a fair price and a professional experience.

+

Go »

+
+
- - +
+
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}} +
+
+
+ VanBTC +
+

+ Exchange Rate: $12.50 | + Login +

+ +
+
+
+
+
- {{body}} + {{>content}}