From cf26240fc44bbde3cccb7874bf8cc11e64e5a5c8 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 21 Jul 2011 20:42:03 +0000
Subject: [PATCH] NIHVIVO-2280: Changed div for sections, removed inline
 styles, fixed display isuses for IE6 and 7 on add/edit account pages

---
 webapp/web/css/account/account.css                   |  7 +++++++
 webapp/web/css/vitroIE6.css                          |  6 +++---
 webapp/web/css/vitroIE7.css                          |  7 +++++--
 .../freemarker/body/accounts/userAccounts-add.ftl    |  8 ++++----
 .../freemarker/body/accounts/userAccounts-edit.ftl   | 12 ++++++------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index 1a3f164ff..e883917d6 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -266,3 +266,10 @@ form.customForm input[name="confirmPassword"] {
 a.disable-delete {
     padding-left: 24px;
 }
+#passwordContainer p.note {
+    margin-top: -10px;
+    padding-bottom: 5px;
+}
+#passwordContainer {
+    margin-top: 20px;
+}
\ No newline at end of file
diff --git a/webapp/web/css/vitroIE6.css b/webapp/web/css/vitroIE6.css
index bb033a39f..d93251553 100644
--- a/webapp/web/css/vitroIE6.css
+++ b/webapp/web/css/vitroIE6.css
@@ -209,12 +209,12 @@ table#account th {
 p.requiredHint {
     clear: left;
 }
-add-account span.requiredHint {
+#add-account span.requiredHint {
     float: none;
 }
 input#externalAuthChkBox {
-    height: 18px;
-    width: 18px;
+    margin-top: 0;
+    margin-bottom: 0;
 }
 #associated {
     display: none; 
diff --git a/webapp/web/css/vitroIE7.css b/webapp/web/css/vitroIE7.css
index 191736b90..cfc4fcca4 100644
--- a/webapp/web/css/vitroIE7.css
+++ b/webapp/web/css/vitroIE7.css
@@ -148,12 +148,15 @@ table#account th {
     margin-top: 0;
     margin-left: 5px;
 }
+#add-account span.requiredHint {
+    float: none;
+}
 p.requiredHint {
     clear: left;
 }
 input#externalAuthChkBox {
-    height: 18px;
-    width: 18px;
+    margin-top: 0;
+    margin-bottom: 0;
 }
 #associated {
     display: none; 
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index c4db184a4..b3e1ffec5 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -79,14 +79,14 @@
                 It will include instructions for activating the account and creating a password.
             </p>
         <#else>
-            <div id="passwordContainer">
-
+            <section id="passwordContainer" role="region">
                 <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="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.</p>
+                <p class="note">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>
+            </section>
         </#if>
         
         <p><input type="submit" name="submitAdd" value="Add new account" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index dd227d803..2b1ada680 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -75,7 +75,7 @@
         </#if>
 
         <#if emailIsEnabled??>
-            <div id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> >
+            <section id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
                 <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
                 <label  class="inline" for="reset-password"> Reset password</label>
 
@@ -84,17 +84,17 @@
                     be emailed to the address entered above. The password will not 
                     be reset until the user follows the link provided in this email.
                 </p>
-            </div>
+            </section>
         <#else>
-            <div id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> >
-
+            <section id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
                 <label for="new-password">New password</label>
                 <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-                <p class="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.<br />
+                <p class="note">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>
+            </section>
         </#if>
 
         <p><input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p>