From f275ba4444922591d1f9397aed664e71f37a27c6 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 15 Jul 2010 16:37:56 +0000
Subject: [PATCH] moved placement and style of cancel link for consistency
 NIHVIVO-768

---
 .../freemarker/body/login/login-forcedPasswordChange.ftl  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
index 75758301d..d8aa5de77 100644
--- a/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
+++ b/webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
@@ -2,8 +2,8 @@
 
 <#-- Log in template for accessing site admin -->
 
-
 ${stylesheets.addFromTheme("/login.css")}
+${stylesheets.addFromTheme("/formedit.css")}
 
 <div id="formLogin" class="pageBodyGroup">
        <h2>Create Your New Password</h2>
@@ -20,8 +20,6 @@ ${stylesheets.addFromTheme("/login.css")}
               <p class="passwordNote">Minimum of 6 characters in length.</p>
               <label for="confirmPassword">Confirm Password</label>
               <input id="confirmPassword" type="password" name="confirmPassword"  />
-              <input name="passwordChangeForm" type="submit" class="submit" value="Save Changes"/>
+              <input name="passwordChangeForm" type="submit" class="submit" value="Save Changes"/> or <a class="cancel" href="${cancelUrl}">Cancel</a>
        </form>
-       <a href="${cancelUrl}">Cancel</a>
-</div>
-
+</div>
\ No newline at end of file