From 3641668bd716f50c52448957041bbd162a89c59d Mon Sep 17 00:00:00 2001
From: Marco Herzog <marco.herzog@mni.thm.de>
Date: Wed, 11 Sep 2019 13:24:33 +0200
Subject: [PATCH] Revert previous changes to data-protection and imprint dialog
---
.../_dialogs/cookies/cookies.component.html | 10 ++--
.../data-protection.component.html | 50 ++++++-------------
.../data-protection.component.scss | 36 -------------
.../_dialogs/imprint/imprint.component.html | 46 +++++------------
src/assets/i18n/cookies/cookies-en.html | 28 +++++------
.../data-protection/data-protection-de.html | 4 --
.../data-protection/data-protection-en.html | 4 --
src/assets/i18n/home/de.json | 5 ++
src/assets/i18n/home/en.json | 5 ++
src/assets/i18n/imprint/imprint-de.html | 2 +-
src/assets/i18n/imprint/imprint-en.html | 2 +-
src/styles.scss | 1 -
12 files changed, 59 insertions(+), 134 deletions(-)
diff --git a/src/app/components/home/_dialogs/cookies/cookies.component.html b/src/app/components/home/_dialogs/cookies/cookies.component.html
index 5beae970b..534fec5f1 100644
--- a/src/app/components/home/_dialogs/cookies/cookies.component.html
+++ b/src/app/components/home/_dialogs/cookies/cookies.component.html
@@ -5,10 +5,12 @@
</button>
</h1>
- <mat-divider></mat-divider>
- <app-cookies-de *ngIf="currentLang=='de'"></app-cookies-de>
- <app-cookies-en *ngIf="currentLang=='en'"></app-cookies-en>
- <mat-divider></mat-divider>
+ <mat-divider></mat-divider>
+ <mat-dialog-content>
+ <app-cookies-de *ngIf="currentLang=='de'"></app-cookies-de>
+ <app-cookies-en *ngIf="currentLang=='en'"></app-cookies-en>
+ </mat-dialog-content>
+ <mat-divider></mat-divider>
<mat-dialog-actions class="action-container">
<span class="spacer"></span>
diff --git a/src/app/components/home/_dialogs/data-protection/data-protection.component.html b/src/app/components/home/_dialogs/data-protection/data-protection.component.html
index efd29b3e4..b87fcd89a 100644
--- a/src/app/components/home/_dialogs/data-protection/data-protection.component.html
+++ b/src/app/components/home/_dialogs/data-protection/data-protection.component.html
@@ -1,42 +1,24 @@
-<!--
- <h1 mat-dialog-title>{{ 'data-protection.title' | translate }} </h1>
--->
+ <h1 mat-dialog-title>{{ 'data-protection.title' | translate }} </h1>
-<div class="container">
- <div class="content_container">
+ <mat-divider></mat-divider>
- <mat-divider></mat-divider>
+ <mat-dialog-content>
+ <app-data-protection-en *ngIf="currentLang=='en'"></app-data-protection-en>
+ <app-data-protection-de *ngIf="currentLang=='de'"></app-data-protection-de>
+ </mat-dialog-content>
- <div class="scroll_container">
+ <mat-divider></mat-divider>
- <div class="inner_scroll_container">
-
- <h1 mat-dialog-title>{{ 'data-protection.title' | translate }} </h1>
-
- <app-data-protection-en *ngIf="currentLang=='en'"></app-data-protection-en>
- <app-data-protection-de *ngIf="currentLang=='de'"></app-data-protection-de>
-
- </div>
-
- </div>
-
- <mat-divider></mat-divider>
+ <mat-dialog-actions class="action-container">
+ <span class="spacer"></span>
+ <button mat-raised-button [mat-dialog-close] (click)="accept()" aria-labelledby="consent-label">{{ 'data-protection.consent' | translate }} </button>
+ <span class="pad"></span>
+ <button mat-stroked-button [mat-dialog-close] (click)="decline()" aria-labelledby="deny-label"> {{ 'data-protection.deny' | translate }} </button>
+ </mat-dialog-actions>
+ <div class="visually-hidden">
+ <div id="consent-label">{{ 'data-protection.consent-label' | translate }}</div>
+ <div id="deny-label">{{ 'data-protection.deny-label' | translate }}</div>
</div>
- <div class="button_container">
-
- <div mat-dialog-actions class="action-container">
- <span class="spacer"></span>
- <button mat-raised-button [mat-dialog-close] (click)="accept()" aria-labelledby="consent-label">{{ 'data-protection.consent' | translate }} </button>
- <span class="pad"></span>
- <button mat-stroked-button [mat-dialog-close] (click)="decline()" aria-labelledby="deny-label"> {{ 'data-protection.deny' | translate }} </button>
- </div>
- <div class="visually-hidden">
- <div id="consent-label">{{ 'data-protection.consent-label' | translate }}</div>
- <div id="deny-label">{{ 'data-protection.deny-label' | translate }}</div>
- </div>
-
- </div>
-</div>
diff --git a/src/app/components/home/_dialogs/data-protection/data-protection.component.scss b/src/app/components/home/_dialogs/data-protection/data-protection.component.scss
index 309c518d3..a875a1cd3 100644
--- a/src/app/components/home/_dialogs/data-protection/data-protection.component.scss
+++ b/src/app/components/home/_dialogs/data-protection/data-protection.component.scss
@@ -20,39 +20,3 @@ div {
color: var(--on-surface);
}
-.action-container{
- height:50px;
-}
-
-.container{
- width:100%;
- height:100%;
- position:relative;
- left:0px;
- top:0px;
-}
-
-.content_container{
- width:100%;
- height:calc( 100% - 50px );
- float:left;
-}
-
-.scroll_container{
- width:100%;
- height:100%;
- overflow-y:auto;
-}
-
-.inner_scroll_container{
- width:100%;
- margin-top:15px;
- float:left;
-}
-
-.button_container{
- width:100%;
- height:50px;
- float:left;
-}
-
diff --git a/src/app/components/home/_dialogs/imprint/imprint.component.html b/src/app/components/home/_dialogs/imprint/imprint.component.html
index ea1a323d7..fda3902e4 100644
--- a/src/app/components/home/_dialogs/imprint/imprint.component.html
+++ b/src/app/components/home/_dialogs/imprint/imprint.component.html
@@ -1,40 +1,20 @@
+<h1 mat-dialog-title>{{ 'imprint.title' | translate }} </h1>
+<mat-divider></mat-divider>
-<div class="container">
- <div class="content_container">
+<mat-dialog-content>
+ <app-imprint-en *ngIf="currentLang=='en'"></app-imprint-en>
+ <app-imprint-de *ngIf="currentLang=='de'"></app-imprint-de>
+</mat-dialog-content>
- <mat-divider></mat-divider>
+<mat-divider></mat-divider>
- <div class="scroll_container">
-
- <div class="inner_scroll_container">
-
- <h1 mat-dialog-title>{{ 'imprint.title' | translate }} </h1>
-
- <app-imprint-en *ngIf="currentLang=='en'"></app-imprint-en>
- <app-imprint-de *ngIf="currentLang=='de'"></app-imprint-de>
-
- </div>
-
- </div>
-
- <mat-divider></mat-divider>
-
- <div class="visually-hidden">
- <div id="consent-label">{{ 'data-protection.consent-label' | translate }}</div>
- <div id="deny-label">{{ 'data-protection.deny-label' | translate }}</div>
- </div>
- </div>
- <div class="button_container">
-
- <div mat-dialog-actions class="action-container">
- <span class="spacer"></span>
- <button mat-raised-button [mat-dialog-close] aria-labelledby="close-label">{{ 'imprint.close' | translate }} </button>
- </div>
+<div mat-dialog-actions class="action-container">
+ <span class="spacer"></span>
+ <button mat-raised-button [mat-dialog-close] aria-labelledby="close-label">{{ 'imprint.close' | translate }} </button>
+</div>
- <div class="visually-hidden">
- <div id="close-label">{{ 'imprint.close-label'| translate }}</div>
- </div>
- </div>
+<div class="visually-hidden">
+ <div id="close-label">{{ 'imprint.close-label'| translate }}</div>
</div>
diff --git a/src/assets/i18n/cookies/cookies-en.html b/src/assets/i18n/cookies/cookies-en.html
index e5d02104d..f6b2ecec2 100644
--- a/src/assets/i18n/cookies/cookies-en.html
+++ b/src/assets/i18n/cookies/cookies-en.html
@@ -1,16 +1,12 @@
-<div style="width:100%;">
-
- <p>
- We save you long explanations why "frag.jetzt" uses cookies.
- Among other things, this hint would appear every time you visit.<br>
- <br>
- So much is said here:
- We don't track you.
- We do not give out any data for advertising purposes.
- You can delete your account at any time without asking.<br>
- <br>
- You can find all other legal information on the privacy page.<br>
- <br>
- </p>
-
-</div>
+<p>
+ We save you long explanations why "frag.jetzt" uses cookies.
+ Among other things, this hint would appear every time you visit.<br>
+ <br>
+ So much is said here:
+ We don't track you.
+ We do not give out any data for advertising purposes.
+ You can delete your account at any time without asking.<br>
+ <br>
+ You can find all other legal information on the privacy page.<br>
+ <br>
+</p>
diff --git a/src/assets/i18n/data-protection/data-protection-de.html b/src/assets/i18n/data-protection/data-protection-de.html
index 848512835..60eae919e 100644
--- a/src/assets/i18n/data-protection/data-protection-de.html
+++ b/src/assets/i18n/data-protection/data-protection-de.html
@@ -1,5 +1,3 @@
-<div style="height:100%;">
-
<h2>Testüberschrift Level 2</h2>
<p>Dies hier ist ein Beispieltext über fünfzig Wörter. Es dient zur Anschauung von
Textlängen. Denn nicht jeder
@@ -53,5 +51,3 @@
<p>Lorem Ipsmum dolor it setum don nocter don soper dolor it setum don nocter don soperdolor
it setum don nocter don
soperdolor it setum don nocter don soperdolor it setum don nocter don soper</p>
-
-</div>
diff --git a/src/assets/i18n/data-protection/data-protection-en.html b/src/assets/i18n/data-protection/data-protection-en.html
index f0dfa7469..1c7d9d457 100644
--- a/src/assets/i18n/data-protection/data-protection-en.html
+++ b/src/assets/i18n/data-protection/data-protection-en.html
@@ -1,5 +1,3 @@
-<div style="height:100%;">
-
<h2>Testheading Level 2</h2>
<p>Lorem Ipsmum dolor it setum conventionally nocter don soper dolor it setum don
nocter don soperdolor it setum don nocter don soperdolor it setum don nocter don soperdolor it setum don nocter
@@ -34,5 +32,3 @@
<p>Lorem Ipsmum dolor it setum don nocter don soper dolor it setum don nocter don soperdolor
it setum don nocter don
soperdolor it setum don nocter don soperdolor it setum don nocter don soper</p>
-
-</div>
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 3ae6964fb..85a6d1216 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -6,6 +6,11 @@
"decline-label": "Lehnt die Verwendung von Cookies ab und verlässt die Anwendung.",
"info-label": "Öffnet ein Dialogfenster mit der frag.jetzt Datenschutzerklärung."
},
+ "overlay": {
+ "message": "Du hast die benutzung von Cookies für diese Anwendung nicht erlaubt. Solange kannst du diese Seite nicht nutzen.",
+ "change": "Einstellung ändern",
+ "change-label": "Öffnet den Dialog mit den Cookie Einstellungen"
+ },
"data-protection": {
"consent": "Akzeptieren",
"consent-label": "Akzeptiert die Datenschutzrichtlinien der Anwendung.",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index ff2f59a94..91eabbaea 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -6,6 +6,11 @@
"decline-label": "Declines cookie usage and exits the app",
"info-label": "Opens a dialog with the frag.jetzt privacy statement"
},
+ "overlay": {
+ "message": "You have declined cookie usage for this app, thus you can not use it for the time being.",
+ "change": "Change settings",
+ "change-label": "Open the cookie setting dialog"
+ },
"data-protection": {
"consent": "Accept",
"consent-label": "Accept the app's privacy policy and close dialog",
diff --git a/src/assets/i18n/imprint/imprint-de.html b/src/assets/i18n/imprint/imprint-de.html
index 48b575cd8..8b46ffad1 100644
--- a/src/assets/i18n/imprint/imprint-de.html
+++ b/src/assets/i18n/imprint/imprint-de.html
@@ -1,4 +1,4 @@
-<div class="height:100%;">
+<div class="max-height">
<p>
Der Betrieb der Webanwendung »frag.jetzt« ist eine kostenlose Dienstleistung
diff --git a/src/assets/i18n/imprint/imprint-en.html b/src/assets/i18n/imprint/imprint-en.html
index c195d4180..8b46ffad1 100644
--- a/src/assets/i18n/imprint/imprint-en.html
+++ b/src/assets/i18n/imprint/imprint-en.html
@@ -1,4 +1,4 @@
-<div style="height:100%;">
+<div class="max-height">
<p>
Der Betrieb der Webanwendung »frag.jetzt« ist eine kostenlose Dienstleistung
diff --git a/src/styles.scss b/src/styles.scss
index c564d42f8..5e5759ff5 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -62,4 +62,3 @@
.pad{
flex-grow:0.05;
}
-
--
GitLab