Skip to content

Commit e85c422

Browse files
sekmillersekmiller
committed
#8184 update popup and Bundle
1 parent bc8e88b commit e85c422

File tree

2 files changed

+64
-11
lines changed

2 files changed

+64
-11
lines changed

‎src/main/java/propertyFiles/Bundle.properties

+10-1
Original file line numberDiff line numberDiff line change
@@ -1723,9 +1723,18 @@ dataset.requestAccessToRestrictedFilesWithEmbargo=Embargoed files cannot be acce
17231723
dataset.privateurl.infoMessageAuthor=Privately share this dataset before it is published: {0}
17241724
dataset.privateurl.infoMessageReviewer=This unpublished dataset is being privately shared.
17251725
dataset.privateurl.header=Unpublished Dataset Preview URL
1726-
dataset.privateurl.tip=Use a Preview URL to allow those without Dataverse accounts to access your unpublished dataset. For more information about the Preview URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-to-review-unpublished-dataset" title="Preview URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
1726+
dataset.privateurl.tip=To cite this data in publications, use the dataset's persistent ID instead of this URL. For more information about the Preview URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-to-review-unpublished-dataset" title="Preview URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
1727+
dataset.privateurl.onlyone=Only one Preview URL can be active for a single dataset.
17271728
dataset.privateurl.absent=Preview URL has not been created.
1729+
dataset.privateurl.general.button.label=Create General Preview URL
1730+
dataset.privateurl.general.description=Create a URL that others can use to review this dataset version before it is published. they will be able to access all files in the dataset and see all metadata, including metadata that may identify the dataset's authors.
1731+
dataset.privateurl.general.title=General Preview
1732+
dataset.privateurl.anonymous.title=Anonymous Preview
1733+
dataset.privateurl.anonymous.button.label=Create Anonymous Preview URL
1734+
dataset.privateurl.anonymous.description=Create a URL that others can use to access an anonymized view of this unpublished dataset version. Metadata that could identify the dataset author will not be displayed. Non-identifying metadata will be visible.
1735+
dataset.privateurl.anonymous.description.paragraph.two=The dataset's files are not changed and will be accessible if they're not restricted. Users of the preview URL will be able to see the name of the repository and the name of the collection that this dataset is in, which may expose the dataset author's identities.
17281736
dataset.privateurl.createPrivateUrl=Create Preview URL
1737+
dataset.privateurl.introduction=You can create a Preview URL to copy and share with others who will not need a repository account to review this unpublished dataset version. Once the dataset is published ot if the URL is disabled, the URL will no longer work and will point to a "Page not found" page.
17291738
dataset.privateurl.createPrivateUrl.anonymized=Create URL for Anonymized Access
17301739
dataset.privateurl.createPrivateUrl.anonymized.unavailable=Anonymized Access is not available once a version of the dataset has been published
17311740
dataset.privateurl.disablePrivateUrl=Disable Preview URL

‎src/main/webapp/dataset.xhtml

