support popup fix for welcome notification #2966 #3036

IQSS · Apr 19, 2016 · 083f279 · 083f279
1 parent 5edf6a3
commit 083f279
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -131,7 +131,8 @@ wasReturnedByReviewer=, was returned by the curator of
 toReview=Don't forget to publish it or send it back to the contributor!
 worldMap.added=dataset had a WorldMap layer data added to it.
 # Bundle file editors, please note that "notification.welcome" is used in a unit test
-notification.welcome=Welcome to {0} Dataverse! Get started by adding or finding data. Have questions? Check out the <a href="{1}/{2}/user/index.html" title="{0} Dataverse User Guide" target="_blank">User Guide</a> or click the Support link for assistance.
+notification.welcome1=Welcome to {0} Dataverse! Get started by adding or finding data. Have questions? Check out the <a href="{1}/{2}/user/index.html" title="{0} Dataverse User Guide" target="_blank">User Guide</a> or contact
+notification.welcome2=for assistance.
 notification.requestFileAccess=File access requested for dataset: <a href="/permissions-manage-files.xhtml?id={0,number,#########}" title="{1}">{1}</a>.
 notification.grantFileAccess=Access granted for files in dataset: <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a>.
 notification.rejectFileAccess=Access rejected for requested files in dataset: <a href="/dataset.xhtml?persistentId={0}" title="{1}">{1}</a>.

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -79,11 +79,18 @@
                                             <ui:fragment rendered="#{item.theObject != null}">
                                                 <ui:fragment rendered="#{item.type == 'CREATEACC'}">
                                                     <i class="icon-dataverse text-icon-inline text-muted"></i>                                        
-                                                    <h:outputFormat value="#{bundle['notification.welcome']}" escape="false">
+                                                    <h:outputFormat value="#{bundle['notification.welcome1']} " escape="false">
                                                         <f:param value="#{dataverseServiceBean.findRootDataverse().name}"/>
                                                         <f:param value="#{systemConfig.guidesBaseUrl}"/>
                                                         <f:param value="#{systemConfig.version}"/>
                                                     </h:outputFormat>
+                                                    <p:commandLink value="#{bundle['contact.support']}" 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>
+                                                    <h:outputText value=" #{bundle['notification.welcome2']}"/>
                                                 </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'CREATEDV'}">
                                                     <i class="icon-dataverse text-icon-inline text-muted"></i>

diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
@@ -64,9 +64,8 @@ public void testGetStringFromBundleWithArguments() {
                 BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessage",
                         Arrays.asList(BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessageDefaultInstitution"))));
         assertEquals("Welcome to Root Dataverse! Get started by adding or finding data. "
-                + "Have questions? Check out the <a href=\"http://guides.dataverse.org/en/4.3/user/index.html\" title=\"Root Dataverse User Guide\" target=\"_blank\">User Guide</a> or "
-                + "click the Support link for assistance.",
-                BundleUtil.getStringFromBundle("notification.welcome",
+                + "Have questions? Check out the <a href=\"http://guides.dataverse.org/en/4.3/user/index.html\" title=\"Root Dataverse User Guide\" target=\"_blank\">User Guide</a> or contact",
+                BundleUtil.getStringFromBundle("notification.welcome1",
                         Arrays.asList("Root", "http://guides.dataverse.org/en", "4.3")));
     }