From c1d5f4aac3200977b78ca2ab6a3c3911f514af75 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 20 Jul 2011 19:19:58 +0000
Subject: [PATCH] merging branch updates for NIHVIVO-2992 and NIHVIVO-2995

---
 .../templates/freemarker/body/accounts/userAccounts-add.ftl   | 2 +-
 .../templates/freemarker/body/accounts/userAccounts-edit.ftl  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 530971870..b61c1fd6b 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -83,7 +83,7 @@
 
                 <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
                 <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
-                <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
+                <p class="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.</p>
                 <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
                 <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </div>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index e913f82bd..90bc88832 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -90,8 +90,8 @@
 
                 <label for="new-password">New password</label>
                 <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-                <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
-                <p class="explanatoryText">Leaving this blank means that the password will not be changed.</p>
+                <p class="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.<br />
+                Leaving this blank means that the password will not be changed.</p>
                 <label for="confirm-password">Confirm new password</label> 
                 <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </div>