+54-10
Original file line numberDiff line numberDiff line change
@@ -1178,11 +1178,61 @@
11781178
<p:dialog id="privateUrlId" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="privateUrlConfirmation" modal="true">
11791179
<p:fragment id="privateUrlPanel" rendered="#{DatasetPage.userCanCreatePrivateURL}">
11801180
<p class="help-block">
1181+
<p>#{bundle['dataset.privateurl.introduction']}</p>
1182+
<p>
11811183
<h:outputFormat value="#{bundle['dataset.privateurl.tip']}" escape="false">
11821184
<f:param value="#{systemConfig.guidesBaseUrl}"/>
11831185
<f:param value="#{systemConfig.guidesVersion}"/>
11841186
</h:outputFormat>
1187+
</p>
1188+
<p>#{bundle['dataset.privateurl.onlyone']}</p>
11851189
</p>
1190+
1191+
<p>
1192+
<p>
1193+
<h:outputText styleClass="highlightBold" value="#{bundle['dataset.privateurl.general.title']}"></h:outputText></p>
1194+
<p>#{bundle['dataset.privateurl.general.description']}</p>
1195+
<p:commandButton styleClass="btn btn-default"
1196+
value="#{bundle['dataset.privateurl.general.button.label']}"
1197+
action="#{DatasetPage.createPrivateUrl(false)}" update="privateUrlPanel,:messagePanel"
1198+
disabled="#{(!empty(DatasetPage.privateUrl) and DatasetPage.anonymizedPrivateUrl)}"
1199+
rendered="#{empty(DatasetPage.privateUrl) or (!empty(DatasetPage.privateUrl) and DatasetPage.anonymizedPrivateUrl) }"/>
1200+
<p:fragment rendered="#{!empty(DatasetPage.privateUrl) and !DatasetPage.anonymizedPrivateUrl}">
1201+
<div class="button-block">
1202+
<button class="btn btn-default btn-copy" data-clipboard-text="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" type="button">
1203+
#{bundle['copyClipboard']}
1204+
</button>
1205+
<p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" onclick="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel"/>
1206+
</div>
1207+
</p:fragment>
1208+
1209+
</p>
1210+
<p:fragment rendered="#{DatasetPage.anonymizedAccessEnabled}">
1211+
<p>
1212+
<p>
1213+
<h:outputText styleClass="highlightBold" value="#{bundle['dataset.privateurl.anonymous.title']}"></h:outputText></p>
1214+
<p>#{bundle['dataset.privateurl.anonymous.description']}</p>
1215+
<p>#{bundle['dataset.privateurl.anonymous.description.paragraph.two']} #{bundle['dataset.privateurl.createPrivateUrl.anonymized.unavailable']}.</p>
1216+
1217+
1218+
<p:commandButton styleClass="btn btn-default disabledTitle"
1219+
value="#{bundle['dataset.privateurl.anonymous.button.label']}"
1220+
action="#{DatasetPage.createPrivateUrl(true)}"
1221+
update="privateUrlPanel,:messagePanel"
1222+
rendered="#{DatasetPage.anonymizedAccessEnabled and (empty(DatasetPage.privateUrl) or (!empty(DatasetPage.privateUrl) and !DatasetPage.anonymizedPrivateUrl))}"
1223+
disabled="#{DatasetPage.dataset.released or ((!empty(DatasetPage.privateUrl) and !DatasetPage.anonymizedPrivateUrl))}"
1224+
title="#{DatasetPage.dataset.released ? bundle['dataset.privateurl.createPrivateUrl.anonymized.unavailable']:'' }"/>
1225+
1226+
</p>
1227+
<p:fragment rendered="#{!empty(DatasetPage.privateUrl) and DatasetPage.anonymizedPrivateUrl}">
1228+
<div class="button-block">
1229+
<button class="btn btn-default btn-copy" data-clipboard-text="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" type="button">
1230+
#{bundle['copyClipboard']}
1231+
</button>
1232+
<p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" onclick="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel"/>
1233+
</div>
1234+
</p:fragment>
1235+
<ui:remove>
11861236
<div>
11871237
<div class="highlight" jsf:rendered="#{empty(DatasetPage.privateUrl)}">
11881238
<p class="no-margin-bottom">#{bundle['dataset.privateurl.absent']}</p>
@@ -1200,17 +1250,11 @@
12001250
</p>
12011251
</div>
12021252
</div>
1203-
<div class="button-block">
1204-
<p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.createPrivateUrl']}" action="#{DatasetPage.createPrivateUrl(false)}" update="privateUrlPanel,:messagePanel" rendered="#{empty(DatasetPage.privateUrl)}"/>
1205-
<p:commandButton styleClass="btn btn-default disabledTitle" value="#{bundle['dataset.privateurl.createPrivateUrl.anonymized']}" action="#{DatasetPage.createPrivateUrl(true)}" update="privateUrlPanel,:messagePanel" rendered="#{DatasetPage.anonymizedAccessEnabled and empty(DatasetPage.privateUrl)}" disabled="#{DatasetPage.dataset.released}" title="#{DatasetPage.dataset.released ? bundle['dataset.privateurl.createPrivateUrl.anonymized.unavailable']:'' }"/>
1206-
<button class="btn btn-default btn-copy" data-clipboard-text="#{DatasetPage.getPrivateUrlLink(DatasetPage.privateUrl)}" jsf:rendered="#{!empty(DatasetPage.privateUrl)}" type="button">
1207-
#{bundle['copyClipboard']}
1208-
</button>
1209-
<p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" onclick="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel"/>
1210-
<button class="btn btn-link" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
1253+
</ui:remove>
1254+
</p:fragment>
1255+
<button class="btn btn-link" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
12111256
#{bundle.close}
1212-
</button>
1213-
</div>
1257+
</button>
12141258
</p:fragment>
12151259
<p:fragment id="privateUrlPanelCannotCreate" rendered="#{!DatasetPage.userCanCreatePrivateURL}">
12161260
<p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.privateurl.cannotCreate']}</p>

0 commit comments

Comments
 (0)