Patch IQSS/issues/1753 applied

src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java

@@ -272,7 +272,7 @@ public TermsOfUseAndAccess copyTermsOfUseAndAccess(){
 
 
     public enum License {
-        NONE, CC0
+        NONE, CC0, CCBY
     }
 
         /**

src/main/java/propertyFiles/Bundle.properties

@@ -1662,17 +1662,20 @@ 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.title=The waiver informs data downloaders how they can use this dataset.
-file.dataFilesTab.terms.list.termsOfUse.waiver.txt=CC0 - "Public Domain Dedication"
+file.dataFilesTab.terms.list.termsOfUse.waiver.txt=<a href="https://creativecommons.org/publicdomain/zero/1.0/" title="Public Domain Dedication - Creative Commons" target="_blank">CC0 - "Public Domain Dedication"</a>
+file.dataFilesTab.terms.list.termsOfUse.waiver.CCBY.txt=<a href="https://creativecommons.org/licenses/by/4.0/" title="Attribution - Creative Commons" target="_blank">CC-BY 4.0 - "Attribution"</a>
 file.cc0.icon.alttxt=Creative Commons CC0 1.0 Public Domain Dedication icon
-file.dataFilesTab.terms.list.termsOfUse.waiver.description=Datasets will default to a <a href="https://creativecommons.org/publicdomain/zero/1.0/" title="Public Domain Dedication - Creative Commons" target="_blank">CC0 public domain dedication </a>. CC0 facilitates reuse and extensibility of research data. Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. If you are unable to give datasets a CC0 waiver you may enter custom Terms of Use for datasets.
+file.ccby.icon.alttxt=Creative Commons CC-BY 4.0 Attribution icon
+file.dataFilesTab.terms.list.termsOfUse.waiver.description=Datasets will default to a <a href="https://creativecommons.org/publicdomain/zero/1.0/" title="Public Domain Dedication - Creative Commons" target="_blank">CC0 public domain dedication </a>. CC0 facilitates reuse and extensibility of research data. Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. If you are unable to give datasets a CC0 or CC-BY waiver you may enter custom Terms of Use for datasets.
 file.dataFilesTab.terms.list.termsOfUse.no.waiver.txt=No waiver has been selected for this dataset.
 file.dataFilesTab.terms.list.termsOfUse.waiver.txt.description=Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. Please use the data citation above, generated by the Dataverse.
-file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCO=Yes, apply CC0 - "Public Domain Dedication" 
-file.dataFilesTab.terms.list.termsOfUse.waiver.select.notCCO=No, do not apply CC0 - "Public Domain Dedication" 
+file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCO=Apply CC0 - "Public Domain Dedication"
+file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCBY=Apply CC-BY 4.0 - "Attribution"
+file.dataFilesTab.terms.list.termsOfUse.waiver.select.notCCO=Apply custom waiver below.
 file.dataFilesTab.terms.list.termsOfUse.waiver.select.tip=This is what end users will see displayed on this dataset
 file.dataFilesTab.terms.list.termsOfUse.termsOfUse=Terms of Use
 file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title=Outlines how this data can be used once downloaded.
-file.dataFilesTab.terms.list.termsOfUse.termsOfUse.description=If you are unable to use CC0 for datasets you are able to set custom terms of use. Here is an example of a <a href="https://dataverse.org/best-practices/sample-dua" title="Sample Data Usage Agreement - Dataverse.org" target="_blank">Data Usage Agreement</a> for datasets that have de-identified human subject data.
+file.dataFilesTab.terms.list.termsOfUse.termsOfUse.description=If you are unable to use CC0 or CC-BY for datasets you are able to set custom terms of use. Here is an example of a <a href="https://dataverse.org/best-practices/sample-dua" title="Sample Data Usage Agreement - Dataverse.org" target="_blank">Data Usage Agreement</a> for datasets that have de-identified human subject data.
 file.dataFilesTab.terms.list.termsOfUse.addInfo=Additional Information
 file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration=Confidentiality Declaration
 file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title=Indicates whether signing of a confidentiality declaration is needed to access a resource.

src/main/webapp/dataset-license-terms.xhtml

@@ -45,16 +45,20 @@
                                    <p class="help-block"><h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.description']}" escape="false"/></p>
                                    <p:selectOneRadio id="options" value="#{termsOfUseAndAccess.license}">
                                        <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCO']}" itemValue="CC0" />
+                                       <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.CCBY']}" itemValue="CCBY" />
                                        <f:selectItem itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.select.notCCO']}" itemValue="NONE" />
                                        <p:ajax update="touFragment" oncomplete="javascript:bind_bsui_components();" />
                                    </p:selectOneRadio>
                                </ui:fragment>
                                <ui:fragment rendered="#{termsOfUseAndAccess.license == 'CC0'}">
-                                   <p>#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.txt']} <img src="/resources/images/cc0.png" alt="#{bundle['file.cc0.icon.alttxt']}" class="waiver-CC0-inline"/></p>
+                                   <p><h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.txt']}" escape="false"/> <img src="/resources/images/cc0.png" alt="#{bundle['file.cc0.icon.alttxt']}" class="waiver-CC0-inline"/></p>
+                               </ui:fragment>
+                               <ui:fragment rendered="#{termsOfUseAndAccess.license == 'CCBY'}">
+                                   <p><h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.CCBY.txt']}" escape="false"/> <img src="/resources/images/ccby.png" alt="#{bundle['file.ccby.icon.alttxt']}" class="waiver-CC0-inline"/></p>
                                </ui:fragment>
                            </div>
                        </div>
-                       <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license != 'CC0'}">
+                       <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license == 'NONE'}">
                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"