Skip to content
Snippets Groups Projects
Commit 33f1d5a4 authored by François Agneray's avatar François Agneray
Browse files

Dynamic favicon from instance config (admin)

parent f031b34c
No related branches found
No related tags found
1 merge request!29Develop
...@@ -19,5 +19,14 @@ ...@@ -19,5 +19,14 @@
[rootDirectoryIsLoaded]="rootDirectoryIsLoaded" [rootDirectoryIsLoaded]="rootDirectoryIsLoaded"
(loadRootDirectory)="loadRootDirectory.emit($event)"> (loadRootDirectory)="loadRootDirectory.emit($event)">
</app-file-select-form-control> </app-file-select-form-control>
<app-file-select-form-control
[form]="form"
[controlName]="'design_favicon'"
[controlLabel]="'Favicon'"
[rootDirectory]="rootDirectory"
[rootDirectoryIsLoading]="rootDirectoryIsLoading"
[rootDirectoryIsLoaded]="rootDirectoryIsLoaded"
(loadRootDirectory)="loadRootDirectory.emit($event)">
</app-file-select-form-control>
</accordion-group> </accordion-group>
</form> </form>
...@@ -26,7 +26,8 @@ export class InstanceFormComponent implements OnInit { ...@@ -26,7 +26,8 @@ export class InstanceFormComponent implements OnInit {
public designFormGroup = new FormGroup({ public designFormGroup = new FormGroup({
design_color: new FormControl('#7AC29A', [Validators.required]), design_color: new FormControl('#7AC29A', [Validators.required]),
design_logo: new FormControl('') design_logo: new FormControl(''),
design_favicon: new FormControl('')
}); });
public searchFormGroup = new FormGroup({ public searchFormGroup = new FormGroup({
......
...@@ -62,7 +62,9 @@ export class InstanceComponent implements OnInit, OnDestroy { ...@@ -62,7 +62,9 @@ export class InstanceComponent implements OnInit, OnDestroy {
if (instance.config.documentation.documentation_allowed) { if (instance.config.documentation.documentation_allowed) {
this.links.push({ label: 'Documentation', icon: 'fas fa-question', routerLink: 'documentation' }); this.links.push({ label: 'Documentation', icon: 'fas fa-question', routerLink: 'documentation' });
} }
this.favIcon.href = `assets/${instance.name}-favicon.ico`; if (instance.config.design.design_favicon !== '') {
this.favIcon.href = `${this.config.apiUrl}/download-instance-file/${instance.name}/${instance.config.design.design_favicon}`;
}
}) })
} }
......
...@@ -15,6 +15,7 @@ export interface Instance { ...@@ -15,6 +15,7 @@ export interface Instance {
design: { design: {
design_color: string; design_color: string;
design_logo: string; design_logo: string;
design_favicon: string;
}; };
search: { search: {
search_by_criteria_allowed: boolean; search_by_criteria_allowed: boolean;
......
...@@ -32,7 +32,7 @@ export class NavbarComponent { ...@@ -32,7 +32,7 @@ export class NavbarComponent {
getLogoHref() { getLogoHref() {
if (this.instance.config.design.design_logo) { if (this.instance.config.design.design_logo) {
return this.apiUrl + '/download-instance-file/' + this.instance.name + '/' + this.instance.config.design.design_logo; return `${this.apiUrl}/download-instance-file/${this.instance.name}/${this.instance.config.design.design_logo}`;
} else { } else {
return 'assets/cesam_anis40.png'; return 'assets/cesam_anis40.png';
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment