Skip to content
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

Jump to bottom

6307 email dataverse support #6462

Merged
merged 7 commits into from Dec 16, 2019
Merged

6307 email dataverse support #6462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea875bb
Merge branch 'develop' into 6307-email-dataverse-support
sekmiller Dec 11, 2019
9e8fbe6
#6307 fix support email
sekmiller Dec 13, 2019
904e888
Merge branch 'develop' into 6307-email-dataverse-support
sekmiller Dec 13, 2019
9c54d52
#6307 remove debug code
sekmiller Dec 13, 2019
54377b2
#6307 bundle-ize "Hello, "
sekmiller Dec 13, 2019
56192c1
#6307 remove debug code
sekmiller Dec 16, 2019
5f964cd
Merge branch 'develop' into 6307-email-dataverse-support
sekmiller Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/webapp/dataverse_header.xhtml
View file
Open in desktop
Expand Up @@ -80,7 +80,7 @@
</li>
<ui:fragment rendered="#{empty settingsWrapper.get(':NavbarSupportUrl')}">
<o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
<p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
<p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}" id="headerSupportLink">
<f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
<f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/dataverse_template.xhtml
View file
Open in desktop
Expand Up @@ -106,7 +106,10 @@

// Rebind bootstrap UI components
bind_bsui_components();
});
});
function clickSupportLink() {
$("[id$='headerSupportLink']").click();
}
//]]>
</script>
</h:body>
Expand Down
10 changes: 3 additions & 7 deletions src/main/webapp/loginpage.xhtml
View file
Open in desktop
Expand Up @@ -113,13 +113,9 @@
<f:param value="#{systemConfig.guidesVersion}"/>
</h:outputFormat>
<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>
<p:commandLink value="#{settingsWrapper.supportTeamName}" onclick ="clickSupportLink();" >
</p:commandLink>
</o:param>
</h:outputFormat>
</p>
Expand Down
8 changes: 2 additions & 6 deletions src/main/webapp/resources/iqbs/messages.xhtml
View file
Open in desktop
Expand Up @@ -25,16 +25,12 @@
<h:outputText value="#{flash['errorMsg']} " escape="false"/>
<h:outputFormat value="#{bundle['error.support.message']}" 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 value="#{settingsWrapper.supportTeamName}" onclick ="clickSupportLink();" >
</p:commandLink>
</o:param>
</h:outputFormat>
</o:form>
</div>
</div>
</ui:fragment>
<ui:fragment rendered="#{not empty flash['infoMsg']}">
<div class="alert alert-info">
Expand Down