Skip to content

Commit

Permalink
remove cases of "Dataverse Support" #3611 #2710
Browse files Browse the repository at this point in the history
  • Loading branch information
@pdurbin
pdurbin committed Jun 8, 2017
1 parent 2efebf2 commit eec5a2e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/style/patterns.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ For our help/information, success, warning, and error message blocks we use a cu
<span class="glyphicon glyphicon glyphicon-ok-sign"></span>&nbsp;<strong>Success!</strong> – The metadata for this dataset has been updated.
</div>
<div class="alert alert-danger">
<span class="glyphicon glyphicon-exclamation-sign"></span>&nbsp;<strong>Error</strong> – The username, email address, or password you entered is invalid. Need assistance accessing your account? If you believe this is an error, please contact <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Dataverse Support</a> for assistance.
<span class="glyphicon glyphicon-exclamation-sign"></span>&nbsp;<strong>Error</strong> – The username, email address, or password you entered is invalid. Need assistance accessing your account? If you believe this is an error, please contact <a href="#" class="ui-commandlink ui-widget" onclick="return false;">Root Support</a> for assistance.
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx-guides/source/user/account.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ If you already have a Dataverse account associated with the Username/Email log i
Convert your Dataverse account away from your Institutional Log In
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

If you are leaving your institution and need to convert your Dataverse account to the Dataverse Username/Email log in option, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link for "Dataverse Support" that will open the popup form to contact support for assistance.
If you are leaving your institution and need to convert your Dataverse account to the Dataverse Username/Email log in option, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.

ORCID Log In
~~~~~~~~~~~~~
Expand Down Expand Up @@ -132,7 +132,7 @@ If you already have a Dataverse account associated with the Username/Email log i
Convert your Dataverse account away from ORCID for log in
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

If you don't want to log in to Dataverse using ORCID any more, you will want to convert your Dataverse account to the Dataverse Username/Email log in option. To do this, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link for "Dataverse Support" that will open the popup form to contact support for assistance.
If you don't want to log in to Dataverse using ORCID any more, you will want to convert your Dataverse account to the Dataverse Username/Email log in option. To do this, you will need to contact support for the Dataverse installation you are using. On your account page, there is a link that will open a popup form to contact support for assistance.

GitHub and Google Log In
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion scripts/api/setup-optional-harvard.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ echo "- Enabling Geoconnect"
curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectCreateEditMaps"
curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectViewMaps"
echo "- Setting system email"
curl -X PUT -d "Dataverse Support <support@dataverse.org>" http://localhost:8080/api/admin/settings/:SystemEmail
curl -X PUT -d "Harvard Dataverse Support <support@dataverse.org>" http://localhost:8080/api/admin/settings/:SystemEmail
curl -X PUT -d ", The President &#38; Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright
echo "- Setting up the Harvard Shibboleth institutional group"
curl -s -X POST -H 'Content-type:application/json' --upload-file data/shibGroupHarvard.json "$SERVER/admin/groups/shib?key=$adminKey"
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/contactFormFragment.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<p:dialog id="contactDialog" header="#{sendFeedbackDialog.getFormHeader()}" widgetVar="contactForm" modal="true">
<p:fragment>
<h:form id="emailForm" class="form-horizontal">
<!-- to: Dataverse Support -->
<!-- to: Support -->
<div class="form-group">
<label for="messageTo" class="col-sm-3 control-label">#{bundle['contact.to']}</label>
<div class="col-sm-9">
Expand Down
6 changes: 1 addition & 5 deletions src/main/webapp/resources/iqbs/messages.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<ui:fragment rendered="#{not empty flash['errorMsg']}">
<div class="alert alert-danger">

<!-- <h:outputText escape="false" value="# {flash['errorMsg']} "/>
Please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();" title="Contact Dataverse Support">Dataverse Support</a> for assistance. -->

<o:form useRequestURI="true">

<span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>#{bundle['messages.error']}</strong> –
Expand Down Expand Up @@ -69,8 +66,7 @@
</ui:fragment>
<span class="glyphicon glyphicon-info-sign"></span>&#160;<strong>#{msg.summary}</strong>&#160;<h:outputText value="#{msg.detail}" rendered="#{!empty msg.detail and (msg.detail != msg.summary)}"/>
<ui:fragment rendered="#{level eq 'FATAL'}">
<!-- FIXME: Dataverse Support -->
Please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();" title="Contact Dataverse Support">Dataverse Support</a> for assistance.
Please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();" title="Contact " #{settingsWrapper.supportTeamName}>#{settingsWrapper.supportTeamName}</a> for assistance.
<strong>Date/Time: </strong>
<h:outputText value="#{now}">
<f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss" type="date" />
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/edu/harvard/iq/dataverse/util/MailUtilTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ public void setUp() {

@Test
public void testParseSystemAddress() {
assertEquals("support@dataverse.org", MailUtil.parseSystemAddress("support@dataverse.org").getAddress());
assertEquals("support@dataverse.org", MailUtil.parseSystemAddress("Dataverse Support <support@dataverse.org>").getAddress());
assertEquals("Dataverse Support", MailUtil.parseSystemAddress("Dataverse Support <support@dataverse.org>").getPersonal());
assertEquals("support@dataverse.org", MailUtil.parseSystemAddress("\"Dataverse Support\" <support@dataverse.org>").getAddress());
assertEquals("Dataverse Support", MailUtil.parseSystemAddress("\"Dataverse Support\" <support@dataverse.org>").getPersonal());
assertEquals("support@librascholar.edu", MailUtil.parseSystemAddress("support@librascholar.edu").getAddress());
assertEquals("support@librascholar.edu", MailUtil.parseSystemAddress("LibraScholar Support Team <support@librascholar.edu>").getAddress());
assertEquals("LibraScholar Support Team", MailUtil.parseSystemAddress("LibraScholar Support Team <support@librascholar.edu>").getPersonal());
assertEquals("support@librascholar.edu", MailUtil.parseSystemAddress("\"LibraScholar Support Team\" <support@librascholar.edu>").getAddress());
assertEquals("LibraScholar Support Team", MailUtil.parseSystemAddress("\"LibraScholar Support Team\" <support@librascholar.edu>").getPersonal());
assertEquals(null, MailUtil.parseSystemAddress(null));
assertEquals(null, MailUtil.parseSystemAddress(""));
assertEquals(null, MailUtil.parseSystemAddress("Dataverse Support support@dataverse.org"));
assertEquals(null, MailUtil.parseSystemAddress("\"Dataverse Support <support@dataverse.org>"));
assertEquals(null, MailUtil.parseSystemAddress("support1@dataverse.org, support2@dataverse.org"));
assertEquals(null, MailUtil.parseSystemAddress("LibraScholar Support Team support@librascholar.edu"));
assertEquals(null, MailUtil.parseSystemAddress("\"LibraScholar Support Team <support@librascholar.edu>"));
assertEquals(null, MailUtil.parseSystemAddress("support1@dataverse.org, support@librascholar.edu"));
}

@Test
Expand Down

0 comments on commit eec5a2e

Please sign in to comment.