From d800944e965d0f16570af3651499b94a8005f841 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 21 Dec 2016 14:46:57 -0500
Subject: [PATCH 1/2] Moved message text to bundle. Added new approach to
 linking to support popup. [ref #3036]

---
 src/main/java/Bundle.properties               |  8 +++++
 src/main/webapp/resources/iqbs/messages.xhtml | 34 +++++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index e768e4c6b99..7c3f16c61ac 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -99,6 +99,14 @@ footer.privacyPolicy=Privacy Policy
 footer.poweredby=Powered by
 footer.dataverseProject=The Dataverse Project
 
+# messages.xhtml
+
+messages.error=Error
+messages.success=Success!
+messages.info=Info
+messages.validation=Validation Error
+messages.validation.msg=Required fields were missed or there was a validation error. Please scroll down to see details.
+
 # contactFormFragment.xhtml
 
 contact.header=Contact Dataverse Support
diff --git a/src/main/webapp/resources/iqbs/messages.xhtml b/src/main/webapp/resources/iqbs/messages.xhtml
index f4fd0f53e94..4d064fa2526 100644
--- a/src/main/webapp/resources/iqbs/messages.xhtml
+++ b/src/main/webapp/resources/iqbs/messages.xhtml
@@ -15,28 +15,49 @@
     <cc:implementation>
         <ui:fragment rendered="#{not empty flash['successMsg']}">
             <div class="alert alert-success">
-                <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&#160;<strong>Success!</strong> – <h:outputText escape="false" value="#{flash['successMsg']}"/>
+                <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&#160;<strong>#{bundle['messages.success']}</strong> – <h:outputText escape="false" value="#{flash['successMsg']}"/>
             </div>
         </ui:fragment>
         <ui:fragment rendered="#{not empty flash['errorMsg']}">
             <div class="alert alert-danger">
-                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>Error</strong> – <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.
+                
+                <!-- <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> – 
+                
+                <h:outputText value="#{flash['errorMsg']} " escape="false"/>
+                
+                <h:outputFormat value="#{bundle['error.support.message']}" escape="false">
+                    <o:param>
+                        <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>                                
+                    </o:param>
+                </h:outputFormat>
+                
+                </o:form>
+                
             </div>
         </ui:fragment>
         <ui:fragment rendered="#{not empty flash['infoMsg']}">
             <div class="alert alert-info">
-                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>Info</strong> – <h:outputText escape="false" value="#{flash['infoMsg']} "/>
+                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>#{bundle['messages.info']}</strong> – <h:outputText escape="false" value="#{flash['infoMsg']} "/>
             </div>
         </ui:fragment>
         <ui:fragment rendered="#{not empty flash['warningMsg']}">
             <div class="alert alert-warning">
-                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>Info</strong> – <h:outputText escape="false" value="#{flash['warningMsg']} "/>
+                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>#{bundle['messages.info']}</strong> – <h:outputText escape="false" value="#{flash['warningMsg']} "/>
             </div>
         </ui:fragment>
         <ui:fragment rendered="#{facesContext.validationFailed}">
             <div class="alert alert-danger">
-                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>Validation Error</strong> – Required fields were missed or there was a validation error. Please scroll down to see details.
+                <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>#{bundle['messages.validation']}</strong> – #{bundle['messages.validation.msg']}
             </div>
         </ui:fragment>
         <ui:repeat rendered="#{!facesContext.validationFailed}" value="#{facesContext.messageList}" var="msg">
@@ -48,6 +69,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.
                     <strong>Date/Time: </strong>
                     <h:outputText value="#{now}">

From e0d5e51f2a06c9734900393c484eba361f0206fd Mon Sep 17 00:00:00 2001
From: Gustavo Durand <gdurand@iq.harvard.edu>
Date: Fri, 13 Jan 2017 14:16:07 -0500
Subject: [PATCH 2/2] workaround fix for #3036

---
 src/main/webapp/resources/iqbs/messages.xhtml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/resources/iqbs/messages.xhtml b/src/main/webapp/resources/iqbs/messages.xhtml
index 4d064fa2526..364e76d99e8 100644
--- a/src/main/webapp/resources/iqbs/messages.xhtml
+++ b/src/main/webapp/resources/iqbs/messages.xhtml
@@ -10,7 +10,7 @@
 
     <cc:interface>
         <cc:attribute name="collapsible" default="false" />
-    </cc:interface>
+     </cc:interface>
 
     <cc:implementation>
         <ui:fragment rendered="#{not empty flash['successMsg']}">
@@ -18,15 +18,19 @@
                 <span class="glyphicon glyphicon glyphicon-ok-sign"></span>&#160;<strong>#{bundle['messages.success']}</strong> – <h:outputText escape="false" value="#{flash['successMsg']}"/>
             </div>
         </ui:fragment>
-        <ui:fragment rendered="#{not empty flash['errorMsg']}">
-            <div class="alert alert-danger">
+        <ui:fragment>
+            <ui:remove>
+                Note: having a rendered attribute in the ui:fragment that referenced flash scope broke the actionListener below. 
+                As a workaround, we have moved that logic into the div style attribute below.
+            </ui:remove>
+            <div class="alert alert-danger" style="display:#{not empty flash['errorMsg']?'block':'none' }">
                 
                 <!-- <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> – 
+            
+               <span class="glyphicon glyphicon-exclamation-sign"></span>&#160;<strong>#{bundle['messages.error']}</strong> – 
                 
                 <h:outputText value="#{flash['errorMsg']} " escape="false"/>