Code re-org

15 files changed, 37 insertions, 59 deletions

diff --git a/views/setup.html b/views/calculator/setup.html
index 72fbd944..8722a68a 100644
--- a/views/setup.html
+++ b/views/calculator/setup.html
@@ -10,19 +10,15 @@
   </head>
   <body>
     <div class="container-fluid">
-      <form action="users" method="post">
+      <form id="setup" action="/calculator" method="get">
         <h1>Calculator Setup</h1>
 
-        <label for="login">Username:</label>
-        <input type="text" id="login" name="login" value="{{user}}" />
+        <input type="hidden" id="username" name="username" value="{{user}}" />
 
-        <label for="password">Password:</label>
-        <input type="password" id="password" name="password" value="" />
+        <label for="title">Title:</label>
+        <input type="text" id="title" name="title" />
 
-        <label for="name">Title:</label>
-        <input type="text" id="name" name="name" />
-
-        <label for="logo">Image:</label>
+        <label for="logo">Logo:</label>
         <input type="text" id="logo" name="logo" />
 
         <label for="address">Bitcoin Address:</label>
diff --git a/views/calculator.html b/views/calculator/show.html
index aa882ee4..a3b632f2 100644
--- a/views/calculator.html
+++ b/views/calculator/show.html
@@ -13,7 +13,7 @@
       <div id="calculator" style="display: none">
         <input id="user" type="hidden" value="{{user}}" />
 
-        <h1 id="name"></h1>
+        <h1 id="title"></h1>
         <img id="logo" src="img/logo.jpg" alt="Logo" />
 
         <label for="exchange">Exchange Rate:</label>
diff --git a/views/error.html b/views/error.html
deleted file mode 100644
index 58edb1a5..00000000
--- a/views/error.html
+++ /dev/null
@@ -1 +0,0 @@
-Error: {{error}}
diff --git a/views/layout.html b/views/layout.html
index 0e84c667..ae4d5b69 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -15,8 +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> |
-              <a href="/login" class="navbar-link">Login</a>
+              Buy: <b id="ask"></b> | Sell: <b id="bid"></b>
             </p>
             <ul class="nav">
               <li><a href="/about">Info</a></li>
diff --git a/views/about.html b/views/main/about.html
index 6711c039..6711c039 100644
--- a/views/about.html
+++ b/views/main/about.html
diff --git a/views/contact.html b/views/main/contact.html
index 5914db11..5914db11 100644
--- a/views/contact.html
+++ b/views/main/contact.html
diff --git a/views/exchangers.html b/views/main/exchangers.html
index b3d86fa4..6d62697e 100644
--- a/views/exchangers.html
+++ b/views/main/exchangers.html
@@ -24,7 +24,7 @@
   <div class="row-fluid">
     <div class="span4">
       <h2>Adam</h2>
-      <img src="img/adam.jpg" />
+      <a href="https://localbitcoins.com/accounts/profile/asoltys/"><img src="img/adam.jpg" alt="Adam" /></a>
       <table>
         <tr>
           <td class="first"><b>Neighbourhood:</b></td>
@@ -37,7 +37,7 @@
     </div>
     <div class="span4">
       <h2>Jackson</h2>
-      <img src="img/jackson.jpg" />
+      <a href="https://localbitcoins.com/accounts/profile/stretchwynand/"><img src="img/jackson.jpg" alt="Jackson" /></a>
       <table>
         <tr>
           <td class="first"><b>Neighbourhood:</b></td>
@@ -50,7 +50,7 @@
     </div>
     <div class="span4">
       <h2>Yuri</h2>
-      <img src="img/yuri.jpg" />
+      <a href="https://localbitcoins.com/accounts/profile/beeteecee/"><img src="img/yuri.jpg" alt="Yuri" /></a>
       <table>
         <tr>
           <td class="first"><b>Neighbourhood:</b></td>
diff --git a/views/index.html b/views/main/index.html
index 72454ad0..72454ad0 100644
--- a/views/index.html
+++ b/views/main/index.html
diff --git a/views/join.html b/views/main/join.html
index f25c0dea..f25c0dea 100644
--- a/views/join.html
+++ b/views/main/join.html
diff --git a/views/merchants.html b/views/main/merchants.html
index 942e6eda..942e6eda 100644
--- a/views/merchants.html
+++ b/views/main/merchants.html
diff --git a/views/signup.html b/views/main/signup.html
index 3e9dfa7e..3e9dfa7e 100644
--- a/views/signup.html
+++ b/views/main/signup.html
diff --git a/views/login.html b/views/sessions/new.html
index 613762e9..613762e9 100644
--- a/views/login.html
+++ b/views/sessions/new.html
diff --git a/views/report.html b/views/transactions/index.html
index d768da57..d768da57 100644
--- a/views/report.html
+++ b/views/transactions/index.html
diff --git a/views/user.html b/views/user.html
deleted file mode 100644
index 72fbd944..00000000
--- a/views/user.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!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}}setup{{/js}}
-  </head>
-  <body>
-    <div class="container-fluid">
-      <form action="users" method="post">
-        <h1>Calculator Setup</h1>
-
-        <label for="login">Username:</label>
-        <input type="text" id="login" name="login" value="{{user}}" />
-
-        <label for="password">Password:</label>
-        <input type="password" id="password" name="password" value="" />
-
-        <label for="name">Title:</label>
-        <input type="text" id="name" name="name" />
-
-        <label for="logo">Image:</label>
-        <input type="text" id="logo" name="logo" />
-
-        <label for="address">Bitcoin Address:</label>
-        <input type="text" id="address" name="address" />
-
-        <label for="symbol">Market Symbol:</label>
-        <select id="symbol" name="symbol">
-        </select>
-        
-        <label for="commission">Commission (%):</label>
-        <input type="text" id="commission" name="commission" />
-
-        <br />
-        <input class="btn" type="submit" value="Go" />
-      </form>
-    </div>
-  </body>
-</html> 
diff --git a/views/users/new.html b/views/users/new.html
new file mode 100644
index 00000000..be50f47c
--- /dev/null
+++ b/views/users/new.html
@@ -0,0 +1,27 @@
+<!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}}setup{{/js}}
+  </head>
+  <body>
+    <div class="container-fluid">
+      <form action="/users" method="post">
+        <h1>New User Account</h1>
+
+        <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>
+    </div>
+  </body>
+</html>