Merge pull request IQSS#110 from mderuijter/dd-552-remove-reference-t…

…o-waiver DD-552 Remove references to "waiver" from code and UI
mderuijter · Sep 10, 2021 · 051f75d · 051f75d
2 parents 556be4a + 46f675e
commit 051f75d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...1-unique-constraint-storageidentifier.sql → ...1-unique-constraint-storageidentifier.sql b/...1-unique-constraint-storageidentifier.sql → ...1-unique-constraint-storageidentifier.sql
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
@@ -50,14 +50,14 @@
                                </ui:fragment>
                                <ui:fragment rendered="#{!empty termsOfUseAndAccess.license and empty DatasetPage.licenseId and empty editMode}">
                                        <p>
-                                           <img src="#{termsOfUseAndAccess.license.iconUrl}" title="#{termsOfUseAndAccess.license.shortDescription}" alt="#{bundle['file.icon.alttxt']}" style="max-width:90px;width:100%;max-height:30px;height:100%" />
+                                           <img src="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.iconUrl}" title="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}" style="display:none"  onload="this.style.display='inline'" />
                                            <a href="#{termsOfUseAndAccess.license.uri}" title="#{termsOfUseAndAccess.license.shortDescription}" target="_blank">#{termsOfUseAndAccess.license.name}</a>
                                        </p>
 
                                </ui:fragment>
                                <ui:fragment rendered="#{!empty DatasetPage.licenseId}">
                                    <p>
-                                       <img src="#{DatasetPage.getSelectedLicenseById().iconUrl}" title="#{DatasetPage.getSelectedLicenseById().shortDescription}" alt="#{bundle['file.icon.alttxt']}" style="max-width:90px;width:100%;max-height:30px;height:100%" />
+                                       <img src="#{DatasetPage.getSelectedLicenseById().iconUrl}" title="#{DatasetPage.getSelectedLicenseById().shortDescription}"  style="display:none"  onload="this.style.display='inline'" />
                                        <a href="#{DatasetPage.getSelectedLicenseById().uri}" title="#{DatasetPage.getSelectedLicenseById().shortDescription}" target="_blank">#{DatasetPage.getSelectedLicenseById().name}</a>
                                    </p>
                                </ui:fragment>

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -606,7 +606,7 @@
                                                     <td>
                                                         <ui:fragment rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
                                                             <p>
-                                                                <img src="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.iconUrl}" title="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}" alt="#{bundle['file.icon.alttxt']}" style="max-width:90px;width:100%;max-height:30px;height:100%" />
+                                                                <img src="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.iconUrl}" title="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}" style="display:none"  onload="this.style.display='inline'" />
                                                                 <a href="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.uri}" title="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}" target="_blank">#{DatasetPage.workingVersion.termsOfUseAndAccess.license.name}</a>
                                                             </p>
                                                         </ui:fragment>
@@ -1637,7 +1637,7 @@
                                     </ui:fragment>
                                     <ui:fragment rendered="#{!empty DatasetPage.workingVersion.termsOfUseAndAccess.license}">
                                         <p>
-                                            <img src="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.iconUrl}" alt="#{bundle['file.icon.alttxt']}" />
+                                            <img src="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.iconUrl}" title="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.shortDescription}" style="display:none"  onload="this.style.display='inline'" />
                                             <a href="#{DatasetPage.workingVersion.termsOfUseAndAccess.license.uri}" target="_blank">#{DatasetPage.workingVersion.termsOfUseAndAccess.license.name}</a>
                                         </p>
                                     </ui:fragment>