SF-3380 Fix remaining white label display bugs (#3203)

Author: pmachapman

src/SIL.XForge.Scripture/ClientApp/src/app/app.component.ts

@@ -1,5 +1,7 @@
 import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout';
-import { Component, DestroyRef, OnDestroy, OnInit } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { Component, DestroyRef, Inject, OnDestroy, OnInit } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { NavigationEnd, Router } from '@angular/router';
 import Bugsnag from '@bugsnag/js';
 import { translate } from '@ngneat/transloco';
@@ -31,11 +33,10 @@ import {
   BrowserIssue,
   SupportedBrowsersDialogComponent
 } from 'xforge-common/supported-browsers-dialog/supported-browsers-dialog.component';
+import { ThemeService } from 'xforge-common/theme.service';
 import { UserService } from 'xforge-common/user.service';
 import { quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
 import { issuesEmailTemplate, supportedBrowser } from 'xforge-common/utils';
-import { ThemeService } from 'xforge-common/theme.service';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import versionData from '../../../version.json';
 import { environment } from '../environments/environment';
 import { SFProjectProfileDoc } from './core/models/sf-project-profile-doc';
@@ -73,6 +74,7 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest
   constructor(
     private readonly router: Router,
     private readonly authService: AuthService,
+    @Inject(DOCUMENT) private readonly document: Document,
     private readonly userService: UserService,
     private readonly projectService: SFProjectService,
     private readonly dialogService: DialogService,
@@ -237,6 +239,7 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest
 
   async ngOnInit(): Promise<void> {
     await this.authService.loggedIn;
+    this.document.title = environment.siteName;
     this.featureFlags.darkMode.enabled$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(enabled => {
       this.themeService.setDarkMode(enabled);
     });

src/SIL.XForge.Scripture/ClientApp/src/assets/icons/sd.ico

@@ -16,7 +16,7 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet" />
     <meta charset="utf-8" />
-    <title>Scripture Forge</title>
+    <title>Loading…</title>
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1, interactive-widget=resizes-content" />

src/SIL.XForge.Scripture/ClientApp/src/index.html

@@ -25,8 +25,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     @await RenderSectionAsync("meta", required: false)
     <title>@Settings.GetSiteName()</title>
-    <link rel="icon" type="image/x-icon" href="~/favicon.ico" />
-    <link rel="shortcut icon" type="image/x-icon" href="~/favicon.ico" />
+    <link rel="icon" type="image/x-icon" href="~/@(Settings.UseScriptureForgeBranding() ? "favicon" : "assets/icons/sd").ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="~/@(Settings.UseScriptureForgeBranding() ? "favicon" : "assets/icons/sd").ico" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300&display=swap" />
     <link rel="stylesheet" href="~/lib/material-design-lite/css/material.sf_grey-pt_green.min.css" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />