Added new shared text to file pg, added min-height for dataset thumb …

…container [ref #6684]
IQSS · May 27, 2020 · f147041 · f147041
1 parent b3872b2
commit f147041
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -743,16 +743,11 @@ dataverse.publish.header=Publish Dataverse
 dataverse.nopublished=No Published Dataverses
 dataverse.nopublished.tip=In order to use this feature you must have at least one published dataverse.
 dataverse.contact=Email Dataverse Contact
-dataset.link=Link Dataset
 dataverse.link=Link Dataverse
 dataverse.link.btn.tip=Link to Your Dataverse
 dataverse.link.yourDataverses=Your Dataverse
 dataverse.link.yourDataverses.inputPlaceholder=Enter Dataverse Name
 dataverse.link.save=Save Linked Dataverse
-dataset.link.save=Save Linked Dataset
-dataset.link.not.to.owner=Can't link a dataset to its dataverse
-dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
-dataset.link.not.published=Can't link a dataset that has not been published
 dataverse.link.dataverse.choose=Choose which of your dataverses you would like to link this dataverse to.
 dataverse.link.dataset.choose=Enter the name of the dataverse you would like to link this dataset to. If you need to remove this link in the future, please contact {0}.
 dataverse.link.dataset.none=No linkable dataverses available.
@@ -1305,7 +1300,12 @@ dataset.mayNotPublish.twoGenerations= This dataset cannot be published until {0}
 dataset.mayNotBePublished.both.button=Yes, Publish Both
 dataset.viewVersion.unpublished=View Unpublished Version
 dataset.viewVersion.published=View Published Version
-dataset.email.datasetContactBtn=Email Dataset Contact
+dataset.link.title=Link Dataset
+dataset.link.save=Save Linked Dataset
+dataset.link.not.to.owner=Can't link a dataset to its dataverse
+dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
+dataset.link.not.published=Can't link a dataset that has not been published
+dataset.email.datasetContactTitle=Contact Dataset Owner
 dataset.email.hiddenMessage= 
 dataset.email.messageSubject=Test Message Subject
 dataset.email.datasetLinkBtn.tip=Link Dataset to Your Dataverse
@@ -1484,7 +1484,9 @@ file.accessBtn.header.download=Download Options
 file.editBtn=Edit File
 file.contactBtn=Contact Owner
 file.shareBtn=Share
-
+file.share.title=Share File
+file.share.tip=Share this file on your favorite social media networks.
+file.share.text=View this file.
 file.bulkUpdate=Bulk Update
 file.uploadFiles=Upload Files
 file.replaceFile=Replace File

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -421,7 +421,7 @@
 
                                         <!-- Contact/Share Button Group -->
                                         <div class="btn-group btn-group-justified">
-                                            <p:commandLink styleClass="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                            <p:commandLink styleClass="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactTitle']}"
                                                            update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
                                                 <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
                                                 <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
@@ -1435,7 +1435,7 @@
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
                     </p:dialog>
-                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link']}" widgetVar="linkDatasetForm" modal="true" rendered="#{DatasetPage.showLinkingPopup}">
+                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link.title']}" widgetVar="linkDatasetForm" modal="true" rendered="#{DatasetPage.showLinkingPopup}">
                         <p:focus for="dataverseLinkName"/>
                         <div class="form-horizontal">
                             <p class="help-block">

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -306,7 +306,7 @@
 
                                             <!-- Contact/Share Button Group -->
                                             <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                                <p:commandLink class="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                                <p:commandLink class="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactTitle']}"
                                                                update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
                                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
                                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
@@ -315,7 +315,7 @@
                                                     #{bundle['file.contactBtn']}
                                                 </p:commandLink>
                                                 <p:commandLink styleClass="btn btn-default btn-xs btn-share" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
-                                                               title="#{bundle['dataset.share.datasetShare']}"
+                                                               title="#{bundle['file.share.fileShare']}"
                                                                oncomplete="PF('shareDialog').show();sharrre();">
                                                     #{bundle['file.shareBtn']}
                                                 </p:commandLink>
@@ -661,9 +661,9 @@
                         </p:tabView>
                     </div>
                     <!-- POPUPS -->
-                    <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true"  rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                        <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
-                        <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
+                    <p:dialog id="shareDialog" header="#{bundle['file.share.title']}" widgetVar="shareDialog" modal="true" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                        <p class="help-block">#{bundle['file.share.tip']}</p>
+                        <div id="sharrre-widget" data-text="#{bundle['file.share.text']}" data-url="#{systemConfig.dataverseSiteUrl}/file.xhtml?#{empty FilePage.fileMetadata.dataFile.globalIdString ? 'fileId' : 'persistentId'}=#{empty FilePage.fileMetadata.dataFile.globalIdString ? FilePage.fileMetadata.dataFile.id : FilePage.fileMetadata.dataFile.globalIdString}&amp;version=#{FilePage.fileMetadata.datasetVersion.friendlyVersionNumber}"></div>
                         <div class="button-block">
                             <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                 #{bundle.close}

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -641,7 +641,7 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 div.alert-info.bg-citation, div.alert-danger.bg-danger {border-radius:0; color:#333;}
 .citation span.glyphicon-question-sign {margin-left:.5em; margin-bottom:2px; vertical-align: middle;}
 div.citation-block div.alert {padding:10px 10px 0px 10px;}
-div.citation-block div.preview-icon-block {padding-right:10px;padding-bottom:10px;}
+div.citation-block div.preview-icon-block {padding-right:10px;padding-bottom:10px; min-height:140px;} /* min-height needed for colorder bootstrap layout hack */
 div.citation-block div.preview-icon-block img {max-width:140px; max-height:140px;}
 div.citation-block div.preview-icon-block span[class^='icon'] {font-size:7.5em; line-height:1.1; color:#428BCA;}
 @media(max-width:767px){