Update bootstrap CSS

5 files changed, 93 insertions, 72 deletions

diff --git a/views/calculator/setup.html b/views/calculator/setup.html
index e77c5cd1..e125eea9 100644
--- a/views/calculator/setup.html
+++ b/views/calculator/setup.html
@@ -11,35 +11,49 @@
   <body>
     <div class="container-fluid">
       <form id="setup" action="/calculator" method="get">
-        <h1>Bitcoin Point of Sale Calculator</h1>
+        <h1>Settings</h1>
 
         <input type="hidden" id="username" name="username" value="{{user}}" />
 
-        <label for="title">Title <small>(optional)</small>:</label>
-        <input type="text" id="title" name="title" />
+        <div class="form-group">
+          <label for="title">Store Name:</label>
+          <input type="text" id="title" name="title" class="form-control" />
+        </div>
 
-        <label for="logo">Logo <small>(optional, URL)</small>:</label>
-        <input type="text" id="logo" name="logo" />
+        <div class="form-group">
+          <label for="logo">Logo <small>(optional URL)</small>:</label>
+          <input type="text" id="logo" name="logo" class="form-control" />
+        </div>
 
-        <label for="address">Bitcoin Address:</label>
-        <input type="text" id="address" name="address" />
+        <div class="form-group">
+          <label for="address">Bitcoin Address:</label>
+          <input type="text" id="address" name="address" class="form-control" />
+        </div>
 
-        <label for="currency">Currency:</label>
-        <select id="currency" name="currency">
-        </select>
+        <div class="form-group">
+          <label for="currency">Currency:</label>
+          <select id="currency" name="currency" class="form-control">
+          </select>
+        </div>
 
-        <label for="symbol">Exchange:</label>
-        <select id="symbol" name="symbol">
-        </select>
+        <div class="form-group">
+          <label for="symbol">Exchange Rate:</label>
+          <select id="symbol" name="symbol" class="form-control">
+          </select>
+        </div>
         
-        <label for="commission">Commission <small>(optional, %)</small>:</label>
-        <input type="text" id="commission" name="commission" />
+        <div class="form-group">
+          <label for="commission">Commission/Discount <small>(optional %)</small>:</label>
+          <input type="text" id="commission" name="commission" class="form-control" />
+        </div>
 
-        <label for="password">Password <small>(blank = no change)</small>:</label>
-        <input type="text" id="password" name="password" />
+        <div class="form-group">
+          <label for="password">Password <small>(blank = no change)</small>:</label>
+          <input type="text" id="password" name="password" class="form-control" />
+        </div>
 
         <br />
-        <input class="btn" type="submit" value="Go" />
+        <input class="btn btn-primary" type="submit" value="Done" />
       </form>
     </div>
   </body>
diff --git a/views/calculator/show.html b/views/calculator/show.html
index b20f2737..db3cb698 100644
--- a/views/calculator/show.html
+++ b/views/calculator/show.html
@@ -16,35 +16,42 @@
         <h1 id="title"></h1>
         <img id="logo" src="img/logo.jpg" alt="Logo" />
 
-        <label for="exchange">Exchange Rate:</label>
-        <input type="text" id="exchange" value="0" disabled="disabled" />
-        <small id="symbol"></small>
+        <form role="form">
+          <div class="form-group">
+            <label for="exchange">Exchange Rate:</label>
+            <input type="text" id="exchange" value="0" disabled="disabled" class="form-control" />
+            <span id="symbol"></span>
+          </div>
 
-        <label for="amount">Amount:</label>
-        <input type="text" id="amount" />
-        <small id="currency"></small>
+          <div class="form-group">
+            <label for="amount">Amount:</label>
+            <input type="text" id="amount" class="form-control" />
+            <span id="currency"></span>
+          </div>
 
-        <label for="tip">Tip:</label>
-        <div class="btn-toolbar">
-          <div class="btn-group" id="tip">
-              <a id="tip0" class="btn tipSelect active" href="#"><i class="icon-align-left">0%</i></a>
-              <a id="tip10" class="btn tipSelect" href="#"><i class="icon-align-left">10%</i></a>
-              <a id="tip15" class="btn tipSelect" href="#"><i class="icon-align-center">15%</i></a>
-              <a id="tip20" class="btn tipSelect" href="#"><i class="icon-align-right">20%</i></a>
+          <div class="form-group">
+            <label for="tip">Tip:</label>
+            <div class="btn-toolbar">
+              <div class="btn-group" id="tip">
+                <button type="button" class="active btn btn-default">0%</button>
+                <button type="button" class="btn btn-default">10%</button>
+                <button type="button" class="btn btn-default">15%</button>
+                <button type="button" class="btn btn-default">20%</button>
+              </div>
+            </div>
           </div>
-        </div>
 
-        <br />
+          <br />
 
