diff --git a/src/atlasViewer/atlasViewer.component.ts b/src/atlasViewer/atlasViewer.component.ts
index 2d38266914c0388c162b18a24861a9dae9998e9e..a7e105c3daf488896d2e3c065a6871268717e903 100644
--- a/src/atlasViewer/atlasViewer.component.ts
+++ b/src/atlasViewer/atlasViewer.component.ts
@@ -363,6 +363,11 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
}) as NgLayerInterface)
}
+ cookieClickedOk(){
+ this.modalService.hide(1)
+ localStorage.setItem('cookies', 'agreed');
+ }
+
panelAnimationEnd(){
if( this.nehubaContainer && this.nehubaContainer.nehubaViewer && this.nehubaContainer.nehubaViewer.nehubaViewer )
diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html
index 32d60aee3c831b52c5544a97a4ca13250d48c5ac..bfebb0b769fa274d3b2bc1c7d2107b180ca65832 100644
--- a/src/atlasViewer/atlasViewer.template.html
+++ b/src/atlasViewer/atlasViewer.template.html
@@ -91,7 +91,7 @@
</signin-modal>
</ng-template>
<ng-template #cookieAgreementComponent>
- <cookie-agreement>
+ <cookie-agreement (clickedOk)="cookieClickedOk()">
</cookie-agreement>
</ng-template>
diff --git a/src/ui/cookieAgreement/cookieAgreement.component.ts b/src/ui/cookieAgreement/cookieAgreement.component.ts
index d780619a573516d8b6ebe269614dced1eb9d1053..b35587c874e85a247f22841e7aad707f6c984a93 100644
--- a/src/ui/cookieAgreement/cookieAgreement.component.ts
+++ b/src/ui/cookieAgreement/cookieAgreement.component.ts
@@ -1,20 +1,20 @@
-import { Component } from '@angular/core'
-import { BsModalService } from 'ngx-bootstrap/modal/bs-modal.service';
+import { Component, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core'
@Component({
- selector: 'cookie-agreement',
- templateUrl: './cookieAgreement.template.html',
- styleUrls: [
- './cookieAgreement.style.css'
- ]
+ selector: 'cookie-agreement',
+ templateUrl: './cookieAgreement.template.html',
+ styleUrls: [
+ './cookieAgreement.style.css'
+ ],
+ changeDetection: ChangeDetectionStrategy.OnPush
})
export class CookieAgreement {
- showMore = false;
+ showMore = false;
- constructor(private modalService: BsModalService,) {}
+ @Output()
+ clickedOk: EventEmitter<null> = new EventEmitter()
- AgreeCookies() {
- localStorage.setItem('cookies', 'agreed');
- this.modalService.hide(1);
+ agreeCookies() {
+ this.clickedOk.emit(null)
}
}
\ No newline at end of file
diff --git a/src/ui/cookieAgreement/cookieAgreement.style.css b/src/ui/cookieAgreement/cookieAgreement.style.css
index 07f2a4c1ffac904d7c397e164a8bcf86aefbb043..00d151b4fc8ddaa17105bb9641e175a02072758d 100644
--- a/src/ui/cookieAgreement/cookieAgreement.style.css
+++ b/src/ui/cookieAgreement/cookieAgreement.style.css
@@ -1,14 +1,10 @@
-@import url('https://fonts.googleapis.com/css?family=Open+Sans');
-
.cookie-text {
text-align: justify;
- font-family: 'Open Sans', sans-serif;
}
.cookie-text-small {
text-align: justify;
font-size: 11px;
- font-family: 'Open Sans', sans-serif;
}
.show-more-button-on-cookie-agreement {
diff --git a/src/ui/cookieAgreement/cookieAgreement.template.html b/src/ui/cookieAgreement/cookieAgreement.template.html
index f0706f5c5b6abf5d36c447ec18838ab1361cb962..ff5f8c2c31b5a6760a7eacfa56dc4426d5e431e3 100644
--- a/src/ui/cookieAgreement/cookieAgreement.template.html
+++ b/src/ui/cookieAgreement/cookieAgreement.template.html
@@ -1,37 +1,66 @@
<div>
- <p class="cookie-text">Volume Brain Anchoring (VoluBA) uses ‘cookies’ (text files placed on your computer) to verify login details,
- remember user choices and preferences, and in some instances determine site permissions. Cookies also provide,
- in anonymous form, the number of visitors accessing the HBP Public Website, features users access during website visits,
- and the general location of the user based on IP address.</p>
- <p class="cookie-text">VoluBA uses at least the following cookies:</p>
- <p class="cookie-text"><strong>connect.sid</strong> : verify login details</p>
- <p class="cookie-text">To find out more about cookies, including how to determine the cookies that have been set on your computer and how to manage
- or delete them, visit <a href="www.aboutcookies.org">www.aboutcookies.org </a> .</p>
- <p class="cookie-text">To opt-out of being tracked by Google Analytics across all websites, visit
- <a href="http://tools.google.com/dlpage/gaoptout">http://tools.google.com/dlpage/gaoptout</a> .</p>
+ <p class="cookie-text">Interactive Viewer uses ‘cookies’ (text files placed on your computer) to verify login details,
+ remember user choices and preferences, and in some instances determine site permissions. Cookies also provide,
+ in anonymous form, the number of visitors accessing the HBP Public Website, features users access during website
+ visits,
+ and the general location of the user based on IP address.</p>
+ <p class="cookie-text">Interactive Viewer uses at least the following cookies:</p>
+ <p class="cookie-text"><strong>connect.sid</strong> : verify login details</p>
+ <p class="cookie-text">To find out more about cookies, including how to determine the cookies that have been set on
+ your computer and how to manage
+ or delete them, visit <a href="www.aboutcookies.org">www.aboutcookies.org </a> .</p>
+ <p class="cookie-text">To opt-out of being tracked by Google Analytics across all websites, visit
+ <a href="http://tools.google.com/dlpage/gaoptout">http://tools.google.com/dlpage/gaoptout</a> .</p>
- <button class="btn btn-outline-secondary show-more-button-on-cookie-agreement" (click) = "showMore = !showMore">Show {{showMore? "less" : "more"}}</button>
-
- <div *ngIf = "showMore">
- <div><div class="cookie-text-small"><strong>Data controller(s)</strong>: VoluBA is the data controller for your login information.
- </div><div class="cookie-text-small"><strong>List of partners responsible</strong>:
- FZJ-INM1 <a href="mailto:inm1-bda@fz-juelich.de">inm1-bda@fz-juelich.de</a></div><div class="cookie-text-small"><strong>HBP Data Protection Officer (HBP DPO)</strong>: You can find out about HBP Data Protection policies here:
- <a href="https://www.humanbrainproject.eu/en/social-ethical-reflective/ethics-support/data-protection/">https://www.humanbrainproject.eu/en/social-ethical-reflective/ethics-support/data-protection/</a>
- and you can contact HBP Data Protection Officer at <a href="mailto:data.protection@humanbrainproject.eu">data.protection@humanbrainproject.eu</a></div><div class="cookie-text-small"><strong>Legal basis for data processing</strong>:
- consent
- </div><div class="cookie-text-small"><strong>General categories of personal data collected</strong>:
- Name, ORC ID, JWT ID Token
- </div><div class="cookie-text-small"><strong>Data shared within the HBP Consortium</strong>:
- JWT ID Token is shared with ChunMa (Chunk Master), enabling upload and retrieval of user uploaded data.
- </div><div class="cookie-text-small"><strong>Data Shared with Third Parties</strong>: none
- </div><div class="cookie-text-small"><strong>Transfer of any personal data to third countries</strong>: Data are stored in HBP infrastructure, and will not be transferred to Third countries.
- </div><div class="cookie-text-small"><strong>Retention periods</strong>: 24 hours
- </div><div class="cookie-text-small"><strong>Lodging a complaint</strong>:
- The HBP DPO and HBP partners will make every reasonable effort to address your data protection concerns. However, you have a right to lodge a complaint with a data protection authority. Contact information for the European Data Protection Board and EU DPAs are available here:
- <ul><li><a href="http://ec.europa.eu/newsroom/article29/item-detail.cfm?item_id=612080">http://ec.europa.eu/newsroom/article29/item-detail.cfm?item_id=612080</a></li><li data-v-fc2c56ac=""><a data-v-fc2c56ac="" href="https://edpb.europa.eu/about-edpb/board/members_en">https://edpb.europa.eu/about-edpb/board/members_en</a></li></ul></div></div>
+ <button class="btn btn-outline-secondary show-more-button-on-cookie-agreement" (click)="showMore = !showMore">Show
+ {{showMore? "less" : "more"}}</button>
+
+ <div *ngIf="showMore">
+ <div>
+ <div class="cookie-text-small"><strong>Data controller(s)</strong>: Interactive Viewer is the data controller for
+ your login information.
+ </div>
+ <div class="cookie-text-small"><strong>List of partners responsible</strong>:
+ FZJ-INM1 <a href="mailto:inm1-bda@fz-juelich.de">inm1-bda@fz-juelich.de</a></div>
+ <div class="cookie-text-small"><strong>HBP Data Protection Officer (HBP DPO)</strong>: You can find out about HBP
+ Data Protection policies here:
+ <a
+ href="https://www.humanbrainproject.eu/en/social-ethical-reflective/ethics-support/data-protection/">https://www.humanbrainproject.eu/en/social-ethical-reflective/ethics-support/data-protection/</a>
+ and you can contact HBP Data Protection Officer at <a
+ href="mailto:data.protection@humanbrainproject.eu">data.protection@humanbrainproject.eu</a></div>
+ <div class="cookie-text-small"><strong>Legal basis for data processing</strong>:
+ consent
+ </div>
+ <div class="cookie-text-small"><strong>General categories of personal data collected</strong>:
+ Name, ORC ID, JWT ID Token
+ </div>
+ <div class="cookie-text-small"><strong>Data shared within the HBP Consortium</strong>:
+ JWT ID Token is shared with ChunMa (Chunk Master), enabling upload and retrieval of user uploaded data.
+ </div>
+ <div class="cookie-text-small"><strong>Data Shared with Third Parties</strong>: none
+ </div>
+ <div class="cookie-text-small"><strong>Transfer of any personal data to third countries</strong>: Data are stored
+ in HBP infrastructure, and will not be transferred to Third countries.
+ </div>
+ <div class="cookie-text-small"><strong>Retention periods</strong>: 24 hours
+ </div>
+ <div class="cookie-text-small"><strong>Lodging a complaint</strong>:
+ The HBP DPO and HBP partners will make every reasonable effort to address your data protection concerns.
+ However, you have a right to lodge a complaint with a data protection authority. Contact information for the
+ European Data Protection Board and EU DPAs are available here:
+ <ul>
+ <li><a
+ href="http://ec.europa.eu/newsroom/article29/item-detail.cfm?item_id=612080">http://ec.europa.eu/newsroom/article29/item-detail.cfm?item_id=612080</a>
+ </li>
+ <li data-v-fc2c56ac=""><a data-v-fc2c56ac=""
+ href="https://edpb.europa.eu/about-edpb/board/members_en">https://edpb.europa.eu/about-edpb/board/members_en</a>
+ </li>
+ </ul>
+ </div>
</div>
+ </div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-primary" (click) = "AgreeCookies()">Ok</button>
+ <button type="button" class="btn btn-primary" (click)="agreeCookies()">Ok</button>
</div>
\ No newline at end of file