This repository has been archived by the owner on Apr 16, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #781 from utetrapp/feature/#768_add_impressum_2
Feature/#768 add impressum
- Loading branch information
Showing
22 changed files
with
156 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
38 changes: 38 additions & 0 deletions
38
app/webFrontend/src/app/legalnotice/legalnotice.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <!-- <div [innerHtml]="renderedContent"></div> --> | ||
|
|
||
| <h1>Impressum</h1> | ||
|
|
||
| <h3>Anbieter</h3> | ||
|
|
||
| <span> | ||
| <p>Hochschule Darmstadt – Fachbereich Informatik<br> | ||
| Haardtring 100<br> | ||
| D-64295 Darmstadt</p> | ||
| </span> | ||
|
|
||
| <h3>Leitung:</h3> | ||
| <p>Prof. Dr. Ute Trapp</p> | ||
|
|
||
|
|
||
| <h3>Gestaltung und Umsetzung:</h3> | ||
| <p>seit Master Projekt Systementwicklung SS 2017</p> | ||
|
|
||
| <h3>Inhalt</h3> | ||
| <span> | ||
| <p>Der Fachbereich Informatik ist um die Richtigkeit und Aktualität der auf dieser Internetpräsenz bereitgestellten Informationen bemüht. Der Fachbereich Informatik übernimmt jedoch keinerlei Gewähr für die Richtigkeit, Vollständigkeit und Aktualität der bereitgestellten Daten.</p> | ||
|
|
||
| <p>Sollten wiedererwartend doch fehlerhafte Angaben bereitgestellt werden,so übernimmt der Fachbereich Informatik keinerlei Haftung für durch die Nutzung dieser fehlerhaften Angaben enstandenen Schäden, egal ob materieller oder immaterieller Art.</p> | ||
| </span> | ||
|
|
||
| <h3>Links und Verweise</h3> | ||
| <span> | ||
| <p>Der Fachbereich Informatik hat keinen Einfluss auf die aktuelle oder zukünftige Gestaltung der verlinkten Internetseiten. Werden nach der Linksetzung Veränderungen an den verlinkten Inhalten vorgenommen, so distanziert sich der Fachbereich Informatik ausdrücklich von diesen Inhalten und möchte sich diese auch nicht zu Eigen machen.</p> | ||
|
|
||
| <p>Bei den verlinkten Internetseiten, die außerhalb des Verantwortungsbereiches des Fachbereichs Informatik liegen, würde eine Haftungsverpflichtung ausschließlich in dem Fall in Kraft treten, in dem der Fachbereich Informatik von den Inhalten Kenntnis hat und es ihm technisch möglich und zumutbar wäre, die Nutzung im Falle rechtswidriger Inhalte zu verhindern.</p> | ||
| </span> | ||
|
|
||
| <h3>Datenschutz</h3> | ||
| <p>Sollte auf den Internetseiten des Fachbereichs Informatik die Eingabe persönlicher Daten möglich sein, so erfolgt dies ausschliesslich auf freiwilliger Basis des Nutzers. Die dabei erfassten Daten werden ausschließlich für Verwaltungszwecke und nicht an Dritte weitergegeben.</p> | ||
|
|
||
| <h3>Rechtswirksamkeit</h3> | ||
| <p>Dieser Haftungsausschluss ist als Teil des Internetangebotes zu betrachten, von dem aus auf diese Seite verwiesen wurde. Sofern Teile oder einzelne Formulierungen dieses Textes der geltenden Rechtslage nicht, nicht mehr oder nicht vollständig entsprechen sollten, bleiben die übrigen Teile des Dokumentes in ihrem Inhalt und ihrer Gültigkeit davon unberührt.</p> |
File renamed without changes.
25 changes: 25 additions & 0 deletions
25
app/webFrontend/src/app/legalnotice/legalnotice.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { LegalnoticeComponent } from './legalnotice.component'; | ||
|
|
||
| describe('LegalnoticeComponent', () => { | ||
| let component: LegalnoticeComponent; | ||
| let fixture: ComponentFixture<LegalnoticeComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [ LegalnoticeComponent ] | ||
| }) | ||
| .compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(LegalnoticeComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| <div [innerHtml]="renderedContent"></div> |
Empty file.
12 changes: 6 additions & 6 deletions
12
...src/app/imprint/imprint.component.spec.ts → ...src/app/privacy/privacy.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { Component, OnInit, ViewChild } from '@angular/core'; | ||
| import {ImprintAndInfoService} from '../shared/services/imprint-and-info.service'; | ||
| import {TitleService} from '../shared/services/title.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-privacy', | ||
| templateUrl: './privacy.component.html', | ||
| styleUrls: ['./privacy.component.scss'] | ||
| }) | ||
| export class PrivacyComponent implements OnInit { | ||
| renderedContent: string; | ||
| constructor(private imprintService: ImprintAndInfoService, | ||
| private titleService: TitleService) { } | ||
|
|
||
| ngOnInit() { | ||
| this.titleService.setTitle('Privacy'); | ||
| this.getData(); | ||
| } | ||
|
|
||
| async getData() { | ||
| this.renderedContent = await this.imprintService.loadConfig('privacy'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.