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

---
 webapp/web/css/account/account.css            | 32 ++++++++-----------
 .../body/accounts/userAccounts-add.ftl        |  2 +-
 .../body/accounts/userAccounts-edit.ftl       |  2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index 4ae481c79..dab6b5384 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -171,14 +171,14 @@ padding-right: 5px;
     margin-top:-8px !important;
 }
 #associated {
-    float:right;
+    float:right; 
     display:none;
 }
 #associated label {
     margin-bottom:5px;
 }
 #associationOptions {
-    float:right;
+    float:right; 
     display:none;
 }
 #verifyProfileLink {
@@ -192,12 +192,12 @@ padding-right: 5px;
     margin-left:8px;
 }
 #associateProfileBackgroundOne {
-    background-color:#fff;
-    padding:5px 0 5px 0;
+    background-color:#fff; 
+    padding:7px 0 5px 0;
     margin-left:-8px;
     margin-right:-8px;
-    padding-top:7px;
-    width:100%;
+    width:500px;
+    z-index:10;
     border:none;
     border-right:none;
     border-bottom-left-radius: 5px;
@@ -209,11 +209,10 @@ padding-right: 5px;
 }
 #associateProfileBackgroundTwo {
     background-color:#f1f2ee;
-    padding-top:7px;
-    padding-bottom:42px;
-    padding-right:94px;
-    margin-top:-112px;
+    padding:7px 94px 42px 0;
+    margin-top:-112px; 
     margin-right:-8px;
+    z-index:-100;
     border:1px solid #ccc;
     border-left:none;
     border-top-right-radius: 5px;
@@ -225,13 +224,11 @@ padding-right: 5px;
 }
 #associateProfileBackgroundThree {
     background-color:#f1f2ee;
-    padding-left:12px;
-    padding-top:7px;
-    padding-bottom:26px;
-    padding-right:94px;
-    margin-top:-112px;
+    padding:7px 94px 26px 12px;
+    margin-top:-112px; 
     margin-left:-12px;
     margin-right:-8px;
+    z-index:-100;
     border:1px solid #ccc;
     border-left:none;
     border-bottom:none;
@@ -241,12 +238,11 @@ padding-right: 5px;
 }
 #associateProfileBackgroundFour {
     background-color:#f1f2ee;
-    padding-left:12px;
-    padding-bottom:26px;
-    padding-right:94px;
+    padding:0 94px 26px 12px;
     margin-top:-8px;
     margin-left:-12px;
     margin-right:-8px;
+    z-index:-100;
     border:1px solid #ccc;
     border-top:none;
     border-bottom-left-radius: 5px;
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index b61c1fd6b..c4db184a4 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -64,7 +64,7 @@
 
         <#include "userAccounts-associateProfilePanel.ftl">
 
-        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if>  /><span>Externally Authenticated Only</span></p>
+        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if>  />Externally Authenticated Only</p>
         <p>Roles<span class="requiredHint"> *</span></p>
         <#list roles as role>
             <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> />
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 90bc88832..dd227d803 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -64,7 +64,7 @@
 
         <#include "userAccounts-associateProfilePanel.ftl">
 
-        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly"  <#if externalAuthOnly?? >checked</#if>  /><span>Externally Authenticated Only</span></p>
+        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly"  <#if externalAuthOnly?? >checked</#if>  />Externally Authenticated Only</p>
         <#if roles?has_content>
             <p>Roles<span class="requiredHint"> *</span></p>
             <#list roles as role>