From af007f122be1930259b596ad70bbc20cbd97c0f8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Wed, 16 Jan 2013 00:22:07 -0800
Subject: Update merchants page

---
 public/css/index.less     |   4 ++--
 public/img/cabin12.jpg    | Bin 0 -> 12020 bytes
 public/img/nolimit.jpg    | Bin 0 -> 65419 bytes
 views/main/merchants.html |  48 ++++++++++++++++++++++++++++++++--------------
 4 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 public/img/cabin12.jpg
 create mode 100644 public/img/nolimit.jpg

diff --git a/public/css/index.less b/public/css/index.less
index cde39c1e..d508ee8b 100644
--- a/public/css/index.less
+++ b/public/css/index.less
@@ -22,8 +22,8 @@ footer {
 }
 
 #ask, #bid { color: white; }
-div.directory { width: 500px; float: left; border: 1px dashed #ccc; padding: 10px; margin: 10px; }
-div.directory img { width: 150px; height: 150px; float: left; padding-right: 10px; }
+div.directory { width: 500px; float: left; min-height: 300px; border: 1px dashed #ccc; padding: 10px; margin: 10px; }
+div.directory img { max-height: 200px; float: left; padding-right: 10px; }
 div.directory p { font-size: 13px; }
 div.directory h2 a { text-decoration: none; color: #000; }
 div.row-fluid td.first { text-align: right; }
diff --git a/public/img/cabin12.jpg b/public/img/cabin12.jpg
new file mode 100644
index 00000000..a02b3030
Binary files /dev/null and b/public/img/cabin12.jpg differ
diff --git a/public/img/nolimit.jpg b/public/img/nolimit.jpg
new file mode 100644
index 00000000..4da36453
Binary files /dev/null and b/public/img/nolimit.jpg differ
diff --git a/views/main/merchants.html b/views/main/merchants.html
index f6e2dbee..1ee1349f 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -3,16 +3,36 @@
     <div class="span12">
       <h1>Merchants</h1>
       <p>
-      Following is a directory of local shops and businesses in Vancouver that accept bitcoins for payment.
+      Following is a directory of local shops and businesses in Vancouver (and Victoria!) that accept bitcoins for payment.
     </div>
   </div>
 
   <div class="row-fluid">
     <div class="span12">
       <div class="directory">
-        <h2>Divan Kitchen</h2>
-        <img src="/img/divan.jpg" />
-        <p>Authentic Turkish kebab and desserts</p>
+        <h2><a href="http://www.cabin12.ca/">Cabin 12 Restaurant</a></h2>
+        <a href="http://www.sweettoothcafe.ca/"><img src="/img/cabin12.jpg" alt="Cabin 12 Restaurant" /></a>
+        <p>
+        One of the best breakfast and lunch spots in Victoria! Now open for dinner.
+        </p>
+
+        <p>
+        Big beautiful breakfasts, fantastic ribs, generous wings, some of the best burgers in town, and a range of vegetarian options.
+        </p>
+
+        <p>
+        Super, friendly staff. Free wifi internet.
+        </p>
+
+        <p>
+        Cash, debit, Visa or MasterCard, Canadian Tire Money and Bitcoins accepted.
+        </p>
+      </div>
+      
+      <div class="directory">
+        <h2><a href="http://nolimitlandscapes.com/">No Limit Landscaping</a></h2>
+        <a href="http://nolimitlandscapes.com/"><img src="/img/nolimit.jpg" alt="No Limit Landscaping" /></a>
+        <p style="clear: both; overflow: hidden">No Limit Landscaping is a new company formed in January of 2013. With over 20 years of experience in the industry, we will be focusing our expertise on the residential sector. We install full landscapes from start to finish. From designing to excavation to a completed landscape we will work with you through the entire process. Our water features set us apart from our competitors and are an excellent addition to any household.</p>
       </div>
 
       <div class="directory">
@@ -23,6 +43,16 @@
         </p>
       </div>
 
+      <div class="directory">
+        <h2><a href="http://yourlocalmoversbc.com/">Your Local Movers</a></h2>
+        <a href="http://yourlocalmoversbc.com/"><img src="/img/yourlocalmovers.png" alt="Your Local Movers" /></a>
+        <p style="clear: both">
+        We can do anything from moves, deliveries, junk removal or even help moving something around the inside of your house!  No job is too big or small for us.
+
+Your Local Movers provides service to the entire Lower Mainland as well as the Sunshine Coast, Whistler, and Vancouver BC.
+        </p>
+      </div>
+
       <div class="directory">
         <h2><a href="http://www.sweettoothcafe.ca/">Sweet Tooth Cafe</a></h2>
         <a href="http://www.sweettoothcafe.ca/"><img src="/img/sweettooth.gif" alt="Sweet Tooth Cafe" /></a>
@@ -31,17 +61,7 @@
         </p>
       </div>
 
-      
-
-      <div class="directory">
-        <h2><a href="http://yourlocalmoversbc.com/">Your Local Movers</a></h2>
-        <a href="http://yourlocalmoversbc.com/"><img src="/img/yourlocalmovers.png" alt="Your Local Movers" /></a>
-        <p>
-        We can do anything from moves, deliveries, junk removal or even help moving something around the inside of your house!  No job is too big or small for us.
 
-Your Local Movers provides service to the entire Lower Mainland as well as the Sunshine Coast, Whistler, and Vancouver BC.
-        </p>
-      </div>
     </div>
   </div>
 </div>
-- 
cgit v1.2.3