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

Merge pull request #2108 from crazyserver/MOBILE-3119 

Mobile 3119
main
Juan Leyva 2019-10-01 12:20:12 +02:00 committed by GitHub
parent 4c433ddff0 932f00cf1b
commit 62b7780d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mainmenu/pages/more/more.html
View File

@ -5,9 +5,11 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-list> <ion-list>
<a ion-item core-user-link [userId]="siteInfo.userid"> <a ion-item core-user-link [userId]="siteInfo.userid" text-wrap>
<ion-avatar core-user-avatar [user]="siteInfo" item-start></ion-avatar> <ion-avatar core-user-avatar [user]="siteInfo" item-start></ion-avatar>
<p>{{siteInfo.fullname}}</p> <h2>{{siteInfo.fullname}}</h2>
<ion-note>{{ siteName }}</ion-note>
<ion-note>{{ siteUrl }}</ion-note>
</a> </a>
<ion-item-divider></ion-item-divider> <ion-item-divider></ion-item-divider>
<ion-item text-center *ngIf="(!handlers || !handlers.length) && !handlersLoaded"> <ion-item text-center *ngIf="(!handlers || !handlers.length) && !handlersLoaded">

2
src/core/mainmenu/pages/more/more.ts
View File

@ -38,6 +38,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
showHelp: boolean; showHelp: boolean;
docsUrl: string; docsUrl: string;
customItems: CoreMainMenuCustomItem[]; customItems: CoreMainMenuCustomItem[];
siteUrl: string;
protected subscription; protected subscription;
protected langObserver; protected langObserver;
@ -108,6 +109,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
this.siteInfo = currentSite.getInfo(); this.siteInfo = currentSite.getInfo();
this.siteName = currentSite.getSiteName(); this.siteName = currentSite.getSiteName();
this.siteUrl = currentSite.getURL();
this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite'); this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website'); this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help'); this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');

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

@ -24,6 +24,14 @@
<p><a [href]="privacyPolicy" core-link auto-login="no">{{ privacyPolicy }}</a></p> <p><a [href]="privacyPolicy" core-link auto-login="no">{{ privacyPolicy }}</a></p>
</ion-item> </ion-item>
</ion-item-group> </ion-item-group>
<ion-item-group *ngIf="siteUrl">
<ion-item-divider text-wrap>
{{ 'core.login.siteurl' | translate }}<ng-container *ngIf="isPrefixedUrl"> *</ng-container>
</ion-item-divider>
<ion-item text-wrap>
<p><a [href]="siteUrl" core-link auto-login="yes">{{ siteUrl }}</a></p>
</ion-item>
</ion-item-group>
<ion-item-group> <ion-item-group>
<ion-item-divider text-wrap> <ion-item-divider text-wrap>
{{ 'core.settings.deviceinfo' | translate }} {{ 'core.settings.deviceinfo' | translate }}

6
src/core/settings/pages/about/about.ts
View File

@ -55,6 +55,8 @@ export class CoreSettingsAboutPage {
storageType: string; storageType: string;
localNotifAvailable: string; localNotifAvailable: string;
pushId: string; pushId: string;
siteUrl: string;
isPrefixedUrl: boolean;
constructor(platform: Platform, device: Device, appProvider: CoreAppProvider, fileProvider: CoreFileProvider, constructor(platform: Platform, device: Device, appProvider: CoreAppProvider, fileProvider: CoreFileProvider,
initDelegate: CoreInitDelegate, langProvider: CoreLangProvider, sitesProvider: CoreSitesProvider, initDelegate: CoreInitDelegate, langProvider: CoreLangProvider, sitesProvider: CoreSitesProvider,
@ -114,5 +116,9 @@ export class CoreSettingsAboutPage {
this.localNotifAvailable = localNotificationsProvider.isAvailable() ? 'core.yes' : 'core.no'; this.localNotifAvailable = localNotificationsProvider.isAvailable() ? 'core.yes' : 'core.no';
this.pushId = pushNotificationsProvider.getPushId(); this.pushId = pushNotificationsProvider.getPushId();
this.siteUrl = (currentSite && currentSite.getURL()) ||
(typeof CoreConfigConstants.siteurl == 'string' && CoreConfigConstants.siteurl);
this.isPrefixedUrl = !!CoreConfigConstants.siteurl;
} }
} }