From cd55bb01756ba97fe808c5818e29b0a516737afb Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Wed, 3 Sep 2014 14:34:22 -0700
Subject: Separate account profile settings

---
 views/layout.html             |  6 ++----
 views/transactions/index.html |  2 +-
 views/users/edit.html         | 13 +------------
 views/users/profile.html      |  6 +-----
 views/users/show.html         |  8 +-------
 5 files changed, 6 insertions(+), 29 deletions(-)

(limited to 'views')

diff --git a/views/layout.html b/views/layout.html
index 0601ce1f..5be45ded 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -19,12 +19,10 @@
         <div id="nav" class="collapse navbar-collapse">
           <div class="navbar">
             <ul class="nav navbar-nav">
-              <!--
-              <li><a href="{{user}}/edit"><span class="glyphicon glyphicon-user"></span> Profile</a></li>
--->
               <li><a href="/{{user}}"><span class="glyphicon glyphicon-home"></span> Home</a></li>
-              <li><a href="/{{user}}/edit"><span class="glyphicon glyphicon-cog"></span> Settings</a></li>
               <li><a href="/{{user}}/report"><span class="glyphicon glyphicon-list-alt"></span> Transactions</a></li>
+              <li><a href="/{{user}}/profile"><span class="glyphicon glyphicon-user"></span> Account Profile</a></li>
+              <li><a href="/{{user}}/edit"><span class="glyphicon glyphicon-cog"></span> Settings</a></li>
               <li><a href="/logout"><span class="glyphicon glyphicon-off"></span> Logout</a></li>
               <!--
               <li><a href="/help"><span class="glyphicon glyphicon-info-sign"></span> Help</a></li>
diff --git a/views/transactions/index.html b/views/transactions/index.html
index dcb76580..d48d28f1 100644
--- a/views/transactions/index.html
+++ b/views/transactions/index.html
@@ -2,7 +2,7 @@
   {{#js}}js/report{{/js}}
 {{/yield-scripts}}
 
-<h1>Transactions</h1>
+<h1>Payments Received</h1>
 
 <div style="margin-bottom: 15px">
   <input id="user" type="hidden" value="{{user}}" />
diff --git a/views/users/edit.html b/views/users/edit.html
index dda4fef4..a4ba131d 100644
--- a/views/users/edit.html
+++ b/views/users/edit.html
@@ -40,7 +40,7 @@
   </div>
 
   <div class="form-group">
-    <label for="commission">Commission/Discount <small>(optional %)</small>:</label>
+    <label for="commission">Commission / Discount:</label>
     <input type="text" id="commission" name="commission" class="form-control" />
   </div>
 
@@ -50,17 +50,6 @@
     </select>
   </div>
  
-  <div class="form-group">
-    <label for="password">New Password <small>(blank = no change)</small>:</label>
-    <input type="password" id="password" name="password" class="form-control" />
-  </div>
-
-  <div class="form-group">
-    <label for="confirm">Confirm New Password:</label>
-    <input type="password" id="confirm" name="confirm" class="form-control" />
-  </div>
-
-  <br />
   <input class="btn btn-primary" type="submit" value="Done" />
 </form>
 
diff --git a/views/users/profile.html b/views/users/profile.html
index 048b11fb..6d05d61d 100644
--- a/views/users/profile.html
+++ b/views/users/profile.html
@@ -3,7 +3,7 @@
 {{/yield-scripts}}
 
 <form id="profile" action="/{{user}}" method="post" style="display: none">
-  <h1>Profile</h1>
+  <h1>Account Profile</h1>
 
   <div class="form-group">
     <label for="username">Username:</label>
@@ -29,7 +29,3 @@
   <input class="btn btn-primary" type="submit" value="Done" />
 </form>
 
-<div class="jumbotron">
-  <h3>Wallet Balance</h3>
-  <h1>0.01982001</h1>
-</div>
diff --git a/views/users/show.html b/views/users/show.html
index 2db57008..fd5afd49 100644
--- a/views/users/show.html
+++ b/views/users/show.html
@@ -16,16 +16,10 @@ Your email has been verified. Thank you!
   <a href="/{{user}}/edit"><img id="logo" src="/assets/img/bitcoin.png" alt="Logo" /></a>
 
   <form role="form">
-    <div class="form-group">
-      <label for="exchange">Rate:</label>
-      <input type="text" id="exchange" value="0" disabled class="form-control" />
-      <span id="symbol"></span>
-    </div>
-
     <div class="form-group">
       <label for="amount">Amount:</label>
       <input type="text" id="amount" class="form-control" />
-      <span id="currency"></span>
+      <span id="currency"></span> / <span id="exchange"></span> <span>BTC</span>
     </div>
 
     <div class="form-group">
-- 
cgit v1.2.3