From 17d24e766a810a8fe48ab4adf31b457d7be614fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Fri, 27 Aug 2021 16:58:49 +0200
Subject: [PATCH] Home html dynamic content
---
.../components/instance/home-form-group.component.html | 4 ----
.../admin/components/instance/instance-form.component.ts | 1 -
.../app/instance/home/components/welcome.component.html | 7 +------
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/client/src/app/admin/components/instance/home-form-group.component.html b/client/src/app/admin/components/instance/home-form-group.component.html
index cb13024a..15984e1d 100644
--- a/client/src/app/admin/components/instance/home-form-group.component.html
+++ b/client/src/app/admin/components/instance/home-form-group.component.html
@@ -7,10 +7,6 @@
</select>
</div>
<div formGroupName="home_config">
- <div class="form-group">
- <label for="home_component_title">Title</label>
- <input type="text" class="form-control" id="home_component_title" formControlName="home_component_title">
- </div>
<div class="form-group">
<label for="home_component_text">Text</label>
<textarea class="form-control" id="home_component_text" formControlName="home_component_text" rows="3"></textarea>
diff --git a/client/src/app/admin/components/instance/instance-form.component.ts b/client/src/app/admin/components/instance/instance-form.component.ts
index de94cda8..c7ab9a4d 100644
--- a/client/src/app/admin/components/instance/instance-form.component.ts
+++ b/client/src/app/admin/components/instance/instance-form.component.ts
@@ -33,7 +33,6 @@ export class InstanceFormComponent implements OnInit {
public homeFormGroup = new FormGroup({
home_component: new FormControl('WelcomeComponent', [Validators.required]),
home_config: new FormGroup({
- home_component_title: new FormControl('ANIS', [Validators.required]),
home_component_text: new FormControl(`AstroNomical Information System is a generic web tool aimed
at facilitating and homogenizing the implementation of astronomical data. It allows
the fast implementation of a project data exchange platform in a dedicated information system.`, [Validators.required]),
diff --git a/client/src/app/instance/home/components/welcome.component.html b/client/src/app/instance/home/components/welcome.component.html
index b3ad0896..0a1998a5 100644
--- a/client/src/app/instance/home/components/welcome.component.html
+++ b/client/src/app/instance/home/components/welcome.component.html
@@ -2,10 +2,5 @@
<div class="col-6 col-md-4 order-md-2 mx-auto text-center">
<img class="img-fluid mb-3 mb-md-0" src="{{ getLogoSrc() }}" alt="">
</div>
- <div class="col-md-8 order-md-1 text-justify pr-md-5">
- <h1 class="mb-3">{{ instance.config.home.home_config.home_component_title }}</h1>
- <p class="lead">
- {{ instance.config.home.home_config.home_component_text }}
- </p>
- </div>
+ <div class="col-md-8 order-md-1 text-justify pr-md-5" [innerHtml]="instance.config.home.home_config.home_component_text"></div>
</div>
\ No newline at end of file
--
GitLab