forked from moodlehq/moodleapp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MOBILE-4653 core: Add site logo component
- Loading branch information
1 parent
53baee7
commit 1eb8ae0
Showing
25 changed files
with
185 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <div class="core-logo-container" *ngIf="showLogo && logoLoaded"> | ||
| <img *ngIf="siteLogo" [src]="siteLogo" class="core-logo" [alt]="siteName" core-external-content (error)="imageError()"> | ||
| <img *ngIf="!siteLogo" [src]="fallbackLogo" class="core-logo" [alt]="siteName"> | ||
| </div> | ||
|
|
||
| <p *ngIf="siteNameMode === 'p' && siteName" class="ion-no-margin ion-no-padding core-logo-sitename"> | ||
| <core-format-text [text]="siteName" [filter]="false" contextLevel="system" [contextInstanceId]="0" [siteId]="siteId" /> | ||
| </p> | ||
| <core-format-text *ngIf="siteNameMode === '' && siteName" [text]="siteName" contextLevel="system" [contextInstanceId]="0" | ||
| class="core-logo-sitename" [siteId]="siteId" /> | ||
| <h2 *ngIf="siteNameMode === 'h2' && siteName" class="ion-margin-top ion-no-padding core-logo-sitename"> | ||
| <core-format-text [text]="siteName" [filter]="false" contextLevel="system" [contextInstanceId]="0" [siteId]="siteId" /> | ||
| </h2> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| :host { | ||
| display: block; | ||
| } | ||
|
|
||
| .core-logo-container { | ||
| display: var(--core-site-logo-display, block); | ||
| margin-bottom: var(--core-site-logo-margin-bottom, 0px); | ||
| } | ||
|
|
||
| img.core-logo { | ||
| max-height: var(--core-site-logo-max-height); | ||
| max-width: var(--core-site-logo-max-width, 100%); | ||
|
|
||
|
|
||
| width: var(--core-site-logo-width, auto); | ||
| margin: var(--core-site-logo-margin, 0px); | ||
| } | ||
|
|
||
| .core-logo-sitename { | ||
| display: var(--core-site-logo-sitename-display, block); | ||
| font: var(--core-site-logo-sitename-font); | ||
| margin-bottom: var(--core-site-logo-sitename-margin-bottom, 0px); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // (C) Copyright 2015 Moodle Pty Ltd. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import { Component, OnInit, OnDestroy, Input } from '@angular/core'; | ||
| import { CoreSharedModule } from '@/core/shared.module'; | ||
| import { CoreSites } from '@services/sites'; | ||
| import { CoreEventObserver, CoreEvents } from '@singletons/events'; | ||
| import { CoreSite } from '@classes/sites/site'; | ||
| import { toBoolean } from '@/core/transforms/boolean'; | ||
| import { CorePromiseUtils } from '@singletons/promise-utils'; | ||
|
|
||
| /** | ||
| * Component to render the site logo. | ||
| */ | ||
| @Component({ | ||
| selector: 'core-site-logo', | ||
| templateUrl: 'site-logo.html', | ||
| styleUrl: 'site-logo.scss', | ||
| standalone: true, | ||
| imports: [CoreSharedModule], | ||
|
|
||
| }) | ||
| export class CoreSiteLogoComponent implements OnInit, OnDestroy { | ||
|
|
||
| @Input({ transform: toBoolean }) hideOnError = false; | ||
| @Input() fallbackLogo = 'assets/img/top_logo.png'; // Should be a local path. | ||
| @Input() siteNameMode: CoreSiteLogoSiteNameMode = CoreSiteLogoSiteNameMode.NOTAG; | ||
| @Input({ transform: toBoolean }) showLogo = true; | ||
| @Input() site?: CoreSite; | ||
|
|
||
| siteName?: string; | ||
| siteId?: string; | ||
| siteLogo?: string; | ||
| logoLoaded = false; | ||
|
|
||
| protected updateSiteObserver: CoreEventObserver; | ||
|
|
||
| constructor() { | ||
| this.siteId = CoreSites.getCurrentSiteId(); | ||
|
|
||
| this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, async () => { | ||
| await this.loadSiteName(); | ||
| }, this.siteId); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| async ngOnInit(): Promise<void> { | ||
| await this.loadSiteName(); | ||
| } | ||
|
|
||
| /** | ||
| * Function to handle the image error. | ||
| */ | ||
| imageError(): void { | ||
| if (this.hideOnError) { | ||
| this.showLogo = false; | ||
| } | ||
| this.siteLogo = undefined; | ||
| } | ||
|
|
||
| /** | ||
| * Load the site name. | ||
| */ | ||
| protected async loadSiteName(): Promise<void> { | ||
| const site = this.site ?? CoreSites.getRequiredCurrentSite(); | ||
| this.siteName = await site.getSiteName() || ''; | ||
|
|
||
| // Get the public config to avoid race conditions when retrieving the logo. | ||
| const siteConfig = await CorePromiseUtils.ignoreErrors(site.getPublicConfig()); | ||
|
|
||
| this.siteLogo = site.getLogoUrl(siteConfig); | ||
| this.logoLoaded = true; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| ngOnDestroy(): void { | ||
| this.updateSiteObserver.off(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| export const enum CoreSiteLogoSiteNameMode { | ||
| HEADING2 = 'h2', | ||
| PARAGRAPH = 'p', | ||
| NOTAG = '', | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-29 Bytes
(100%)
...-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-22 Bytes
(100%)
.../login/tests/behat/snapshots/test-showloginform-setting-in-the-app-login_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-26 Bytes
(100%)
...in/tests/behat/snapshots/test-showloginform-setting-in-the-app-reconnect_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.