-        <div id="payment">
-          <p>Please send <strong id="total">0.0</strong> mBTC to</p><br />
-          <div id="qr"></div>
-          <p id="address"></p>
+          <div id="payment">
+            <p>Please send <strong id="total">0.0</strong> mBTC to</p><br />
+            <div id="qr"></div>
+            <p id="address"></p>
+          </div>
 
+          <span id="received" class="btn btn-success">Payment Received.  Thank you!</span>
         </div>
-
-        <span id="received" class="btn btn-success">Payment Received.  Thank you!</span>
-      </div>
+      </form>
 
       <span id="error" class="btn btn-danger" style="display: none"></span> 
     </div>
diff --git a/views/layout.html b/views/layout.html
index 4f83e237..0e806b3b 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -5,6 +5,7 @@
     <title>Bitcoin Payment Calculator</title>
     <link href="img/favicon.ico" rel="shortcut icon" />
     {{#css}}calculator{{/css}}
+    {{#js}}bootstrap.min.js{{/js}}
   </head>
   <body>
     <div class="container-fluid">
diff --git a/views/sessions/new.html b/views/sessions/new.html
index b6f64e4e..44152995 100644
--- a/views/sessions/new.html
+++ b/views/sessions/new.html
@@ -6,9 +6,9 @@
     <title>CoinOS Bitcoin Payment Calculator</title>
     <link href="img/favicon.ico?v2" rel="shortcut icon" />
     {{#css}}calculator{{/css}}
+    {{#css}}signin{{/css}}
     {{#js}}modernizr-2.6.2-respond-1.1.0.min.js{{/js}}
     <style>
-.notice { border: 1px solid gray; background: #eee; padding: 10px; }
 </style>
   </head>
   <body>
@@ -18,29 +18,27 @@
       {{#notice}}
         <div class="notice">
         <h2>Your Account Needs To Be Recreated</h2>
-        <p>On May 3, 2014, our hosting provider experienced accidentally wiped out our server and database backups, causing us to lose all of our account data.  Please contact us at <a href="mailto:[email protected]">[email protected]</a> and we'll help you get up and running again. Sorry for the inconvenience.  We appreciate all the merchants who have been using our system and we've taken measures to ensure that this kind of catastrophe won't happen again.</p>
+        <p>On May 3, 2014, our hosting provider accidentally wiped out our server and database backups, causing us to lose all of our account data.  Please contact us at <a href="mailto:[email protected]">[email protected]</a> and we'll help you get up and running again. Sorry for the inconvenience.  We appreciate all the merchants who have been using our system and we've taken measures to ensure that this kind of catastrophe won't happen again.</p>
 </p>
-<p>The Bitcoin Co-op
-        </p>
+<p>The Bitcoin Co-op</p>
         </div>
       {{/notice}}
 
-      <form action="login" method="post">
-        <h2>Login</h2>
+      {{#badpw}}
+      <p class="alert alert-danger">Cannot find username/password on file, please try again.</p>
+      {{/badpw}}
 
-        <label for="username">Username:</label>
-        <input type="text" id="username" name="username" value="{{user}}" />
-
-        <label for="password">Password:</label>
-        <input type="password" id="password" name="password" />
-
-        <br /> <br />
-        {{#badpw}}
-        <b>Cannot find username/password on file, please try again.</b>
-        {{/badpw}}
-        <br/><br/>
-        <input type="submit" value="Login" />
+      <form class="form-signin" action="login" method="post">
+        <input name="username" type="text" class="form-control" placeholder="Username" value="{{user}}" required autofocus>
+        <br />
+        <input name="password" type="password" class="form-control" placeholder="Password" required>
+        <br />
+        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
       </form>
+      <form class="form-signin" action="/users/new">
+        <button class="btn btn-lg btn-secondary btn-block">Register</button>
+      </form>
+
       <p><a href="http://bitcoincoop.org/coinos">What is this?</a></p>
     </div>
   </body>
diff --git a/views/users/new.html b/views/users/new.html
index 976046d1..258e8119 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -10,22 +10,23 @@
   </head>
   <body>
     <div class="container-fluid">
-      <form action="/users" method="post">
+      <form id="register" action="/users" method="post">
         <h1>Register</h1>
-        <div class="row-fluid">
-          <div class="span6">
-            <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="" />
-    
-            <label for="email">Email:</label>
-            <input type="email" id="email" name="email" value="" />
-          </div>
+        <div class="form-group">
+          <label for="username">Username:</label>
+          <input type="text" id="username" name="username" class="form-control" />
         </div>
-        <br />
-        <input class="btn" type="submit" value="Next" />
+  
+        <div class="form-group">
+          <label for="password">Password:</label>
+          <input type="password" id="password" name="password" class="form-control" />
+        </div>
+  
+        <div class="form-group">
+          <label for="email">Email:</label>
+          <input type="email" id="email" name="email" class="form-control" />
+        </div>
+        <input class="btn btn-primary" type="submit" value="Register" />
       </form>
     </div>
   </body>