Skip to content

Commit

Permalink
Merge pull request IQSS#8691 from ErykKul/8561_license_info_in_submit…
Browse files Browse the repository at this point in the history 
…_for_review_pop_up

License info is now also shown in submit for review popup
  • Loading branch information
@kcondon
kcondon authored May 13, 2022
2 parents a4712d8 + 96eb703 commit bd94b0f
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 106 deletions.
1 change: 1 addition & 0 deletions doc/release-notes/8561-license-info-in-submit-for-review-pop-up.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Information about the license selection (or custom terms) is now available in the confirmation popup when contributors click "Submit for Review". Previously, this was only available in the confirmation popup for the "Publish" button, which contributors do not see.
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/user/dataset-management.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ will be removed as soon as you Publish.
Submit for Review
=================

If you have a Contributor role (can edit metadata, upload files, and edit files, edit Terms, Guestbook, and Submit datasets for review) in a Dataverse collection you can submit your dataset for review when you have finished uploading your files and filling in all of the relevant metadata fields. To Submit for Review, go to your dataset and click on the "Submit for Review" button, which is located next to the "Edit" button on the upper-right. Once Submitted for Review: the Admin or Curator for this Dataverse collection will be notified to review this dataset before they decide to either "Publish" the dataset or "Return to Author". If the dataset is published the contributor will be notified that it is now published. If the dataset is returned to the author, the contributor of this dataset will be notified that they need to make modifications before it can be submitted for review again.
If you have a Contributor role (can edit metadata, upload files, and edit files, edit Terms, Guestbook, and submit datasets for review) in a Dataverse collection you can submit your dataset for review when you have finished uploading your files and filling in all of the relevant metadata fields. To submit your dataset for review, go to your dataset and click the "Submit for Review" button, which is located next to the "Edit" button on the upper-right. In the confirmation popup, you can review your selection of license (or custom terms, if available). Once you have confirmed the submission, the Admin or Curator for this Dataverse collection will be notified to review this dataset before they decide to either publish the dataset or click "Return to Author". If the dataset is published, the contributor will be notified that it is now published. If the dataset is returned to the author, the contributor of this dataset will be notified that they need to make modifications before it can be submitted for review again.

.. _privateurl:

Expand Down
111 changes: 6 additions & 105 deletions src/main/webapp/dataset.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1616,6 +1616,9 @@
<p class="text-warning">
<span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.submitMessage']}
</p>
<c:if test="#{showSubmitForReviewLink}">
<ui:include src="datasetLicenseInfoFragment.xhtml"/>
</c:if>
<div class="button-block">
<p:commandButton styleClass="btn btn-default" value="#{bundle.submit}"
onclick="PF('inreview').hide();
Expand Down Expand Up @@ -1680,111 +1683,9 @@
</h:outputFormat>
</p>
</ui:fragment>
<!-- START license info -->
<div class="form-group terms">
<div class="form-group">
<label for="metadata_Terms" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.license']}
</label>
<div class="col-sm-9">
<p>
<o:importFunctions
type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
<img
src="#{DatasetUtil:getLicenseIcon(DatasetPage.workingVersion)}"
title="#{DatasetUtil:getLicenseDescription(DatasetPage.workingVersion)}"
style="display: none" onload="this.style.display='inline'" />
<a
href="#{DatasetUtil:getLicenseURI(DatasetPage.workingVersion)}"
title="#{DatasetUtil:getLicenseDescription(DatasetPage.workingVersion)}"
target="_blank">#{DatasetUtil:getLicenseName(DatasetPage.workingVersion)}
</a>
<ui:fragment
rendered="#{empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
<h:outputText
value="#{bundle['file.dataFilesTab.terms.list.license.customterms.txt']}"
escape="false" />
</ui:fragment>
</p>
</div>
</div>
<ui:fragment rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}">
<label for="metadata_Terms" class="col-sm-3 control-label">
#{bundle['dataset.publish.terms.description']}
</label>
<div class="col-sm-9">
<h:outputText value="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}"/>
</div>
</div>
</ui:fragment>
<ui:fragment rendered="#{empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.termsOfUse}">
<label for="termsOfUse" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
</label>
<h:outputText id="termsOfUse" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.termsOfUse)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.confidentialityDeclaration}">
<label for="confidentialityDeclaration" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
</label>
<h:outputText id="confidentialityDeclaration" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.specialPermissions}">
<label for="specialPermissions" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
</label>
<h:outputText id="specialPermissions" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.specialPermissions)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.restrictions}">
<label for="restrictions" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
</label>
<h:outputText id="restrictions" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.restrictions)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.citationRequirements}">
<label for="citationRequirements" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
</label>
<h:outputText id="citationRequirements" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.citationRequirements)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.depositorRequirements}">
<label for="depositorRequirements" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
</label>
<h:outputText id="depositorRequirements" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.conditions}">
<label for="conditions" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
</label>
<h:outputText id="conditions" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.conditions)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.disclaimer}">
<label for="disclaimer" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
</label>
<h:outputText id="disclaimer" class="col-sm-9"
value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.disclaimer)}" escape="false"/>
</div>
<div class="form-group" jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and DatasetPage.hasRestrictedFile()}">
<label jsf:for="termsOfAccess" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
</label>
<h:outputText id="termsOfAccess" class="col-sm-6"
value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}" escape="false"/>
</div>
</ui:fragment>
</div>
<!-- END license info -->
<c:if test="#{showPublishLink}">
<ui:include src="datasetLicenseInfoFragment.xhtml" />
</c:if>
<ui:fragment rendered="#{publishDataset}">
<div class="form-group">
<p class="col-sm-12 help-block">#{bundle['dataset.publish.terms.help.tip']}</p>
Expand Down
Loading

0 comments on commit bd94b0f

Please sign in to comment.