From 1415323fde9f450f83656b6fa5e4eee5b3866b6a Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 13 Jun 2011 18:12:18 +0000
Subject: [PATCH] NIHVIVO-2280:  Styled 'create new password' page for new user
 accounts.

---
 webapp/web/css/edit.css                       |  1 +
 .../accounts/userAccounts-createPassword.ftl  | 29 +++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css
index ad2099f6f..7ae7dd1d4 100644
--- a/webapp/web/css/edit.css
+++ b/webapp/web/css/edit.css
@@ -359,4 +359,5 @@ div.sparqlform .parenthetical {
 .note {
     font-size: .8em;
     line-height: 1.3em;
+    color: #7f8993;
 }
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
index 2b75cff0c..9c1f93f5c 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
@@ -3,7 +3,6 @@
 <#-- Template for adding a user account -->
 
 <h3>Create your Password</h3>
-
     <#if errorPasswordIsEmpty??>
         <#assign errorMessage = "No password supplied." />
     </#if>
@@ -24,26 +23,24 @@
     </#if>
 
 <section id="create-password" role="region">
-    <fieldset>
-        <legend>Please enter your new password for ${userAccount.emailAddress}</legend>
+    <p>Please enter your new password for ${userAccount.emailAddress}</p>
 
-        <form method="POST" action="${formUrls.createPassword}" class="customForm" role="create password">
-            <input type="hidden" name="user" value="${userAccount.emailAddress}" />
-            <input type="hidden" name="key"  value="${userAccount.passwordLinkExpiresHash}" />
+    <form method="POST" action="${formUrls.createPassword}" class="customForm" role="create password">
+        <input type="hidden" name="user" value="${userAccount.emailAddress}" role="input" />
+        <input type="hidden" name="key"  value="${userAccount.passwordLinkExpiresHash}" role="input" />
+    
+        <label for="new-password">Password<span class="requiredHint"> *</span></label>
+        <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
         
-            <label for="new-password">Password<span class="requiredHint"> *</span></label>
-            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input "/>
-            
-            <p>Minimum of ${minimumLength} characters in length.</p>
+        <p class="note">Minimum of ${minimumLength} characters in length.</p>
 
-            <label for="confirm-password">Confirm Password<span class="requiredHint"> *</span></label>
-            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input "/>
+        <label for="confirm-password">Confirm Password<span class="requiredHint"> *</span></label>
+        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
 
-            <input type="submit" name="submit" value="Save changes" class="submit"/>
+        <p><input type="submit" name="submit" value="Save changes" class="submit"/></p>
 
-            <p class="requiredHint">* required fields</p>
-        </form>
-    </fieldset>
+        <p class="requiredHint">* required fields</p>
+    </form>
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file