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

Merge pull request #2400 from crazyserver/MOBILE-3401 

Mobile 3401
main
Juan Leyva 2020-06-11 15:29:57 +02:00 committed by GitHub
parent 8f85933df2 b8cc0e4f57
commit 774b859686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/mirror.sh
View File

@ -2,6 +2,9 @@
source "scripts/functions.sh"
npm run build --bailOnLintError true --typeCheckOnLint true
if [ $? -ne 0 ]; then
exit 1
fi
if [ -z $GIT_ORG_PRIVATE ] || [ -z $GIT_TOKEN ]; then
print_error "Env vars not correctly defined"

9
src/core/login/login.scss
View File

@ -93,11 +93,8 @@ ion-app.app-root page-core-login-site {
}
.core-login-site-logo {
margin-top: 5px;
margin-bottom: 5px;
img {
width: 90%;
max-width: 300px;
}
width: 90%;
max-width: 300px;
margin: 5px auto;
}
}

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

@ -14,7 +14,7 @@
<div text-wrap text-center margin-bottom>
<div class="core-login-site-logo">
<!-- Show site logo or a default image. -->
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation">
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'">
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
</div>

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

@ -14,7 +14,7 @@
<div class="core-login-site-logo" *ngIf="!showSiteAvatar">
<!-- Show site logo or a default image. -->
<img *ngIf="logoUrl" [src]="logoUrl" core-external-content [siteId]="siteId" role="presentation">
<img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'">
<img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation">
</div>

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

@ -105,8 +105,8 @@ 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 = this.loginHelper.getLogoUrl(config);
}
this.logoUrl = this.loginHelper.getLogoUrl(config);
this.getDataFromConfig(this.siteConfig);
}).catch(() => {

3
src/core/login/pages/site/site.scss
View File

@ -54,7 +54,8 @@ ion-app.app-root page-core-login-site {
&.hidden {
opacity: 0;
visibility: hidden;
margin: 0;
margin-top: 0;
margin-bottom: 0;
padding: 0;
max-height: 0;
}

12
src/providers/ws.ts
View File

@ -13,6 +13,7 @@
// limitations under the License.
import { Injectable } from '@angular/core';
import { Platform } from 'ionic-angular';
import { HttpClient, HttpResponse } from '@angular/common/http';
import { TranslateService } from '@ngx-translate/core';
import { FileTransfer, FileUploadOptions } from '@ionic-native/file-transfer';
@ -156,12 +157,15 @@ export class CoreWSProvider {
protected fileProvider: CoreFileProvider,
protected fileTransfer: FileTransfer,
protected mimeUtils: CoreMimetypeUtilsProvider,
logger: CoreLoggerProvider) {
logger: CoreLoggerProvider,
platform: Platform) {
this.logger = logger.getInstance('CoreWSProvider');
if (this.appProvider.isMobile()) {
(<any> cordova).plugin.http.setHeader('User-Agent', navigator.userAgent);
}
platform.ready().then(() => {
if (this.appProvider.isMobile()) {
(<any> cordova).plugin.http.setHeader('User-Agent', navigator.userAgent);
}
});
}
/**