From f0ae4295baa1d6573347fe6ffecac68a559f47bf Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Tue, 27 Nov 2012 21:50:10 -0800
Subject: Content

---
 views/about.html      | 24 +++++++++++-----------
 views/exchangers.html | 55 +++++++++++++++++++++++++++++++++++++++++++++------
 views/index.html      |  2 +-
 views/merchants.html  | 18 ++++++++---------
 4 files changed, 70 insertions(+), 29 deletions(-)

(limited to 'views')

diff --git a/views/about.html b/views/about.html
index 17492ada..edbd8d3e 100644
--- a/views/about.html
+++ b/views/about.html
@@ -35,20 +35,20 @@
           <p>
           Bitcoins are units of digital currency that can be 
           transferred over the Internet.
-          They get sent to and stored at a bitcoin address which is like a digital
-          bank account that you can access with a 
-          password. Registering and using a new address is as free and 
-          easy as email...  <a href="https://blockchain.info/wallet/new">try it!</a>
+          They get sent to a bitcoin address and stored in a digital wallet 
+          that you can access with a 
+          password. Creating and using a new wallet and address is free and as
+          easy as email -- <a href="https://blockchain.info/wallet/new">try it</a>.
           </p>
           
           <p>
           Transactions between bitcoin addresses are 
-          recorded in a public record that's <a href="http://blockchain.info/unconfirmed-transactions">published on 
-          the Internet</a>.  It keeps track of what amounts are 
+          recorded in a public file and <a href="http://blockchain.info/unconfirmed-transactions">published on 
+          the Internet</a>.  This file, or "block chain", keeps track of what amounts are 
           stored at what addresses.
           </p>
           
-          Every 10 minutes, 50 new bitcoins are 
+          About every 10 minutes, 50 new bitcoins are 
           generated by a mathematical algorithm and distributed to people who 
           contribute computing power to the network. The 
           <a href="http://bitcoin.org">software to participate in the network</a> is free and open source so anyone can run it on their computer.
@@ -59,7 +59,7 @@
           bitcoins will be created until there are a total of 
           21 million of them in circulation by the year 2040. Each bitcoin 
           is divisible up to 8 decimal places, making 
-          it possible to transact very small amounts.
+          it possible to transact very small portions of them.
           </p>
         </div>
         <div class="span6">
@@ -80,7 +80,7 @@
           <p>
           You can use bitcoins to securely store 
           and backup your savings and gain access to them 
-          from anywhere that has Internet. They tend to 
+          from anywhere that has Internet access. They tend to 
           appreciate in value over time because of their 
           limited supply so they make a good investment. 
           Unlike dollars and other national currencies, no 
@@ -91,7 +91,7 @@
           <p>
           Bitcoins enable you to send free, 
           immediate payments to your friends and family 
-          from a phone or laptop so you can pay a co-worker 
+          from your phone or laptop so you can pay a co-worker 
           back for coffee, transfer wages to family overseas, 
           or donate to organizations like WikiLeaks who have 
           been cut off by the major payment companies. 
@@ -155,13 +155,13 @@
           <a href="http://bitcoinmagazine.net/where-to-spend-your-bitcoins/">this article</a> for some other good suggestions.
           The number of <a href="https://en.bitcoin.it/wiki/Trade">companies accepting bitcoins</a>
           is growing quickly. We're working to get more stores accepting them in 
-          Vancouver because we believe it'll be in 
+          Vancouver.  We believe it'll be in 
           their best interest to avoid the transaction fees 
           charged by the credit card companies. Transaction 
           fees end up getting built into the prices we pay for 
           goods and services across the board so we're 
           indirectly subsidizing the big banks and credit card 
-          companies whether we use their services 
+          companies whether we personally use their services 
           or not.
           </p>
 
