Commit ef7d36a4 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'devel_11.1.x-clean' of...

Merge branch 'devel_11.1.x-clean' of https://git-r3lab.uni.lu/piotr.gawron/minerva into devel_11.1.x-clean
parents 2622dc9b 460e166d
......@@ -234,8 +234,11 @@ OverlayPanel.prototype.openEditOverlayDialog = function (overlay) {
var consentCheckbox = document.createElement("input");
consentCheckbox.type = "checkbox";
consentCheckbox.checked = overlay.isGoogleLicenseConsent();
row = guiUtils.createTableRow([guiUtils.createLabel("I am aware that this map is displayed under the terms of the <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>license of Google Maps Platform</a> and I agree to these terms. " +
"In particular, I warrant that this dataset does not contain Protected Health Information (as defined in and subject to HIPAA). "), consentCheckbox]);
row = guiUtils.createTableRow([guiUtils.createLabel("I am aware that if this map is displayed using Google Maps API, " +
"it falls under their license <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>" +
"https://cloud.google.com/maps-platform/terms/</a>, to which I agree. I warrant that this dataset contains no " +
"Protected Health Information (as defined in and subject to HIPAA)."), consentCheckbox]);
content.appendChild(row);
var buttons = [{
......@@ -461,8 +464,11 @@ OverlayPanel.prototype.openAddOverlayDialog = function () {
var consentCheckbox = document.createElement("input");
consentCheckbox.type = "checkbox";
content.appendChild(consentCheckbox);
content.appendChild(guiUtils.createLabel("I am aware that this map is displayed under the terms of the <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>license of Google Maps Platform</a> and I agree to these terms. " +
"In particular, I warrant that this dataset does not contain Protected Health Information (as defined in and subject to HIPAA). "));
content.appendChild(guiUtils.createLabel("I am aware that if this map is displayed using Google Maps API, " +
"it falls under their license <a href='https://cloud.google.com/maps-platform/terms/' target='_blank'>" +
"https://cloud.google.com/maps-platform/terms/</a>, to which I agree. I warrant that this dataset contains no " +
"Protected Health Information (as defined in and subject to HIPAA)."));
var buttons = [{
......
......@@ -22,7 +22,7 @@
<!-- <p:menuitem value="Genome"
url="/admin/genomes.xhtml?id=#{mapMB.currentMapId}"/> -->
<p:menuitem value="Manual"
onclick="window.open('#{request.contextPath}/javax.faces.resource/admin_guide.pdf.xhtml?ln=other','_admin_manual_');"/>
onclick="window.open('#{request.contextPath}/javax.faces.resource/user_guide.pdf.xhtml?ln=other','_admin_manual_');"/>
<p:menuitem value="Logout" actionListener="#{userMB.doLogout}"
oncomplete="location.reload();"
style="position: absolute; right: 6px; color:#ffffff; "/>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment