Merge branch 'code_reorg'

6 files changed, 67 insertions, 109 deletions

diff --git a/views/layout.html b/views/layout.html
index 2a30cda2..651d01ef 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -4,15 +4,17 @@
 		<meta name="viewport" content="width=device-width, height=752, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1" />
     <title>CoinOS</title>
     <link href="img/favicon.ico" rel="shortcut icon" />
-    <link rel='stylesheet' href='/css/calculator.css'>
+    {{#css}}css/calculator{{/css}}
     {{{yield-styles}}}
     {{{yield-scripts}}}
   </head>
   <body>
     <div class="container-fluid">
+      {{#navigation}}
       <nav class="navbar" role="navigation">
         <button type="button" class="btn btn-primary navbar-toggle" data-toggle="collapse" data-target="#nav">
-          <span class="glyphicon glyphicon-list"></span>
+          <span class="pull-right glyphicon glyphicon-list"></span>
+          <span id="connection" class="pull-right glyphicon glyphicon-exclamation-sign"></span>
         </button>
         <div id="nav" class="collapse navbar-collapse">
           <div class="navbar">
@@ -31,6 +33,7 @@
           </div>
         </div>
       </nav>
+      {{/navigation}}
 
       {{{yield}}}
     </div>
diff --git a/views/sessions/new.html b/views/sessions/new.html
index a871e66c..cf28a9ed 100644
--- a/views/sessions/new.html
+++ b/views/sessions/new.html
@@ -1,46 +1,30 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-		<meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-    <title>CoinOS</title>
-    <link href="img/favicon.ico?v2" rel="shortcut icon" />
-    <link rel='stylesheet' href='/css/calculator.css'>
-    <link rel='stylesheet' href='/css/signin.css'>
-    <script src='/js/modernizr-2.6.2-respond-1.1.0.min.js'></script>
-    <script src='/js/jquery-1.8.2.min.js'></script>
-    <script src='/js/signin.js'></script>
-  </head>
-  <body>
-    <div class="container-fluid">
-      <div id="main-logo"></div>
+{{#yield-scripts}}
+  {{#css}}css/signin{{/css}}
+  {{#js}}js/signin{{/js}}
+{{/yield-scripts}}
 
-      {{#notice}}
-        <div class="notice">
-        <h2>Your Account Needs To Be Recreated</h2>
-        <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>
-        </div>
-      {{/notice}}
+<div id="main-logo"></div>
+
+{{#notice}}
+  <div class="alert alert-danger">
+  <p>Looks like you're trying to access a page or account that doesn't exist.  We had an issue with our server in May that caused us to lose account data.  Please feel free to contact us at <a href="mailto:[email protected]">[email protected]</a> and we can help you get set up again or find what you're looking for.</p>
+  </div>
+{{/notice}}
 
-      {{#badpw}}
-      <p class="alert alert-danger">Cannot find username/password on file, please try again.</p>
-      {{/badpw}}
+{{#badpw}}
+<p class="alert alert-danger">Cannot find username/password on file, please try again.</p>
+{{/badpw}}
 
-      <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="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>
 
-      <p>
-        <button id="register" class="btn btn-lg btn-secondary btn-block">Register</button>
-      </p>
+<p>
+  <button id="register" class="btn btn-lg btn-secondary btn-block">Register</button>
+</p>
 
-      <p><a href="http://bitcoincoop.org/coinos">What is this?</a></p>
-    </div>
-  </body>
-</html> 
+<p><a href="http://bitcoincoop.org/coinos">What is this?</a></p>
diff --git a/views/transactions/index.html b/views/transactions/index.html
index d214ea20..afbc55ab 100644
--- a/views/transactions/index.html
+++ b/views/transactions/index.html
@@ -1,9 +1,5 @@
 {{#yield-scripts}}
-<script src='/js/jquery-1.8.2.min.js'></script>
-<script src='/js/jquery-ui.min.js'></script>
-<script src='/js/bootstrap.min.js'></script>
-<script src='/js/moment.min.js'></script>
-<script src='/js/report.js'></script>
+  {{#js}}js/report{{/js}}
 {{/yield-scripts}}
 
 <h1>Transactions</h1>
@@ -18,11 +14,10 @@
 </div>
 
 
-<table class="table report">
+<table class="table table-striped report">
   <thead>
     <tr>
-      <th>Date</th>
-      <th>Address</th>
+      <th>Time</th>
       <th>Rate</th>
       <th>BTC</th>
       <th>CAD</th>
@@ -32,7 +27,7 @@
   </tbody>
   <tfoot>
     <tr>
-      <td id="total" colspan="3">Totals:</td>
+      <td id="total" colspan="2">Total:</td>
       <td id="btc"></td>
       <td id="cad"></td>
     </tr>
diff --git a/views/calculator/setup.html b/views/users/edit.html
index bd98e885..72399187 100644
--- a/views/calculator/setup.html
+++ b/views/users/edit.html
@@ -1,14 +1,8 @@
 {{#yield-scripts}}
-<script src='/js/jquery-1.8.2.min.js'></script>
-<script src='/js/bootstrap.min.js'></script>
-<script src='/js/2.5.3-crypto-sha256.js'></script>
-<script src='/js/jsbn.js'></script>
-<script src='/js/jsbn2.js'></script>
-<script src='/js/check_address.js'></script>
-<script src='/js/setup.js'></script>
+  {{#js}}js/setup{{/js}}
 {{/yield-scripts}}
 
-<form id="setup" action="/calculator" method="get">
+<form id="setup" action="/{{user}}" method="post">
   <h1>Settings</h1>
 
   <input type="hidden" id="username" name="username" value="{{user}}" />
diff --git a/views/users/new.html b/views/users/new.html
index e9874217..9d2a7aa3 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -1,41 +1,30 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-		<meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-    <title>Bitcoin Payment Calculator</title>
-    <link href="img/favicon.ico" rel="shortcut icon" />
-    {{#css}}calculator{{/css}}
-    {{#js}}register{{/js}}
-  </head>
-  <body>
-    <div class="container-fluid">
-      <form id="register" action="/users" method="post">
-        <h1>Register</h1>
-        {{#error}}
-        <div class="alert alert-danger">{{error}}</div>
-        {{/error}}
-        <div class="form-group">
-          <label for="username">Username:</label>
-          <input type="text" id="username" name="username" class="form-control" />
-        </div>
-  
-        <div class="form-group">
-          <label for="password">Password:</label>
-          <input type="password" id="password" name="password" class="form-control" />
-        </div>
+{{#yield-scripts}}
+  {{#js}}js/register{{/js}}
+{{/yield-scripts}}
 
-        <div class="form-group">
-          <label for="confirm">Confirm Password:</label>
-          <input type="password" id="confirm" name="confirm" 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>
-</html>
+<form id="register" action="/users" method="post">
+  <h1>Register</h1>
+  {{#error}}
+  <div class="alert alert-danger">{{error}}</div>
+  {{/error}}
+  <div class="form-group">
+    <label for="username">Username:</label>
+    <input type="text" id="username" name="username" class="form-control" />
+  </div>
+
+  <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="confirm">Confirm Password:</label>
+    <input type="password" id="confirm" name="confirm" 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>
diff --git a/views/calculator/show.html b/views/users/show.html
index f6949f71..608246e0 100644
--- a/views/calculator/show.html
+++ b/views/users/show.html
@@ -1,13 +1,5 @@
 {{#yield-scripts}}
-<script src='/js/jquery-1.8.2.min.js'></script>
-<script src='/js/moment.min.js'></script>
-<script src='/js/qrcode.js'></script>
-<script src='/js/bootstrap.min.js'></script>
-<script src='/js/2.5.3-crypto-sha256.js'></script>
-<script src='/js/jsbn.js'></script>
-<script src='/js/jsbn2.js'></script>
-<script src='/js/check_address.js'></script>
-<script src='/js/calculator.js'></script>
+  {{#js}}js/calculator{{/js}}
 {{/yield-scripts}}
 
 <div id="calculator" style="display: none">
@@ -50,6 +42,7 @@
     </div>
 
     <span id="received" class="btn btn-success">Payment Received.  Thank you!</span>
+    <audio id="chaching" src="/cash_register.wav" hidden="true" enablejavascript="true">
   </div>
 </form>