Skip to content
Snippets Groups Projects
Commit bb8abc18 authored by Xiao Gui's avatar Xiao Gui
Browse files

chore: removed uncessary css 

chore: relayout
parent 9f96ab8e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/atlasViewer/atlasViewer.template.html
+ 5
− 1
View file @ bb8abc18
......@@ -91,8 +91,12 @@
</signin-modal>
</ng-template>
<ng-template #cookieAgreementComponent>
<cookie-agreement (clickedOk)="cookieClickedOk()">
<cookie-agreement>
</cookie-agreement>
<div class="modal-footer">
<button type="button" class="btn btn-primary" (click)="cookieClickedOk()">Ok</button>
</div>
</ng-template>
<div class="d-flex flex-column" minReq *ngIf="!meetsRequirement">
......
src/ui/cookieAgreement/cookieAgreement.component.ts
+ 1
− 8
View file @ bb8abc18
import { Component, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core'
import { Component, ChangeDetectionStrategy } from '@angular/core'
@Component({
selector: 'cookie-agreement',
......@@ -10,11 +10,4 @@ import { Component, Output, EventEmitter, ChangeDetectionStrategy } from '@angul
})
export class CookieAgreement {
showMore = false;
@Output()
clickedOk: EventEmitter<null> = new EventEmitter()
agreeCookies() {
this.clickedOk.emit(null)
}
}
\ No newline at end of file
src/ui/cookieAgreement/cookieAgreement.style.css
+ 0
− 14
View file @ bb8abc18
.cookie-text {
text-align: justify;
}
.cookie-text-small {
text-align: justify;
font-size: 11px;
}
.show-more-button-on-cookie-agreement {
width: 100%;
margin-bottom: 20px;
outline: none;
}
\ No newline at end of file
src/ui/cookieAgreement/cookieAgreement.template.html
+ 87
− 46
View file @ bb8abc18
<div>
<p class="cookie-text">Interactive Viewer uses ‘cookies’ (text files placed on your computer) to verify login details,
<p>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
visits, and the general location of the user based on IP address.</p>
<p>Interactive Viewer uses at least the following cookies:</p>
<p><strong>connect.sid</strong> : verify login details</p>
<p>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
<p>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-info show-more-button-on-cookie-agreement" (click)="showMore = !showMore">Show
<button class="btn btn-outline-info btn-block mb-2" (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.
<small>
<div>
<strong>Data controller(s):</strong>
<span>
Interactive Viewer is the data controller for your login information.
</span>
</div>
<div>
<strong>List of partners responsible:</strong>
<span>
FZJ-INM1 <a href="mailto:inm1-bda@fz-juelich.de">inm1-bda@fz-juelich.de</a>
</span>
</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>
<strong>HBP Data Protection Officer (HBP DPO):</strong>
<span>
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>
</span>
</div>
<div class="cookie-text-small"><strong>General categories of personal data collected</strong>:
Name, ORC ID, JWT ID Token
<div>
<strong>Legal basis for data processing:</strong>
<span>
consent
</span>
</div>
<div>
<strong>General categories of personal data collected:</strong>
<span>
Name, ORC ID, JWT ID Token
</span>
</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>
<strong>Data shared within the HBP Consortium:</strong>
<span>
JWT ID Token is shared with ChunMa (Chunk Master), enabling upload and retrieval of user uploaded data.
</span>
</div>
<div class="cookie-text-small"><strong>Data Shared with Third Parties</strong>: none
<div>
<strong>Data Shared with Third Parties:</strong>
<span>none</span>
</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>
<strong>Transfer of any personal data to third countries:</strong>
<span>
Data are stored in HBP infrastructure, and will not be transferred to Third countries.
</span>
</div>
<div class="cookie-text-small"><strong>Retention periods</strong>: 24 hours
<div>
<strong>Retention periods:</strong>
<div>
24 hours
</div>
</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>
<strong>Lodging a complaint:</strong>
<span>
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>
</span>
</div>
</div>
</small>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" (click)="agreeCookies()">Ok</button>
</div>
\ No newline at end of file
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