diff --git a/views/exchangers.html b/views/exchangers.html
index f608a506..6fe8a1c8 100644
--- a/views/exchangers.html
+++ b/views/exchangers.html
@@ -7,7 +7,9 @@
     <link href="img/favicon.ico" rel="shortcut icon" />
     {{#css}}index{{/css}}
     <style>
-      div.span4 img { width: 150px; height: 150px; float: left; padding-right: 20px; }
+      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; }
     </style>
   </head>
   <body>
@@ -17,6 +19,7 @@
           <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">
@@ -34,20 +37,60 @@
         <div class="span6">
           <h1>Exchangers</h1>
           <p>
-           Our aim is to establish a network of trusted individuals who are willing to provide a consistent experience and price for people wanting to trade bitcoins in Vancouver.
+           Our goal is to establish a network of trusted individuals who can provide a consistent experience and reliable price for people wanting to trade bitcoins in Vancouver.
           </p>
           <p><a class="btn" href="/exchangers/new">Join Us!</a></p>
         </div>
+        <div class="span6">
+          <h1>Meeting Procedure</h1>
+          <ul>
+            <li>Contact one of us letting us know how much you want to spend and your availability</li>
+            <li>We'll set a time to meet at a public place like a caf&eacute; or a bank</li>
+            <li>We'll meet up and use the exchange rate above to convert the specified amount of CAD to BTC</li>
+            <li>You provide us with a bitcoin address and count out the cash</li>
+            <li>We send bitcoins to your address and take the cash</li>
+          </ul>
+        </div>
       </div>
       <div class="row-fluid">
         <div class="span4">
           <h2>Adam Soltys</h2>
           <img src="http://photos3.meetupstatic.com/photos/member/c/5/0/member_60963152.jpeg" />
-          <p>Neighbourhood: Hastings/Sunrise, Gastown</p>
-          <p>Email: <a href="mailto:asoltys@gmail.com">asoltys@gmail.com</a></p>
-          <p>Availability: 9am - 9pm Mon - Sun</p>
-          
+          <p class="labels">
+            <b>Neighbourhood:</b><br />
+            <b>Email:</b><br />
+          </p>
+          <p>
+            Hastings/Sunrise<br />
+            <a href="mailto:asoltys@gmail.com">asoltys@gmail.com</a>
+          </p>
+        </div>
+        <!--
+        <div class="span4">
+          <h2>Adam Soltys</h2>
+          <img src="http://photos3.meetupstatic.com/photos/member/c/5/0/member_60963152.jpeg" />
+          <p class="labels">
+            <b>Neighbourhood:</b><br />
+            <b>Email:</b><br />
+          </p>
+          <p>
+            Hastings/Sunrise<br />
+            <a href="mailto:asoltys@gmail.com">asoltys@gmail.com</a>
+          </p>
+        </div>
+        <div class="span4">
+          <h2>Adam Soltys</h2>
+          <img src="http://photos3.meetupstatic.com/photos/member/c/5/0/member_60963152.jpeg" />
+          <p class="labels">
+            <b>Neighbourhood:</b><br />
+            <b>Email:</b><br />
+          </p>
+          <p>
+            Hastings/Sunrise<br />
+            <a href="mailto:asoltys@gmail.com">asoltys@gmail.com</a>
+          </p>
         </div>
+        -->
         <!--/span-->
       </div><!--/row-->
 
diff --git a/views/index.html b/views/index.html
index 10930021..fbe36d96 100644
--- a/views/index.html
+++ b/views/index.html
@@ -31,7 +31,7 @@
         <div class="span12">
           <div class="hero-unit">
             <h1>Vancouver Bitcoin</h1>
-            <p>We help local businesses accept bitcoins by providing them with custom made payment software and prepurchasing bitcoins from them with cash.  We also sell bitcoins to the public through a network of qualified local exchangers. We believe that liquidity will be a key to Bitcoin's success so we're striving to promote its adoption in our community.</p>
+            <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">
diff --git a/views/merchants.html b/views/merchants.html
index a3663c3c..4eff7bc2 100644
--- a/views/merchants.html
+++ b/views/merchants.html
@@ -45,25 +45,23 @@
         <div class="span4">
           <h2>Pacific Bliss Massage</h2>
           <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
-          <p>
-          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 &amp; in the summer months at Vancouver's most beautiful location - Wreck Beach!
+          <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>Spartacus Books</h2>
-          <img src="http://www.spartacusbooks.net/new/resources/spartacuslogo.jpg" />
+          <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, Homemade soup to Italian specialty coffee drinks, all made right in front of you
+          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>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, Homemade soup to Italian specialty coffee drinks, all made right in front of you
-          </p>
+          <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>
-- 
cgit v1.2.3