diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css index 40d6464ed..2ccebb59a 100644 --- a/webapp/web/css/account/account.css +++ b/webapp/web/css/account/account.css @@ -27,31 +27,22 @@ table#account th { background-color: #F7F9F9; height: 40px; color: #064D68; - padding-top: 5px; + padding-top: 7px; border: 1px solid #d9e4ea; border-bottom: none; padding-left: 6px; - font-size: .9em; -} -table#account th { - text-align: left; -} /*Fix for IE8 and 9, force text in a cell to be aligned to the left*/ -table#account tr { - background-color: #fff; -} -table#account tr:nth-child(2n) { - background-color: rgba(200, 200, 180,.25); } table#account td { vertical-align: top; padding: .5em; border: 1px solid #d9e4ea; - font-size: .825em; - padding-top: .5em; - padding-bottom: .5em; + font-size: .9em; +} +table#account tr { + background-color: #fff; } -table#account td a{ - word-wrap: break-word; +table#account tr:nth-child(2n+1) { + background-color: rgba(200, 200, 180,.25); } #filter-roles { float: left; @@ -170,18 +161,14 @@ padding-right: 5px; } #associated { float:right; - margin-top:-98px; - margin-right:80px; - display:none; + display:none; } #associated label { margin-bottom:5px; } #associationOptions { float:right; - margin-top:-98px; - margin-right:80px; - display:none; + display:none; } #verifyProfileLink { margin-left:10px; @@ -189,3 +176,68 @@ padding-right: 5px; #externalAuthIdInUse { color: #f70; } +#associateProfileBackgroundOne { + background-color:#fff; + padding:5px 0 5px 0; + margin-left:-8px; + margin-right:-8px; + padding-top:7px; + 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; +} +#associateProfileBackgroundTwo { + background-color:#f1f2ee; + padding-top:7px; + padding-bottom:42px; + padding-right:94px; + margin-top:-112px; + 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; +} +#associateProfileBackgroundThree { + background-color:#f1f2ee; + padding-left:12px; + padding-top:7px; + padding-bottom:26px; + padding-right:94px; + margin-top:-112px; + margin-left:-12px; + margin-right:-8px; + 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; +} +#associateProfileBackgroundFour { + background-color:#f1f2ee; + padding-left:12px; + padding-bottom:26px; + padding-right:94px; + margin-top:-8px; + margin-left:-12px; + margin-right:-8px; + 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; +} \ No newline at end of file diff --git a/webapp/web/js/account/accountAssociateProfile.js b/webapp/web/js/account/accountAssociateProfile.js index c90532a7d..6fe0d2657 100644 --- a/webapp/web/js/account/accountAssociateProfile.js +++ b/webapp/web/js/account/accountAssociateProfile.js @@ -51,6 +51,9 @@ var associateProfileFields = { // We want to associate a profile this.associationOptionsArea = $('#associationOptions'); this.associateProfileNameField = $('#associateProfileName'); + + // Container
elements to provide background shading -- tlw72 + this.associateProfileBackgroundOneArea = $('#associateProfileBackgroundOne'); }, // Initial page setup. Called only at page load. @@ -140,6 +143,8 @@ var associateProfileFields = { this.externalAuthIdInUseMessage.show(); this.associatedArea.hide(); this.associationOptionsArea.hide(); + this.associateProfileBackgroundOneArea.css("background-color","#fff"); + this.associateProfileBackgroundOneArea.css("border","none"); }, showExternalAuthIdMatchesProfile: function(profileUri, profileUrl, profileLabel) { @@ -148,6 +153,8 @@ var associateProfileFields = { this.externalAuthIdInUseMessage.hide(); this.associatedArea.show(); this.associationOptionsArea.hide(); + this.associateProfileBackgroundOneArea.css("background-color","#f1f2ee"); + this.associateProfileBackgroundOneArea.css("border","1px solid #ccc"); this.associatedProfileNameSpan.html(profileLabel); this.associatedProfileUriField.val(profileUri); @@ -160,8 +167,12 @@ var associateProfileFields = { if (this.associationEnabled && this.externalAuthIdField.val().length > 0) { this.associationOptionsArea.show(); + this.associateProfileBackgroundOneArea.css("background-color","#f1f2ee"); + this.associateProfileBackgroundOneArea.css("border","1px solid #ccc"); } else { this.associationOptionsArea.hide(); + this.associateProfileBackgroundOneArea.css("background-color","#fff"); + this.associateProfileBackgroundOneArea.css("border","none"); } }, diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl index 194437ccb..a9ffb3edd 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl @@ -74,7 +74,7 @@ <#if emailIsEnabled??>

Note: An email will be sent to the address entered above - notifying the user that an account has been created. + notifying that an account has been created. It will include instructions for activating the account and creating a password.

<#else> @@ -84,15 +84,16 @@ +   -

Minimum of ${minimumLength} characters in length.

+

Minimum of ${minimumLength} characters in length.

- +
or Cancel

* required fields

diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl index aa76ddfa0..c6682db0e 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl @@ -2,40 +2,50 @@ <#-- Template for setting the account reference field, which can also associate a profile with the user account --> -${stylesheets.add('', - '')} +${stylesheets.add('', + '')} - - - -

Can be used to associate the account with the user's profile via the matching property.

+
+
+ + + +

Can be used to associate the account with the user's profile via the matching property.

+
+
<#-- If there is an associated profile, show these -->
-

- - - (verify this match) - (change profile) -

- +
+

+ + + (verify this match) + (change profile) +

+ +
<#-- If we haven't selected one, show these instead -->
-

- - -

-

- or -

-

- - -

+
+

+ + +

+
+
+

- or -

+

+ + +

+