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

Merge pull request #2295 from crazyserver/MOBILE-3313 

MOBILE-3313 settings: Fixes on device info
main
Juan Leyva 2020-02-28 10:24:18 +01:00 committed by GitHub
parent 1c3fa6dd8a e51d23f24c
commit 9140236b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.json
View File

@ -80,7 +80,7 @@
"multisitesdisplay": "", "multisitesdisplay": "",
"skipssoconfirmation": false, "skipssoconfirmation": false,
"forcedefaultlanguage": false, "forcedefaultlanguage": false,
"privacypolicy": "https:\/\/moodle.org\/mod\/page\/view.php?id=8148", "privacypolicy": "https:\/\/moodle.net\/moodle-app-privacy\/",
"notificoncolor": "#f98012", "notificoncolor": "#f98012",
"statusbarbg": false, "statusbarbg": false,
"statusbarlighttext": false, "statusbarlighttext": false,

2
src/core/settings/pages/about/about.html
View File

@ -17,6 +17,6 @@
</a> </a>
<a ion-item (click)="openPage('CoreSettingsDeviceInfoPage')" [title]="'core.settings.deviceinfo' | translate"> <a ion-item (click)="openPage('CoreSettingsDeviceInfoPage')" [title]="'core.settings.deviceinfo' | translate">
<ion-icon name="phone-portrait" item-start></ion-icon> <ion-icon name="phone-portrait" item-start></ion-icon>
<p>{{ 'core.settings.deviceinfo' | translate }}</p> {{ 'core.settings.deviceinfo' | translate }}
</a> </a>
</ion-content> </ion-content>

4
src/core/settings/pages/deviceinfo/deviceinfo.html
View File

@ -49,9 +49,9 @@
<h2>{{ 'core.settings.displayformat' | translate}}</h2> <h2>{{ 'core.settings.displayformat' | translate}}</h2>
<p>{{ 'core.' + deviceInfo.deviceType | translate }}</p> <p>{{ 'core.' + deviceInfo.deviceType | translate }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="deviceInfo.deviceOs" (longPress)="copyItemInfo($event)"> <ion-item text-wrap *ngIf="deviceInfo.deviceOs && deviceOsTranslated" (longPress)="copyItemInfo($event)">
<h2>{{ 'core.settings.deviceos' | translate}}</h2> <h2>{{ 'core.settings.deviceos' | translate}}</h2>
<p>{{ deviceInfo.deviceOsTranslated }}</p> <p>{{ deviceOsTranslated }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="deviceInfo.screen" (longPress)="copyItemInfo($event)"> <ion-item text-wrap *ngIf="deviceInfo.screen" (longPress)="copyItemInfo($event)">
<h2>{{ 'core.settings.screen' | translate}}</h2> <h2>{{ 'core.settings.screen' | translate}}</h2>

2
src/core/settings/pages/licenses/licenses.html
View File

@ -19,7 +19,7 @@
<p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p> <p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p>
<p><a *ngIf="license.url" [href]="license.url" core-link auto-login="no">{{ license.url }}</a></p> <p><a *ngIf="license.url" [href]="license.url" core-link auto-login="no">{{ license.url }}</a></p>
<p><a *ngIf="license.email" [href]="'mailto:' +license.email" core-link auto-login="no">{{ license.email }}</a></p> <p><a *ngIf="license.email" [href]="'mailto:' +license.email" core-link auto-login="no">{{ license.email }}</a></p>
<a *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank" ion-button ion-button clear item-end>{{ 'core.view' | translate }}</a> <a *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank" ion-button ion-button clear item-end core-link auto-login="no">{{ 'core.view' | translate }}</a>
</ion-item> </ion-item>
</ng-container> </ng-container>
</core-loading> </core-loading>