From 4b92cd11953e29c3dd66ae51e60e779147f1cd53 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 18 Jul 2011 17:02:47 +0000
Subject: [PATCH]  NIHVIVO-2889: Applied different form element width for user
 account management forms. Fixed extra padding  with submit buttons.

---
 webapp/web/css/account/account.css            | 62 ++++++++++---------
 .../body/accounts/userAccounts-add.ftl        |  3 +-
 .../body/accounts/userAccounts-edit.ftl       |  4 +-
 .../userAccounts-firstTimeExternal.ftl        |  2 +-
 4 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index 28866003d..e7bea88b8 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -128,14 +128,6 @@ form.customForm p.note {
 }
 #add-account p.note {
     margin-top: 20px;
-    width: 400px;
-}
-#add-account input[type="text"],
-#create-account input[type="text"],
-#edit-account input[type="text"],
-#my-account input[type="text"],
-#my-account input[type="password"] {
-    width: 20em;
 }
 #search-feedback {
     clear: both;
@@ -151,12 +143,10 @@ form.customForm p.note {
 /* EDIT ACCOUNT ------>  */
 #edit-account p.note {
      margin-top: 3px;
-     width: 400px;
 }
 /* MY ACCOUNT ------>  */
 #my-account p.note {
      padding-bottom: 10px;
-     width: 400px;
 }
 #my-account input#email-address,
 #my-account input#new-password {
@@ -169,6 +159,7 @@ padding-right: 5px;
 #reset-password p.note {
      margin-top: 0;
 }
+
 /* ASSOCIATE PROFILE ------>  */
 .explanatoryText {
     color:#999;
@@ -204,12 +195,12 @@ padding-right: 5px;
     width:100%;
     border:none;
     border-right:none;
-	border-bottom-left-radius: 5px;
-	border-top-left-radius: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	-moz-border-radius-topleft: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-webkit-border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    -moz-border-radius-topleft: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+    -webkit-border-top-left-radius: 5px;
 }
 #associateProfileBackgroundTwo {
     background-color:#f1f2ee;
@@ -220,12 +211,12 @@ padding-right: 5px;
     margin-right:-8px;
     border:1px solid #ccc;
     border-left:none;
-	border-top-right-radius: 5px;
-	-moz-border-radius-topright: 5px;
-	-webkit-border-top-right-radius: 5px;
-	border-bottom-right-radius: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-webkit-border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    -moz-border-radius-topright: 5px;
+    -webkit-border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    -moz-border-radius-bottomright: 5px;
+    -webkit-border-bottom-right-radius: 5px;
 }
 #associateProfileBackgroundThree {
     background-color:#f1f2ee;
@@ -239,9 +230,9 @@ padding-right: 5px;
     border:1px solid #ccc;
     border-left:none;
     border-bottom:none;
-	border-top-right-radius: 5px;
-	-moz-border-radius-topright: 5px;
-	-webkit-border-top-right-radius: 5px;
+    border-top-right-radius: 5px;
+    -moz-border-radius-topright: 5px;
+    -webkit-border-top-right-radius: 5px;
 }
 #associateProfileBackgroundFour {
     background-color:#f1f2ee;
@@ -254,9 +245,20 @@ padding-right: 5px;
     border:1px solid #ccc;
     border-top:none;
     border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-webkit-border-bottom-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    -moz-border-radius-bottomright: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+    -webkit-border-bottom-right-radius: 5px;
 }
+
+/* MISCELLANEOUS ------>  */
+form.customForm input[name="firstName"],
+form.customForm input[name="lastName"],
+form.customForm input[name="newPassword"],
+form.customForm input[name="confirmPassword"] {
+    width: 10em;
+}
+#externalAuthId {
+    width: 12em;
+}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 394384824..530971870 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -89,8 +89,7 @@
             </div>
         </#if>
         
-        <br />
-        <input type="submit" name="submitAdd" value="Add new account" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a>
+        <p><input type="submit" name="submitAdd" value="Add new account" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p>
 
         <p class="requiredHint">* required fields</p>
     </form>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 0615d105e..e913f82bd 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -96,8 +96,8 @@
                 <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </div>
         </#if>
-        <br />
-        <input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a>
+
+        <p><input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p>
 
         <p class="requiredHint">* required fields</p>
     </form>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
index 0a5346c28..f8885fa3c 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
@@ -54,7 +54,7 @@
             </p>
         </#if>
 
-        <input type="submit" name="submit" value="Create account" class="submit"/> or <a class="cancel" href="${urls.home}">Cancel</a>
+        <p><input type="submit" name="submit" value="Create account" class="submit"/> or <a class="cancel" href="${urls.home}">Cancel</a></p>
     </form>
 </section>