From 135cec8103079336dea3e932f4f2e91a4c03d3f1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Thu, 27 Dec 2012 18:10:51 -0800
Subject: Cosmetic changes

---
 views/main/about.html      | 12 ++++++------
 views/main/exchangers.html | 16 ++++++++--------
 views/main/index.html      | 28 +++++++++++++++++++++++++---
 views/main/merchants.html  |  6 ++----
 views/main/signup.html     |  2 +-
 5 files changed, 42 insertions(+), 22 deletions(-)

(limited to 'views/main')

diff --git a/views/main/about.html b/views/main/about.html
index 2c644b5f..966c90e2 100644
--- a/views/main/about.html
+++ b/views/main/about.html
@@ -1,6 +1,6 @@
 <div class="row-fluid">
   <div class="span6">
-    <h1>What are bitcoins?</h1>
+    <h2>What are bitcoins?</h2>
     <p>
     Bitcoins are units of digital currency that can be 
     transferred over the Internet.
@@ -32,7 +32,7 @@
     </p>
   </div>
   <div class="span6">
-    <h1>Why use them?</h1>
+    <h2>Why use them?</h2>
     <p>
     They're free, fast, secure, and global.  Merchants 
     don't get charged for accepting them and you don't 
@@ -66,7 +66,7 @@
 
 <div class="row-fluid">
   <div class="span6">
-    <h1>Where can I get some?</h1>
+    <h2>Where can I get some?</h2>
     <p>
     Contact one of our trusted <a href="/exchangers">exchangers</a>.  We'll meet you in person to sell you bitcoins and will be happy to help you get started if you're new.
     </p>
@@ -84,7 +84,7 @@
   </div>
 
   <div class="span6">
-    <h1>How is their price set?</h1>
+    <h2>How is their price set?</h2>
     <p>
     Most merchants accepting bitcoin will use an 
     exchange rate from  one of the online markets 
@@ -107,7 +107,7 @@
 
 <div class="row-fluid">
   <div class="span6">
-    <h1>What can I buy with them?</h1>
+    <h2>What can I buy with them?</h2>
     <p>
     You can <a href="/merchants">spend them locally</a> at one of our participating merchants or check out
     <a href="http://bitcoinmagazine.net/where-to-spend-your-bitcoins/">this article</a> for some other suggestions.
@@ -123,7 +123,7 @@
 
   </div>
   <div class="span6">
-    <h1>Where can I learn more?</h1>
+    <h2>Where can I learn more?</h2>
     <p>
     Come to our <a href="http://meetup.com/bitcoinvan/">monthly meetup group</a> or <a href="/exchangers">contact one of us</a>.
     </p>
diff --git a/views/main/exchangers.html b/views/main/exchangers.html
index 476bbf6a..9a5f0fc8 100644
--- a/views/main/exchangers.html
+++ b/views/main/exchangers.html
@@ -8,15 +8,15 @@
       <p><a class="btn" href="/exchangers/join">Join Us!</a></p>
     </div>
 
-    <div class="span6">
+    <div class="span6 well">
       <h1>Meeting Procedure</h1>
-      <ul>
-        <li>Contact one of us to let us know your availability and how much you want to spend</li>
-        <li>We'll arrange a time to meet at a public place like a caf&eacute; or a bank</li>
-        <li>At the time of meeting, we'll look up the exchange rate above to determine how many bitcoins to send for the amount specified</li>
-        <li>You'll provide us with a bitcoin address to send to and count out the cash</li>
-        <li>We'll send the bitcoins to your address using a phone or laptop</li>
-        <li>When the transaction is confirmed, we take the cash, you keep the bitcoins!</li>
+      <ul style="list-style: none; margin: 0;">
+        <li><i class="icon-caret-right"></i> Contact one of us to let us know your availability</li>
+        <li><i class="icon-caret-right"></i> Tell us how much you want to buy and provide us with an address to send to</li>
+        <li><i class="icon-caret-right"></i> We'll arrange a time to meet at a public place like a caf&eacute; or a bank</li>
+        <li><i class="icon-caret-right"></i> When we meet, we'll look up the exchange rate</li>
+        <li><i class="icon-caret-right"></i> We send the bitcoins to your address using our phone or laptop</li>
+        <li><i class="icon-caret-right"></i> We'll wait to confirm the transaction at blockchain.info</li>
       </ul>
     </div>
   </div>
diff --git a/views/main/index.html b/views/main/index.html
index f964017d..3a9d10ad 100644
--- a/views/main/index.html
+++ b/views/main/index.html
@@ -9,23 +9,45 @@
 
       <div class="row-fluid">
         <div class="span4">
-          <h2>Info</h2>
+          <h2><i class="icon-question-sign"></i> 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>
 
         <div class="span4">
-          <h2>Merchants</h2>
+          <h2><i class="icon-globe"></i> 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>
 
         <div class="span4">
-          <h2>Exchangers</h2>
+          <h2><i class="icon-user"></i> 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>
+
+      <br />
+
+      <div class="row-fluid">
+        <div class="span12 well">
+          <form action="/users" method="post" style="float: right; padding-left: 15px;">
+            <h2>Sign Up</h2>
+
+            <label for="username">Username:</label>
+            <input type="text" id="username" name="username" />
+
+            <label for="password">Password:</label>
+            <input type="password" id="password" name="password" value="" />
+
+            <br />
+            <input class="btn" type="submit" value="Go" />
+          </form>
+
+          <h2>Point of Sale</h2>
+          <p>Create a free Point-of-Sale webpage with us that you can run in your store to accept bitcoin payments from your customers!</p>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/views/main/merchants.html b/views/main/merchants.html
index b8a8c614..17ab6976 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -1,11 +1,9 @@
 <div class="container-fluid">
   <div class="row-fluid">
-    <div class="span6">
+    <div class="span12">
       <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/signup">Sign me up!</a></p>
+      Following is a directory of local shops and businesses in Vancouver that accept bitcoins for payment.
     </div>
   </div>
 
diff --git a/views/main/signup.html b/views/main/signup.html
index 9701b779..249f0ede 100644
--- a/views/main/signup.html
+++ b/views/main/signup.html
@@ -1,7 +1,7 @@
 <h1>Sign Up</h1>
 
 <p>
-Are you a Vancouver business owner accepting bitcoins for payment? Great! That's all it takes to be listed on our site. Just let us know what image and text you'd like us to put up and give us your website address if you have one:
+Are you a Vancouver business owner accepting bitcoins for payment? Great! That's all it takes to be listed on our site. Just let us know what image and text you'd like us to put up and give us your website address if you have one.
 </p>
 
 <h2>Point of Sale</h2>
-- 
cgit v1.2.3