ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4700 from emanuelschuetze/fixProjectorLogo

Browse Source 
Fixed projector logo
This commit is contained in:
Emanuel Schütze 2019-05-11 10:02:32 +02:00 committed by GitHub
commit c2abe8a0a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/components/projector/projector.component.html
View File

@ -7,7 +7,7 @@
</div> </div>
<div id="header" [ngStyle]="headerFooterStyle" *ngIf="projector && projector.show_header_footer"> <div id="header" [ngStyle]="headerFooterStyle" *ngIf="projector && projector.show_header_footer">
<!-- projector logo --> <!-- projector logo -->
<img *ngIf="enableLogo && projectorLogo" src="{{ projectorLogo }}" class="projector-logo-main" /> <img *ngIf="projector.show_logo && projectorLogo" src="{{ projectorLogo }}" class="projector-logo-main" />
<div *ngIf="projector.show_title" id="eventdata"> <div *ngIf="projector.show_title" id="eventdata">
<div <div

4
client/src/app/shared/components/projector/projector.component.ts
View File

@ -140,7 +140,6 @@ export class ProjectorComponent extends BaseComponent implements OnDestroy {
// Some settings for the view from the config. // Some settings for the view from the config.
public enableHeaderAndFooter = true; public enableHeaderAndFooter = true;
public enableTitle = true; public enableTitle = true;
public enableLogo = true;
public projectorLogo; public projectorLogo;
public eventName; public eventName;
public eventDescription; public eventDescription;
@ -166,10 +165,11 @@ export class ProjectorComponent extends BaseComponent implements OnDestroy {
) { ) {
super(titleService, translate); super(titleService, translate);
// projector logo / background-image // projector logo / background-image
this.configService.get<boolean>('projector_enable_logo').subscribe(val => (this.enableLogo = val));
this.configService.get<{ path?: string }>('logo_projector_main').subscribe(val => { this.configService.get<{ path?: string }>('logo_projector_main').subscribe(val => {
if (val && val.path) { if (val && val.path) {
this.projectorLogo = val.path; this.projectorLogo = val.path;
} else {
this.projectorLogo = '';
} }
}); });
this.configService.get<{ path?: string }>('logo_projector_header').subscribe(val => { this.configService.get<{ path?: string }>('logo_projector_header').subscribe(val => {