Skip to content

6170 signup link login pg #6246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 6 commits into from
Oct 4, 2019
Merged

6170 signup link login pg #6246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37e1d33
Refactored contact link and bundle text on login pg, added title, rel…
mheppler Oct 1, 2019
46e0188
Added sign up link to login pg [ref #6170]
mheppler Oct 2, 2019
b9ea122
Merge branch 'develop' into 6170-signup-link-login-pg
mheppler Oct 2, 2019
6d71f32
Added missing escape=false to new sign up link on login pg [ref #6170]
mheppler Oct 2, 2019
6dd3c6e
Merge branch 'develop' into 6170-signup-link-login-pg
sekmiller Oct 3, 2019
08c1257
Merge branch 'develop' into 6170-signup-link-login-pg
sekmiller Oct 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/propertyFiles/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,12 @@ 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 &mdash; <a href="{0}/{1}/user/account.html" target="_blank">learn more</a>.
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 &mdash; more <a href="{0}/{1}/user/account.html" title="Account Creation + Management - Dataverse User Guide" target="_blank" rel="noopener">information about account creation</a>.
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?
login.signup.blurb=<a href="{0}">Sign up for a Dataverse account</a>.
login.echo.credential.name=Name
login.echo.credential.email=Email
login.echo.credential.affiliation=Affiliation
Expand All @@ -301,20 +301,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. <a href="{0}/{1}/user/account.html" target="_blank">Learn more</a>.
auth.providers.tip=You can convert a Dataverse account to use one of the options above. More <a href="{0}/{1}/user/account.html" title="Account Creation + Management - Dataverse User Guide" target="_blank" rel="noopener">information about account creation</a>.
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 &mdash; <a href="{1}/{2}/user/account.html" target="_blank">learn more</a>. Having trouble? Please contact {3} for assistance.
auth.providers.blurb=Log in or sign up with your {0} account &mdash; more <a href="{1}/{2}/user/account.html" title="Account Creation + Management - Dataverse User Guide" target="_blank" rel="noopener">information about account creation</a>. 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 <a href="https://orcid.org/about" target="_blank">orcid.org/about</a>.
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 <a href="https://orcid.org/about" title="About ORCID" target="_blank" rel="noopener">orcid.org/about</a>.
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
Expand Down
30 changes: 20 additions & 10 deletions src/main/webapp/loginpage.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,16 @@
<f:param value="#{settingsWrapper.guidesBaseUrl}"/>
<f:param value="#{systemConfig.guidesVersion}"/>
</h:outputFormat>
<h:outputText value="#{bundle['login.institution.support.beforeLink']} " />
<p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
<f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
</p:commandLink>
<h:outputText value=" #{bundle['login.institution.support.afterLink']}" escape="false"/>
<h:outputFormat value="#{bundle['login.institution.support.blurbwithLink']}" escape="false">
<o:param>
<p:commandLink value="#{settingsWrapper.supportTeamName}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
<f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
</p:commandLink>
</o:param>
</h:outputFormat>
</p>
</h:form>

Expand Down Expand Up @@ -166,8 +168,8 @@
<div class="col-sm-12">
<h:outputLink styleClass="btn btn-default" value="#{OAuth2Page.linkFor(LoginPage.authProvider.id, LoginPage.redirectPage)}">
<h:graphicImage rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value="/resources/images/orcid_16x16.png" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['auth.providers.title.orcid'])}"/>
<h:outputFormat rendered="#{not fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{LoginPage.getLoginButtonText()}"/>
<h:outputFormat rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{bundle['login.button.orcid']}"/>
<h:outputText rendered="#{not fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{LoginPage.getLoginButtonText()}"/>
<h:outputText rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value=" #{bundle['login.button.orcid']}"/>
</h:outputLink>
<ui:fragment rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}">
<p class="help-block small" style="margin-top:1em;">
Expand Down Expand Up @@ -199,6 +201,14 @@
</p>
</div>
</div>

<div id="signUpLink">
<p class="help-block margin-top">
<h:outputFormat value="#{bundle['login.signup.blurb']}" escape="false">
<f:param value="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}"/>
</h:outputFormat>
</p>
</div>
</div>
</div>
</div>
Expand Down