From aa215c7caf03a70e1546ec51d2e4bf2cce6a091d Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 22 Jul 2019 14:51:04 -0400
Subject: [PATCH] Added User Guide link to citation popups from dataset metrics
 block, removed unused link title [ref #5253]

---
 src/main/java/propertyFiles/Bundle.properties |  2 +-
 src/main/webapp/dataset.xhtml                 | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index fd4a1bf01ba..634f490618b 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1226,7 +1226,7 @@ metrics.views={0, choice, 0#Views|1#View|2#Views}
 metrics.downloads={0, choice, 0#Downloads|1#Download|2#Downloads}
 metrics.citations={0, choice, 0#Citations|1#Citation|2#Citations}
 metrics.citations.dialog.header=Dataset Citations
-metrics.citations.dialog.help=Citations for this dataset are retrieved from Crossref via DataCite a using Make Data Count standards.
+metrics.citations.dialog.help=Citations for this dataset are retrieved from Crossref via DataCite a using Make Data Count standards. For more information about dataset metrics, please refer to the <a href="{0}/{1}/user/dataset-management.html#dataset-metrics-user" title="Dataset Metrics - Dataverse User Guide" target="_blank">User Guide</a>.
 dataset.publish.btn=Publish
 dataset.publish.header=Publish Dataset
 dataset.rejectBtn=Return to Author
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 65776ae01b6..6e71303c314 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -407,9 +407,8 @@
                                                     data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
                                         </div>
                                         <!-- Make Data Count citations (DOIs only, not Handles) -->
-                                        <div class="metrics-count-block" jsf:rendered="#{not empty settingsServiceBean.get(':MDCLogPath') and settingsServiceBean.get(':Protocol') == 'doi'}">
-                                            <p:commandLink title="DATASET CITATIONS LINK TITLE HERE"
-                                                            oncomplete="PF('citationsDialog').show();">
+                                        <div class="metrics-count-block" jsf:rendered="#{true}">
+                                            <p:commandLink oncomplete="PF('citationsDialog').show();">
                                                 <h:outputFormat value="{0} #{bundle['metrics.citations']}">
                                                     <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
                                                 </h:outputFormat>
@@ -419,7 +418,12 @@
                                                     data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
                                         
                                             <p:dialog id="citationsDialog" styleClass="smallPopup" header="#{bundle['metrics.citations.dialog.header']}" widgetVar="citationsDialog" modal="true">
-                                                <p class="help-block">#{bundle['metrics.citations.dialog.help']}</p>
+                                                <p class="help-block">
+                                                    <h:outputFormat value="#{bundle['metrics.citations.dialog.help']}" escape="false">
+                                                        <f:param value="#{systemConfig.guidesBaseUrl}"/>
+                                                        <f:param value="#{systemConfig.guidesVersion}"/>
+                                                    </h:outputFormat>
+                                                </p>
                                                 
                                                 <div id="citations-list-block">
                                                     <ul>