diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css index de984ed38..d46773de9 100644 --- a/webapp/web/css/account/account.css +++ b/webapp/web/css/account/account.css @@ -149,4 +149,34 @@ padding-right: 5px; /* RESET PASSWORD ------> */ #reset-password p.note { margin-top: 0; -} \ No newline at end of file +} +/* ASSOCIATE PROFILE ------> */ +.explanatoryText { + color:#999; + font-size:.8em; + font-style:bold; + width:280px; + margin-left:10px; + line-height:15px; +} +#associated { + float:right; + margin-top:-98px; + margin-right:80px; + display:none; +} +#associated label { + margin-bottom:5px; +} +#associationOptions { + float:right; + margin-top:-98px; + margin-right:80px; + display:none; +} +#verifyProfileLink { + margin-left:10px; +} +#externalAuthIdInUse { + color: #f70; +} diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl index e02d41756..aa76ddfa0 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl @@ -2,51 +2,41 @@ <#-- Template for setting the account reference field, which can also associate a profile with the user account --> - - - - - -
- - -

- External Auth. ID or other unique ID. Can associate the account to the user's profile. -

-

- That Account Reference is already in use. -

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

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

- -
+${stylesheets.add('', + '')} + + + + +

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) +

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

- - -

-

- or -

-

- - -

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

+ + +

+

- or -

+

+ + +

+