Skip to content

Commit

Permalink
Revised text for Shibboleth users on the Account Information pg, adde…
Browse files Browse the repository at this point in the history
…d a link to the Contact Dataverse Support popup. Also added this link to the error message text for 404 and 403 errors. [ref #2046 #2951]
  • Loading branch information
mheppler committed Feb 23, 2016
1 parent bf2f824 commit 51d15f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/main/java/Bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ contact.contact=Contact
account.info=Account Information
account.edit=Edit Account
apiTaken=API Token
user.isShibUser=You are logged in through your institution. If you need to update any of this information, please contact your institution.
user.isShibUser=Account information cannot be edited when logged in through an institutional account. Leaving your institution? Please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();">Dataverse Support</a> for assistance.
user.lostPasswdTip=If you have lost or forgotten your password, please enter your username or email address below and click Submit. We will send you an e-mail with your new password.
user.dataRelatedToMe=My Data
wasCreatedIn=, was created in
Expand Down Expand Up @@ -1099,8 +1099,8 @@ error.500.message=<strong>Internal Server Error</strong> - An unexpected error w

# 404.xhtml
error.404.page.title=404 Not Found
error.404.message=<strong>Page Not Found</strong> - The page you are looking for was not found. To contact support, please press the Support link above.
error.404.message=<strong>Page Not Found</strong> - The page you are looking for was not found. If you believe this is an error, please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();">Dataverse Support</a> for assistance.

# 403.xhtml
error.403.page.title=403 Not Authorized
error.403.message=<strong>Not Authorized</strong> - You are not authorized to view this page. To contact support, please press the Support link above.
error.403.message=<strong>Not Authorized</strong> - You are not authorized to view this page. If you believe this is an error, please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();">Dataverse Support</a> for assistance.
4 changes: 2 additions & 2 deletions src/main/webapp/dataverseuser.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@
<div class="form-horizontal" jsf:rendered="#{!empty DataverseUserPage.currentUser}">
<div class="form-group" jsf:rendered="#{empty DataverseUserPage.builtinUser}">
<div class="col-sm-12">
<p class="text-danger">
<span class="glyphicon glyphicon-warning-sign"/> #{bundle['user.isShibUser']}
<p class="help-block">
<span class="glyphicon glyphicon-info-sign"/> <h:outputText value=" #{bundle['user.isShibUser']}" escape="false"/>
</p>
</div>
</div>
Expand Down

0 comments on commit 51d15f8

Please sign in to comment.