Revisions to help text on Sign Up, Log In, and Welcome (OAuth) pgs. […

…ref #3338]
IQSS · Dec 14, 2016 · 8a79fab · 8a79fab
1 parent 448b13d
commit 8a79fab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -168,6 +168,7 @@ notification.access.revoked.datafile=You have been removed from a role in {0}.
 removeNotification=Remove Notification
 groupAndRoles.manageTips=Here is where you can access and manage all the groups you belong to, and the roles you have been assigned.
 user.signup.tip=Why have a Dataverse account? To create your own dataverse and customize it, add datasets, or request access to restricted files.
+user.signup.otherLogInOptions.tip=Too many passwords? Sign up using an external account through {0}.
 user.suggestNonLocalLoginStatic.tip=Too many passwords? <a href="/loginpage.xhtml" title="Dataverse Log In">Log In</a> with existing credentials.
 user.suggestNonLocalLoginDynamic.tip=Too many passwords? <a href="/loginpage.xhtml" title="Dataverse Log In">Log In</a> with existing credentials from {0}.
 user.username.illegal.tip=Between 2-60 characters, and can use "a-z", "0-9", "_" for your username.
@@ -204,7 +205,7 @@ login.System=Login System
 login.forgot.text=Forgot your password?
 login.builtin=Dataverse Account
 login.institution=Institutional Account
-login.institution.blurb=Use Dataverse with your institutional log in instead of creating an account. <a href="{0}/{1}/user/account.html" target="_blank">Learn More</a>.
+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.builtin.credential.usernameOrEmail=Username/Email
@@ -217,13 +218,14 @@ user.error.wrongPassword=Sorry, wrong password.
 login.button=Log In with {0}
 # authentication providers
 auth.providers.title=Other Log In Options
+auth.providers.tip=Convert your Dataverse account to use these other log in options below. <a href="{1}/{2}/user/account.html" target="_blank">Learn more</a>.<br/><br/>Don't have a Dataverse account? Sign up using:
 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. <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; <a href="{1}/{2}/user/account.html" target="_blank">learn more</a>. Having trouble? Please contact {3} for assistance.
 auth.providers.brandForIdentifier.orcid=ORCID iD
 auth.providers.persistentUserIdName.orcid=ORCID iD
 auth.providers.persistentUserIdTooltip.orcid=ORCID provides a persistent digital identifier that distinguishes you from other researchers.
@@ -269,7 +271,7 @@ oauth2.newAccount.pageTitle=Welcome to Dataverse, {0}
 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.explanation=This information is provided by {0} and will be used to create your {1} account. To log in again, you will have to use the {0} log in option.
 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.buttons.convertNewAccount=Convert Account
@@ -281,7 +283,7 @@ oauth2.newAccount.emailInvalid=Invalid email address.
 
 # oauth2/convert.xhtml
 # 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.explanation=Please enter your {0} account username and password to convert your account. To log in again, you will have to use the {1} log in option.
 oauth2.convertAccount.username=Existing username
 oauth2.convertAccount.password=Password
 oauth2.convertAccount.authenticationFailed=Authentication failed - bad username or password.

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -415,8 +415,17 @@
                     <p:tabView id="accountInfoView" rendered="#{!empty DataverseUserPage.editMode}">
                         <p:tab id="accountInfoEdit" title="#{bundle['account.info']}">
                             <ui:fragment rendered="#{DataverseUserPage.editMode == 'CREATE' and DataverseUserPage.nonLocalLoginEnabled}">
+
+                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> 
+                                    <h:outputFormat value=" #{bundle['user.signup.otherLogInOptions.tip']}" escape="false">
+                                        <o:param>
+                                            <h:outputLink value="/loginpage.xhtml">#{bundle['auth.providers.title']}</h:outputLink>
+                                        </o:param>
+                                    </h:outputFormat>
+                                </p>
+
                                 <!--FIXME: Decide between static and dynamic text-->
-                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" #{DataverseUserPage.suggestNonLocalLoginTipStatic}" escape="false"/></p>
+                                <!--<p class="help-block"><span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" # {DataverseUserPage.suggestNonLocalLoginTipStatic}" escape="false"/></p>-->
                                 <!--<p class="help-block"><span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" # {DataverseUserPage.suggestNonLocalLoginTipDynamic}" escape="false"/></p>-->
                             </ui:fragment>
                             <div class="form-horizontal">

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
@@ -42,7 +42,6 @@
 
                             <div id="builtinProvider" jsf:rendered="#{LoginPage.authProvider.id == 'builtin'}">
                                 <h:form id="loginForm" styleClass="form-horizontal">
-                                    <!-- <h2 class="no-margin-top"># {bundle['auth.providers.title.builtin']}</h2> -->
                                     <p:focus context="loginForm"/>
                                     <ui:remove>
                                         <ui:fragment rendered="#{LoginPage.multipleProvidersAvailable}">
@@ -76,7 +75,6 @@
                                     <div class="form-group">
                                         <div class="col-sm-offset-4 col-sm-9 button-block">
                                             <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">
@@ -90,8 +88,6 @@
                             </div>
                             <div id="remoteProvider" jsf:rendered="#{LoginPage.authProvider.id != 'builtin'}">
                                 <ui:fragment rendered="#{(LoginPage.authProvider.id == 'shib') and (systemConfig.shibEnabled == true)}">
-                                    <!--<h2 class="no-margin-top"># {bundle['auth.providers.title.shib']}</h2>-->
-
                                     <h:form>
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-info-sign"/>
@@ -155,9 +151,6 @@
                                 </ui:fragment>                             
 
                                 <ui:fragment rendered="#{LoginPage.authProvider.id != 'shib'}">
-                                    <!-- <h2 class="no-margin-top">
-                                        <h:outputText value="# {bundle['auth.providers.title.' += LoginPage.provider]}"/>
-                                    </h2> -->
                                     <o:form useRequestURI="true">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-info-sign"/>
@@ -179,7 +172,6 @@
                                 </ui:fragment>
 
                                 <!--ONLY RENDER BUTTON FOR OAUTH PROVIDERS (ORCID, Google, GitHub)-->
-                                <!--<div class="form-horizontal" jsf:rendered="#{LoginPage.authProvider.OAuthProvider}">-->
                                 <div class="form-horizontal" jsf:rendered="#{LoginPage.authProvider.OAuthProvider}">
                                     <div class="form-group text-left">
                                         <div class="col-sm-12">
@@ -202,6 +194,12 @@
 
                             <div id="otherProviders" jsf:rendered="#{LoginPage.listAuthenticationProviders().size() > 1}">
                                 <h4>#{bundle['auth.providers.title']}</h4>
+                                <p class="help-block">
+                                    <h:outputFormat value="#{bundle['auth.providers.tip']}" escape="false">
+                                        <o:param value="#{settingsWrapper.guidesBaseUrl}"/>
+                                        <o:param value="#{systemConfig.version}"/>
+                                    </h:outputFormat>
+                                </p>
                                 <h:form>
                                     <ui:repeat value="#{LoginPage.listAuthenticationProviders()}" var="provider">
                                         <p:commandLink rendered="#{provider.id != LoginPage.authProvider.id}" styleClass="btn btn-default" actionListener="#{LoginPage.setAuthProviderById(provider.id)}" update="login-container">