From b9aa9140744d37ea525822069ddc9b8949798e23 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 13 Jun 2011 19:58:58 +0000
Subject: [PATCH] NIHVIVO-2280:  Styled 'my account' page. If changes are
 successful in this page, the feedback message has to be treated as a feedback
 not as error alert. Need to ask Jim to handle this in a different way.

---
 .../body/accounts/userAccounts-myAccount.ftl  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index e00f13c41..943288f0b 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for editing a user account -->
 
-<h3>Edit account</h3>
+<h3>My account</h3>
 
     <#if errorEmailIsEmpty??>
         <#assign errorMessage = "You must supply an email address." />
@@ -43,7 +43,6 @@
         </section>
     </#if>
 
-
     <#if confirmChange??>
         <#assign confirmMessage = "Your changes have been saved." />
     </#if>
@@ -65,28 +64,27 @@
 
         <form method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
             <label for="email-address">Email address<span class="requiredHint"> *</span></label>
-            <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
+            <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
-			<p>Note: if email changes, a confirmation email will be sent to the new email address entered above.</p>
-			
+            <p class="note">Note: if email changes, a confirmation email will be sent to the new email address entered above.</p>
+            
             <label for="first-name">First name<span class="requiredHint"> *</span></label> 
-            <input type="text" name="firstName" value="${firstName}" id="first-name" role="input "/>
+            <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
 
             <label for="last-name">Last name<span class="requiredHint"> *</span></label> 
-            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input "/>
+            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
             <#if !externalAuth??>
                 <label for="new-password">New password<span class="requiredHint"> *</span></label>
-                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input "/>
+                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
 
-                <p>Minimum of ${minimumLength} characters in length.</p>
-                <p>Leaving this blank means that the password will not be changed.</p>
+                <p class="note">Minimum of ${minimumLength} characters in length. Leaving this blank means that the password will not be changed.</p>
 
                 <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
-                <input type="text" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input "/>
+                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </#if>
 
-            <input type="submit" name="submitMyAccount" value="Save changes" class="submit"/>
+            <p><input type="submit" name="submitMyAccount" value="Save changes" class="submit" /></p>
 
             <p class="requiredHint">* required fields</p>
         </form>