From 22370ad197c38375425d2effa7381f4f2429f6d8 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Thu, 5 Jan 2023 17:01:04 -0500
Subject: [PATCH] Re-use contentTruncate in dataverse page

Fix + sign in collapse
Fix only truncate first description
Use cset to avoid duplication (efficiency?)
---
 src/main/java/propertyFiles/Bundle.properties      |  2 +-
 src/main/webapp/dataset.xhtml                      | 11 ++++++-----
 src/main/webapp/dataverse.xhtml                    | 14 ++++++++++++++
 .../webapp/resources/js/dv_rebind_bootstrap_ui.js  |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 62531d32bb2..3e01ee7f7f8 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -73,7 +73,7 @@ delete=Delete
 copyClipboard=Copy to Clipboard
 truncateMoreBtn=Read full {0} [+]
 truncateMoreTip=Click to read the full {0}.
-truncateLessBtn=Collapse {0} [+]
+truncateLessBtn=Collapse {0} [-]
 truncateLessTip=Click to collapse the {0}.
 yes=Yes
 no=No
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 35753374dbb..ffae0ec8ad9 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -1790,6 +1790,7 @@
                     <p:remoteCommand name="datasetSaveCommand" action="#{DatasetPage.save()}" update=":datasetForm,:messagePanel"/>
                     <!-- END: Publish/Submit for Review Dialogs -->
                 </h:form>
+                <c:set var="descriptionText" value="#{DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle}" />
                 <script>
                     //<![CDATA[
                     $(document).ready(function () {
@@ -1799,12 +1800,12 @@
                     function summaryDescTruncation() {
                         // truncate summary description, contentTruncate function in dv_rebind_bootstrap_ui.js
                         // add summary desc row id to pass as selector param
-                        var descId = 'dsDescription';
+                        var descId = 'dsDescription td > div';
                         // add metadata dynamic label text, tooltip text from bundle as param
-                        var truncMoreBtn = '#{of:format1(bundle.truncateMoreBtn, DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle)}';
-                        var truncMoreTip = '#{of:format1(bundle.truncateMoreTip, DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle)}';
-                        var truncLessBtn = '#{of:format1(bundle.truncateLessBtn, DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle)}';
-                        var truncLessTip = '#{of:format1(bundle.truncateLessTip, DatasetPage.datasetVersionUI.description.datasetFieldType.localeTitle)}';
+                        var truncMoreBtn = '#{of:format1(bundle.truncateMoreBtn, descriptionText)}';
+                        var truncMoreTip = '#{of:format1(bundle.truncateMoreTip, descriptionText)}';
+                        var truncLessBtn = '#{of:format1(bundle.truncateLessBtn, descriptionText)}';
+                        var truncLessTip = '#{of:format1(bundle.truncateLessTip, descriptionText)}';
                         
                         // pass bundle text variabls as params to function
                         contentTruncate(descId, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip);
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 572bcf40300..f319c93a32d 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -822,12 +822,14 @@
                     </div>
                     </h:form>
                 </p:dialog>
+                <c:set var="descriptionText" value="#{bundle.description}" />
                 <script>
                     //<![CDATA[
                     var scrollPos=0;
                     $(document).ready(function () {
                         initCarousel();
                         popoverHTML('#{bundle.htmlAllowedTitle}','#{bundle.htmlAllowedTags}');
+                        summarizeDesc();
                     });
                     function initCarousel() {
                         var owl1 = $("#featuredDataversesList");
@@ -853,6 +855,18 @@
                         }
                         $('#featuredDataversesList .item').matchHeight();
                     }
+                    function summarizeDesc() {
+                        // truncate summary description, contentTruncate function in dv_rebind_bootstrap_ui.js
+                        // add id to pass as selector param
+                        var descId = 'dataverseDesc';
+                        // add metadata dynamic label text, tooltip text from bundle as param
+                        var truncMoreBtn = '#{of:format1(bundle.truncateMoreBtn, descriptionText)}';
+                        var truncMoreTip = '#{of:format1(bundle.truncateMoreTip, descriptionText)}';
+                        var truncLessBtn = '#{of:format1(bundle.truncateLessBtn, descriptionText)}';
+                        var truncLessTip = '#{of:format1(bundle.truncateLessTip, descriptionText)}';
+                        // pass bundle text variables as params to function
+                        contentTruncate(descId, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip);
+                    }
                     function callOnError(){
                         window.scrollTo(0, 0);
                     }
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index f73b7a5ec88..e551b717158 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -166,7 +166,7 @@ function sharrre(){
  */
 function contentTruncate(truncSelector, truncMoreBtn, truncMoreTip, truncLessBtn, truncLessTip){
     // SELECTOR ID FROM PARAMETERS
-    $('#' + truncSelector + ' td > div:first-child').each(function () {
+    $('#' +  truncSelector).each(function () {
         
         // add responsive img class to limit width to that of container
         $(this).find('img').attr('class', 'img-responsive');