Skip to content

Commit

Permalink
More cleanup of the UI/help text for the login pg. [ref #3338]
Browse files Browse the repository at this point in the history
  • Loading branch information
@mheppler
mheppler committed Nov 22, 2016
1 parent 39dab5a commit fb4f5e4
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 51 deletions.
95 changes: 49 additions & 46 deletions src/main/java/Bundle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ user.updatePassword.welcome=Welcome to Dataverse {0}, {1}
user.updatePassword.warning=With the release of our new Dataverse 4.0 upgrade, the password requirements and General Terms of Use have updated. As this is the first time you are using Dataverse since the update, you need to create a new password and agree to the new General Terms of Use.
user.updatePassword.password=Create a password that is minimum six characters long and uses at least one letter or number.
authenticationProvidersAvailable.tip={0}There are no active authentication providers{1}If you are a system administrator, please enable one using the API.{2}If you are not a system administrator, please contact the one for your institution.

#loginpage.xhtml

login.System=Login System
login.forgot.text=Forgot your password?
login.builtin=Dataverse Account
Expand All @@ -211,6 +214,17 @@ login.error=Error validating the username, email address, or password. Please tr
user.error.cannotChangePassword=Sorry, your password cannot be changed. Please contact your system administrator.
user.error.wrongPassword=Sorry, wrong password.
login.button=Log In with {0}
# authentication providers
auth.providers.title=Other Log In Options
auth.providers.title.builtin=Dataverse
auth.providers.title.shib=Your Institution
auth.providers.title.orcid=ORCID
auth.providers.title.orcid-sandbox=ORCID Sandbox
auth.providers.title.google=Google
auth.providers.title.github=GitHub
auth.providers.blurb=Log in with your {0} credentials. Having trouble? Please contact {1} for assistance.
auth.providers.brandForIdentifier.orcid=ORCID iD
auth.providers.brandForIdentifier.orcid-sandbox=Sandbox ORCID iD

#confirmemail.xhtml
confirmEmail.pageTitle=Email Verification
Expand All @@ -236,6 +250,41 @@ shib.accountInformation=Account Information
shib.offerToCreateNewAccount=This information is provided by your institution and will be used to create your Dataverse account.
shib.passwordRejected=<strong>Validation Error</strong> - Your account can only be converted if you provide the correct password for your existing account.

# oauth2/newAcccount.xhtml
oauth2.btn.convertAccount=Convert Existing Account
oauth2.btn.createAccount=Create New Account
oauth2.askToConvert=Would you like to convert your Dataverse account to always use your institutional log in?
oauth2.welcomeExistingUserMessage=Your institutional log in for {0} matches an email address already being used for a Dataverse account. By entering your current Dataverse password below, your existing Dataverse account can be converted to use your institutional log in. After converting, you will only need to use your institutional log in.
oauth2.welcomeExistingUserMessageDefaultInstitution=your institution
oauth2.dataverseUsername=Dataverse Username
oauth2.currentDataversePassword=Current Dataverse Password
oauth2.chooseUsername=Username:
oauth2.passwordRejected=<strong>Validation Error</strong> - Wrong username or password.
oauth2.newAccount.title=Account Creation
oauth2.newAccount.pageTitle=Welcome to Dataverse, {0}
oauth2.newAccount.email=Select Email
oauth2.newAccount.email.tip=Dataverse uses this email to notify you of issues regarding your data.
oauth2.newAccount.suggestedEmails=Suggested Email Addresses:
oauth2.newAccount.username=Username
oauth2.newAccount.username.tip=This username will be your unique identifier as a Dataverse user.
oauth2.newAccount.explanation=This information is provided by {0} and will be used to create your {1} account.
oauth2.newAccount.suggestConvertInsteadOfCreate=If you already have a {0} account, you will need to <a href="/oauth2/convert.xhtml">convert your account.</a>
oauth2.newAccount.tabs.convertAccount=Convert Existing Account
oauth2.newAccount.tabs.newAccount=Account Information
oauth2.newAccount.buttons.createNewAccount=Create New Account
oauth2.newAccount.buttons.convertNewAccount=Convert Account
oauth2.newAccount.emailTaken=Email already taken. Consider merging the corresponding account instead.
oauth2.newAccount.emailOk=Email OK.
oauth2.newAccount.emailInvalid=Invalid email address.
oauth2.newAccount.usernameTaken=Username already taken.
oauth2.newAccount.usernameOk=Username OK.
oauth2.convertAccount.title=Account Conversion
oauth2.convertAccount.explanation=Please enter your {0} account username and password to convert your account to use {1} for authentication.
oauth2.convertAccount.username=Existing username
oauth2.convertAccount.password=Password
oauth2.convertAccount.authenticationFailed=Authentication failed - bad username or password.
oauth2.convertAccount.buttonTitle=Convert Account

# tab on dataverseuser.xhtml
apitoken.title=API Token
apitoken.message=Your API Token is displayed below after it has been created. Check out our {0}API Guide{1} for more information on using your API Token with the Dataverse APIs.
Expand Down Expand Up @@ -1432,49 +1481,3 @@ citationFrame.banner.message.here=here
citationFrame.banner.closeIcon=Close this message, go to dataset
citationFrame.banner.countdownMessage= This message will close in
citationFrame.banner.countdownMessage.seconds=seconds

# oauth2/newAcccount.xhtml
oauth2.btn.convertAccount=Convert Existing Account
oauth2.btn.createAccount=Create New Account
oauth2.askToConvert=Would you like to convert your Dataverse account to always use your institutional log in?
oauth2.welcomeExistingUserMessage=Your institutional log in for {0} matches an email address already being used for a Dataverse account. By entering your current Dataverse password below, your existing Dataverse account can be converted to use your institutional log in. After converting, you will only need to use your institutional log in.
oauth2.welcomeExistingUserMessageDefaultInstitution=your institution
oauth2.dataverseUsername=Dataverse Username
oauth2.currentDataversePassword=Current Dataverse Password
oauth2.chooseUsername=Username:
oauth2.passwordRejected=<strong>Validation Error</strong> - Wrong username or password.
oauth2.newAccount.title=Account Creation
oauth2.newAccount.pageTitle=Welcome to Dataverse, {0}
oauth2.newAccount.email=Select Email
oauth2.newAccount.email.tip=Dataverse uses this email to notify you of issues regarding your data.
oauth2.newAccount.suggestedEmails=Suggested Email Addresses:
oauth2.newAccount.username=Username
oauth2.newAccount.username.tip=This username will be your unique identifier as a Dataverse user.
oauth2.newAccount.explanation=This information is provided by {0} and will be used to create your {1} account.
oauth2.newAccount.suggestConvertInsteadOfCreate=If you already have a {0} account, you will need to <a href="/oauth2/convert.xhtml">convert your account.</a>
oauth2.newAccount.tabs.convertAccount=Convert Existing Account
oauth2.newAccount.tabs.newAccount=Account Information
oauth2.newAccount.buttons.createNewAccount=Create New Account
oauth2.newAccount.buttons.convertNewAccount=Convert Account
oauth2.newAccount.emailTaken=Email already taken. Consider merging the corresponding account instead.
oauth2.newAccount.emailOk=Email OK.
oauth2.newAccount.emailInvalid=Invalid email address.
oauth2.newAccount.usernameTaken=Username already taken.
oauth2.newAccount.usernameOk=Username OK.
oauth2.convertAccount.title=Account Conversion
oauth2.convertAccount.explanation=Please enter your {0} account username and password to convert your account to use {1} for authentication.
oauth2.convertAccount.username=Existing username
oauth2.convertAccount.password=Password
oauth2.convertAccount.authenticationFailed=Authentication failed - bad username or password.
oauth2.convertAccount.buttonTitle=Convert Account

# authentication providers
auth.providers.title.builtin=Dataverse
auth.providers.title.shib=Your Institution
auth.providers.title.orcid=ORCID
auth.providers.title.orcid-sandbox=ORCID Sandbox
auth.providers.title.google=Google
auth.providers.title.github=GitHub
auth.providers.blurb=Log in with your {0} credentials. Having trouble? Please contact {1} for assistance.
auth.providers.brandForIdentifier.orcid=ORCID iD
auth.providers.brandForIdentifier.orcid-sandbox=Sandbox ORCID iD
10 changes: 5 additions & 5 deletions src/main/webapp/loginpage.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<div class="col-md-12">
<div class="col-md-6 col-md-offset-3">
<h2><span class="glyphicon glyphicon-log-in" /> Log In</h2>
<h2><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h2>

<div id="builtinProvider" jsf:rendered="#{LoginPage.provider == 'builtin'}">
<h:form id="loginForm" styleClass="form-horizontal">
Expand Down Expand Up @@ -76,8 +76,8 @@
</ui:repeat>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-9 button-block">
<p:commandButton id="login" value="#{bundle.login}" update="@all" action="#{LoginPage.login}"/>
<p:button value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{dataverseServiceBean.findRootDataverse().alias}"/>
<p:commandButton id="login" styleClass="btn btn-default" value="#{bundle.login}" update="@all" action="#{LoginPage.login}"/>
<!-- <p:button styleClass="btn btn-default" value="# {bundle.cancel}" outcome="/dataverse.xhtml?alias=# {dataverseServiceBean.findRootDataverse().alias}"/> -->
</div>
</div>
<div class="form-group">
Expand Down Expand Up @@ -188,7 +188,7 @@
<ui:fragment rendered="#{LoginPage.authProvider.id == 'orcid' or LoginPage.authProvider.id == 'orcid-sandbox'}">
<p class="help-block small" style="margin-top:1em;">
ORCID is an independent non-profit effort to provide an open registry of unique researcher identifiers and
open services to link research activities and organizations to these identifiers. Learn more at <a href="#" target="_blank">orcid.org</a>.
open services to link research activities and organizations to these identifiers. Learn more at <a href="http://orcid.org/" target="_blank">orcid.org</a>.
</p>
</ui:fragment>
</div>
Expand All @@ -197,7 +197,7 @@
</div>

<div id="otherProviders" jsf:rendered="#{LoginPage.authenticationProvidersAvailable}">
<h4>Other Log In Options</h4>
<h4>#{bundle['auth.providers.title']}</h4>
<ui:repeat value="#{LoginPage.listAuthenticationProviders()}" var="provider">
<h:outputLink rendered="#{provider.id != LoginPage.authProvider.id}" styleClass="btn btn-default" value="/loginpage.xhtml?redirectPage=dataverseuser.xhtml&amp;provider=#{provider.id}">
<h:outputText value="#{provider.title}" />
Expand Down

0 comments on commit fb4f5e4

Please sign in to comment.