From 37e1d33d8d64bdbb9251d17a55417af589645651 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Tue, 1 Oct 2019 14:28:05 -0400 Subject: [PATCH 1/3] Refactored contact link and bundle text on login pg, added title, rel attributes to links [ref #6170] --- src/main/java/propertyFiles/Bundle.properties | 13 +++++------ src/main/webapp/loginpage.xhtml | 22 ++++++++++++------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 092757937f0..651af40986d 100755 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -282,9 +282,8 @@ login.System=Login System login.forgot.text=Forgot your password? login.builtin=Dataverse Account login.institution=Institutional Account -login.institution.blurb=Log in or sign up with your institutional account — learn more. -login.institution.support.beforeLink=Leaving your institution? Please contact -login.institution.support.afterLink=for assistance. +login.institution.blurb=Log in or sign up with your institutional account — more information about account creation. +login.institution.support.blurbwithLink=Leaving your institution? Please contact {0} for assistance. login.builtin.credential.usernameOrEmail=Username/Email login.builtin.credential.password=Password login.builtin.invalidUsernameEmailOrPassword=The username, email address, or password you entered is invalid. Need assistance accessing your account? @@ -299,20 +298,20 @@ login.button=Log In with {0} login.button.orcid=Create or Connect your ORCID # authentication providers auth.providers.title=Other options -auth.providers.tip=You can convert a Dataverse account to use one of the options above. Learn more. +auth.providers.tip=You can convert a Dataverse account to use one of the options above. More information about account creation. auth.providers.title.builtin=Username/Email auth.providers.title.shib=Your Institution auth.providers.title.orcid=ORCID auth.providers.title.google=Google auth.providers.title.github=GitHub -auth.providers.blurb=Log in or sign up with your {0} account — learn more. Having trouble? Please contact {3} for assistance. +auth.providers.blurb=Log in or sign up with your {0} account — more information about account creation. Having trouble? Please contact {3} for assistance. auth.providers.persistentUserIdName.orcid=ORCID iD auth.providers.persistentUserIdName.github=ID auth.providers.persistentUserIdTooltip.orcid=ORCID provides a persistent digital identifier that distinguishes you from other researchers. auth.providers.persistentUserIdTooltip.github=GitHub assigns a unique number to every user. auth.providers.orcid.insufficientScope=Dataverse was not granted the permission to read user data from ORCID. -auth.providers.orcid.helpmessage1=ORCID is an open, non-profit, community-based effort to provide a registry of unique researcher identifiers and a transparent method of linking research activities and outputs to these identifiers. ORCID is unique in its ability to reach across disciplines, research sectors, and national boundaries and its cooperation with other identifier systems. Find out more at orcid.org/about. -auth.providers.orcid.helpmessage2=This repository uses your ORCID for authentication (so you don't need another username/password combination). Having your ORCID associated with your datasets also makes it easier for people to find the datasets you have published. +auth.providers.orcid.helpmessage1=ORCID is an open, non-profit, community-based effort to provide a registry of unique researcher identifiers and a transparent method of linking research activities and outputs to these identifiers. ORCID is unique in its ability to reach across disciplines, research sectors, and national boundaries and its cooperation with other identifier systems. Find out more at orcid.org/about. +auth.providers.orcid.helpmessage2=This repository uses your ORCID for authentication (so you don't need another username/password combination). Having your ORCID associated with your datasets also makes it easier for people to find the datasets you have published. # Friendly AuthenticationProvider names authenticationProvider.name.builtin=Dataverse diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml index ae1d6e1202b..f5600793cce 100644 --- a/src/main/webapp/loginpage.xhtml +++ b/src/main/webapp/loginpage.xhtml @@ -111,14 +111,16 @@ - - - - - - - - + + + + + + + + + +

@@ -198,6 +200,10 @@

+ + From 46e018820efa9d5d4122c1623d5ecaff3f575800 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Wed, 2 Oct 2019 14:14:22 -0400 Subject: [PATCH 2/3] Added sign up link to login pg [ref #6170] --- src/main/java/propertyFiles/Bundle.properties | 1 + src/main/webapp/loginpage.xhtml | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 651af40986d..8ea467daed6 100755 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -287,6 +287,7 @@ login.institution.support.blurbwithLink=Leaving your institution? Please contact login.builtin.credential.usernameOrEmail=Username/Email login.builtin.credential.password=Password login.builtin.invalidUsernameEmailOrPassword=The username, email address, or password you entered is invalid. Need assistance accessing your account? +login.signup.blurb=Sign up for a Dataverse account. login.echo.credential.name=Name login.echo.credential.email=Email login.echo.credential.affiliation=Affiliation diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml index f5600793cce..41e24f005e7 100644 --- a/src/main/webapp/loginpage.xhtml +++ b/src/main/webapp/loginpage.xhtml @@ -167,8 +167,8 @@
- - + +

@@ -201,9 +201,13 @@

- + From 6d71f3269639e8889b5f9fb72d40f28bd27fbab6 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Wed, 2 Oct 2019 15:57:30 -0400 Subject: [PATCH 3/3] Added missing escape=false to new sign up link on login pg [ref #6170] --- src/main/webapp/loginpage.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml index 86e8a949913..040e1cd7505 100644 --- a/src/main/webapp/loginpage.xhtml +++ b/src/main/webapp/loginpage.xhtml @@ -204,7 +204,7 @@