Merge pull request #3913 from NoelDeMartin/MOBILE-3947

MOBILE-3947 login: Restore logo fallback
moodlehq · Jan 30, 2024 · 40c1169 · 40c1169
2 parents 9b711fa + b5961ad
commit 40c1169
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
@@ -23,8 +23,10 @@ <h1>{{ 'core.login.login' | translate }}</h1>
         <ng-container *ngIf="!siteCheckError && site && credForm">
             <div class="ion-text-wrap ion-text-center core-login-info-box">
                 <div class="core-login-site">
-                    <div class="core-login-site-logo" *ngIf="logoUrl">
-                        <img [src]="logoUrl" role="presentation" alt="" onError="this.src='assets/img/login_logo.png'">
+                    <div class="core-login-site-logo">
+                        <!-- Show site logo or a default image. -->
+                        <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" alt="" onError="this.src='assets/img/login_logo.png'">
+                        <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
                     </div>
 
                     <h2 *ngIf="siteName" class="ion-margin-top ion-no-padding core-sitename">

diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
@@ -31,8 +31,10 @@ <h1>{{ 'core.login.reconnect' | translate }}</h1>
 
             <div class="ion-text-wrap ion-text-center core-login-info-box">
                 <div class="core-login-site">
-                    <div class="core-login-site-logo" *ngIf="!showUserAvatar && logoUrl">
-                        <img [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
+                    <div class="core-login-site-logo" *ngIf="!showUserAvatar">
+                        <!-- Show site logo or a default image. -->
+                        <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
+                        <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
                     </div>
 
                     <p *ngIf="siteInfo?.siteName" class="ion-no-margin ion-no-padding core-sitename">