EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2294 from dpalou/MOBILE-3269 

MOBILE-3269 login: Use function to get logo URL
main
Juan Leyva 2020-02-27 15:34:37 +01:00 committed by GitHub
parent 29779f0c4f e23dd06dd6
commit 1c3fa6dd8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/login/pages/credentials/credentials.ts
View File

@ -156,7 +156,7 @@ export class CoreLoginCredentialsPage {
protected treatSiteConfig(): void {
if (this.siteConfig) {
this.siteName = CoreConfigConstants.sitename ? CoreConfigConstants.sitename : this.siteConfig.sitename;
this.logoUrl = this.siteConfig.logourl || this.siteConfig.compactlogourl;
this.logoUrl = this.loginHelper.getLogoUrl(this.siteConfig);
this.authInstructions = this.siteConfig.authinstructions || this.translate.instant('core.login.loginsteps');
const disabledFeatures = this.loginHelper.getDisabledFeatures(this.siteConfig);

2
src/core/login/pages/reconnect/reconnect.ts
View File

@ -105,7 +105,7 @@ export class CoreLoginReconnectPage {
// Check logoURL if user avatar is not set.
if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
this.showSiteAvatar = false;
this.logoUrl = config.logourl || config.compactlogourl;
this.logoUrl = this.loginHelper.getLogoUrl(config);
}
this.getDataFromConfig(this.siteConfig);

10
src/core/login/providers/helper.ts
View File

@ -389,6 +389,16 @@ export class CoreLoginHelperProvider {
return errors;
}
/**
* Get logo URL from a site public config.
*
* @param config Site public config.
* @return Logo URL.
*/
getLogoUrl(config: any): string {
return config ? (config.logourl || config.compactlogourl) : null;
}
/**
* Returns the logout label of a site.
*