From cd1ab2f94a71de0f28638570db085478852b790d Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Sun, 9 Dec 2012 10:16:58 -0800
Subject: Content

---
 views/layout.html         |  2 +-
 views/main/about.html     | 34 +++++++++++++++-------------------
 views/main/index.html     |  2 +-
 views/main/merchants.html |  8 ++++----
 4 files changed, 21 insertions(+), 25 deletions(-)

(limited to 'views')

diff --git a/views/layout.html b/views/layout.html
index ae4d5b69..5bc0d337 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -15,7 +15,7 @@
           <a class="brand" href="/">VanBTC</a>
           <div class="nav-collapse collapse">
             <p class="navbar-text pull-right">
-              Buy: <b id="ask"></b> | Sell: <b id="bid"></b>
+              Buy: <b id="bid"></b> | Sell: <b id="ask"></b>
             </p>
             <ul class="nav">
               <li><a href="/about">Info</a></li>
diff --git a/views/main/about.html b/views/main/about.html
index 6711c039..fc8fcd23 100644
--- a/views/main/about.html
+++ b/views/main/about.html
@@ -6,21 +6,22 @@
     transferred over the Internet.
     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" target="_blank">Try it here</a>.
+    password. Creating a wallet is free and 
+    easy. <a href="https://blockchain.info/wallet/new" target="_blank">Try it here</a> at our favourite e-Wallet provider.
     </p>
     
     <p>
     Transactions between bitcoin addresses are 
     recorded in a public file and <a href="http://blockchain.info/unconfirmed-transactions">published on 
-    the Internet</a>.  This file is called the block chain and it keeps track of what amounts are 
-    stored at what addresses.
+    the Internet</a>.  The file keeps track of the balance of every 
+    address.  New addresses start with a zero balance.
     </p>
     
-    About every 10 minutes, 50 new bitcoins are 
-    generated and distributed proportionally to people that
+    <p>
+    Roughly 150 new bitcoins are 
+    generated every hour and distributed proportionally to the addresses of people that
     contribute computing power to the network. The 
-    <a href="http://bitcoin.org">software to participate</a> is free and open source so anyone can run it on their computer.
+    <a href="http://bitcoin.org">software to participate</a> is free and open source so anyone can run it on their computer to earn bitcoins.
     </p>
 
     <p>
@@ -47,8 +48,13 @@
     </p>
     
     <p>
-    You can use bitcoins to securely store 
-    and backup your savings and gain access to them 
+    You can use bitcoins to send free, 
+    immediate payments to your friends and family 
+    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. Or, use them to 
+    backup your savings and gain access to them 
     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. 
@@ -56,19 +62,9 @@
     government or issuing authority can print more of 
     them.
     </p>
-
-    <p>
-    Bitcoins enable you to send free, 
-    immediate payments to your friends and family 
-    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. 
-    </p>
   </div>
 </div>
 
-
 <div class="row-fluid">
   <div class="span6">
     <h1>Where can I get some?</h1>
diff --git a/views/main/index.html b/views/main/index.html
index 72454ad0..216a6abb 100644
--- a/views/main/index.html
+++ b/views/main/index.html
@@ -2,7 +2,7 @@
   <div class="row-fluid">
     <div class="span12">
       <div class="hero-unit">
-        <h1>Bitcoin Vancouver</h1>
+        <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>
diff --git a/views/main/merchants.html b/views/main/merchants.html
index 942e6eda..d8aafaa9 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -11,16 +11,16 @@
 
   <div class="row-fluid">
     <div class="span4">
-      <h2>Pacific Bliss Massage</h2>
-      <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
+      <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2>
+      <a href="http://pacificblissmassage.com/"><img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" alt="Pacific Bliss" /></a>
       <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" />
+      <h2><a href="http://www.sweettoothcafe.ca/">Sweet Tooth Cafe</a></h2>
+      <a href="http://www.sweettoothcafe.ca/"><img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" alt="Sweet Tooth Cafe" /></a>
       <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>
-- 
cgit v1.2.3