From e547723b23ccc58c832cac966b1b666a426afefb Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Sat, 6 Sep 2014 19:40:55 -0700
Subject: Generate key on registration

---
 views/users/edit.html |  8 ++++----
 views/users/new.html  | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'views')

diff --git a/views/users/edit.html b/views/users/edit.html
index a4ba131d..9307e52c 100644
--- a/views/users/edit.html
+++ b/views/users/edit.html
@@ -18,11 +18,11 @@
   </div>
 
   <div class="form-group">
-    <label for="bip32">Extended key:</label>
+    <label for="pubkey">Public Key:</label>
     <div class="input-group">
-      <input type="text" id="bip32" name="bip32" class="form-control" placeholder="xpub..." />
+      <input type="text" id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." />
       <span class="input-group-btn">
-        <button id="generate" type="button" class="btn">Generate</button>
+        <button id="generate" type="button" class="btn">New</button>
       </span>
     </div>
   </div>
@@ -40,7 +40,7 @@
   </div>
 
   <div class="form-group">
-    <label for="commission">Commission / Discount:</label>
+    <label for="commission">Commission (+) / Discount (-) %:</label>
     <input type="text" id="commission" name="commission" class="form-control" />
   </div>
 
diff --git a/views/users/new.html b/views/users/new.html
index bf8b3b7d..ab3a9edd 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -20,14 +20,21 @@
   </div>
 
   <div class="form-group">
-    <label for="password">Password:</label>
+    <label for="password">Passphrase:</label>
     <input type="password" id="password" name="password" class="form-control" />
+    <div id="messages"></div>
   </div>
 
   <div class="form-group">
-    <label for="confirm">Confirm Password:</label>
+    <label for="confirm">Confirm Passphrase:</label>
     <input type="password" id="confirm" name="confirm" class="form-control" />
   </div>
 
+  <input id="pubkey" name="pubkey" type="hidden" />
+  <input id="privkey" name="privkey" type="hidden" />
+
   <input class="btn btn-primary" type="submit" value="Register" />
 </form>
+
+<div id="qr"></div>
+
-- 
cgit v1.2.3