Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/propertyFiles/Bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2484,7 +2484,7 @@ error.403.page.title=403 Not Authorized
error.403.message=<strong>Not Authorized</strong> - You are not authorized to view this page.

# general error - support message
error.support.message= If you believe this is an error, please contact {0} for assistance.
error.support.message= Please contact {0} if you have any questions.

# citation-frame.xhtml
citationFrame.banner.message=If the site below does not load, the archived data can be found in the {0} {1}. {2}
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/dataverse_homepage.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

<h:body>
<ui:composition template="/dataverse_template.xhtml">
<ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name}"/>
<ui:param name="pageTitle" value="Harvard Dataverse"/>
<ui:param name="dataverse" value="#{DataversePage.dataverse}"/>
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="showDataverseHeader" value="false"/>
<f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
<f:viewAction action="#{DataversePage.init}"/>
<!-- f:viewAction action="#{DataversePage.init}"/ -->
</f:metadata>
</ui:define>
<ui:define name="body">
Expand Down
15 changes: 14 additions & 1 deletion src/main/webapp/loginpage.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@
<ui:param name="showMessagePanel" value="#{true}"/>
<ui:param name="loginRedirectPage" value="dataverse.xhtml"/>
<ui:define name="body">
<div id="status-alert" class="bg-warning">
<div class="alert alert-dismissible container text-warning">
<h:outputFormat value="{0}Note about ORCID, GitHub, and Google sign-in:{1} {2}These options are available only to the existing accounts that previously authenticated with these methods. New sign-ups via ORCID, GitHub, or Google are not supported. Please use your {3}Institutional Login{4} or {5}Username/Email{6} to sign up. If you need help logging in, please contact support." escape="false">
<f:param value="&lt;b&gt;"/>
<f:param value="&lt;/b&gt;"/>
<f:param value="&lt;p/&gt;"/>
<f:param value="&lt;b&gt;"/>
<f:param value="&lt;/b&gt;"/>
<f:param value="&lt;b&gt;"/>
<f:param value="&lt;/b&gt;"/>
</h:outputFormat>
</div>
</div>
<ui:fragment rendered="#{LoginPage.listAuthenticationProviders().size() lt 1}">
<div class="row">
<div class="col-sm-12">
Expand Down Expand Up @@ -218,7 +231,7 @@
<h3>#{bundle['auth.providers.title']}</h3>
<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">
<p:commandLink rendered="#{provider.id != LoginPage.authProvider.id and provider.id != 'oidc-mpconfig'}" styleClass="btn btn-default" actionListener="#{LoginPage.setAuthProviderById(provider.id)}" update="login-container">
<h:outputText value="#{provider.title}" />
</p:commandLink>
</ui:repeat>
Expand Down