Merge pull request #72 from mderuijter/dd-446-add-license-info-to-publish-dataset-dialog

DD-446 add license info to publish dataset dialog

Author: PaulBoon

src/main/java/propertyFiles/Bundle.properties

@@ -1317,6 +1317,8 @@ dataset.reject.failure=Dataset Submission Return Failed - {0}
 dataset.reject.datasetNull=Cannot return the dataset to the author(s) because it is null.
 dataset.reject.datasetNotInReview=This dataset cannot be return to the author(s) because the latest version is not In Review. The author(s) needs to click Submit for Review first.
 dataset.publish.tip=Are you sure you want to publish this dataset? Once you do so it must remain published.
+dataset.publish.terms.tip=This version of the dataset will be published with the following terms:
+dataset.publish.terms.help.tip=To change the terms for this version, click the Cancel button and go to the Terms tab for this dataset.
 dataset.publishBoth.tip=Once you publish this dataset it must remain published.
 dataset.unregistered.tip= This dataset is unregistered. We will attempt to register it before publishing.
 dataset.republish.tip=Are you sure you want to republish this dataset?
@@ -1637,7 +1639,7 @@ file.dataFilesTab.metadata.addBtn=Add + Edit Metadata
 file.dataFilesTab.terms.header=Terms
 file.dataFilesTab.terms.editTermsBtn=Edit Terms Requirements
 file.dataFilesTab.terms.list.termsOfUse.header=Terms of Use
-file.dataFilesTab.terms.list.termsOfUse.waiver=Waiver
+file.dataFilesTab.terms.list.termsOfUse.waiver=License/DUA
 file.dataFilesTab.terms.list.termsOfUse.waiver.title=The waiver informs data downloaders how they can use this dataset.
 file.dataFilesTab.terms.list.termsOfUse.waiver.txt=CC0 - "Public Domain Dedication"
 file.cc0.icon.alttxt=Creative Commons CC0 1.0 Public Domain Dedication icon
@@ -1670,6 +1672,7 @@ file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles=Restricted Files
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title=The number of restricted files in this dataset.
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt=There {0, choice, 0#are|1#is|2#are} {0} restricted {0, choice, 0#files|1#file|2#files} in this dataset.
 file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess=Terms of Access
+file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.dialog=Terms of Access for Restricted Files
 file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title=Information on how and if users can gain access to the restricted files in this dataset.
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess=Request Access
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title=If checked, users can request access to the restricted files in this dataset.

src/main/webapp/dataset.xhtml

@@ -1525,9 +1525,36 @@
                     <!-- Publish/Submit for Review Dialogs -->
                     <p:dialog id="publishDataset" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishDataset" modal="true">
                         <ui:fragment  rendered="#{publishDataset}">
-                            <p class="text-warning">
-                                <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.publish.tip']}
-                            </p>
+                            <div class="form-group">
+                                <p class="col-sm-12 text-warning">#{bundle['dataset.publish.tip']}</p>
+                                <p class="col-sm-12 help-block">#{bundle['dataset.publish.terms.tip']}</p>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
+                                </label>
+                                <div class="col-sm-9">
+                                    <p>
+                                        <img src="/resources/images/cc0.png" alt="#{bundle['file.cc0.icon.alttxt']}"/>
+                                        #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.txt']}
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.dialog']}
+                                </label>
+                                <div class="col-sm-9">
+                                    <p>
+                                        <p:inputTextarea
+                                                value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess)}"
+                                                readonly="true" rows="3" styleClass="form-control"/>
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <p class="col-sm-12 help-block">#{bundle['dataset.publish.terms.help.tip']}</p>
+                            </div>
                         </ui:fragment>
                         <ui:fragment rendered="#{releaseBoth}">
                             <p class="text-warning">