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

Merge pull request #2114 from albertgasset/MOBILE-3120 

Mobile 3120
main
Juan Leyva 2019-10-01 17:18:37 +02:00 committed by GitHub
parent fbe9efd728 a1280122e0
commit 7ff280a402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/mod/forum/components/index/addon-mod-forum-index.html
View File

@ -19,7 +19,7 @@
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher>
<core-loading [hideUntil]="loaded" class="core-loading-center">
<core-course-module-description [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
<core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
<!-- Forum discussions found to be synchronized -->
<ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">

1
src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
View File

@ -16,6 +16,7 @@
<!-- Content. -->
<core-loading [hideUntil]="loaded" class="core-loading-center">
<div class="addon-mod-imscp-container">
<core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId"></core-navigation-bar>
<core-iframe [src]="src"></core-iframe>
</div>

4
src/addon/mod/lti/components/index/addon-mod-lti-index.html
View File

@ -11,9 +11,9 @@
<!-- Content. -->
<core-loading [hideUntil]="loaded" class="core-loading-center">
<core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<div padding-horizontal>
<div padding>
<button ion-button block icon-left (click)="launch()">
<ion-icon name="link"></ion-icon>
{{ 'addon.mod_lti.launchactivity' | translate }}

2
src/addon/mod/resource/components/index/addon-mod-resource-index.html
View File

@ -13,7 +13,7 @@
<!-- Content. -->
<core-loading [hideUntil]="loaded" class="core-loading-center">
<core-course-module-description *ngIf="mode != 'iframe'" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<ng-container *ngIf="mode == 'iframe'">
<core-iframe [src]="src"></core-iframe>

3
src/addon/mod/resource/components/index/index.ts
View File

@ -36,6 +36,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
mode: string;
src: string;
contentText: string;
displayDescription = true;
constructor(injector: Injector, private resourceProvider: AddonModResourceProvider, private courseProvider: CoreCourseProvider,
private appProvider: CoreAppProvider, private prefetchHandler: AddonModResourcePrefetchHandler,
@ -96,6 +97,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
}).then((resource) => {
if (resource) {
this.description = resource.intro || resource.description;
const options = this.textUtils.unserialize(resource.displayoptions) || {};
this.displayDescription = typeof options.printintro == 'undefined' || !!options.printintro;
this.dataRetrieved.emit(resource);
}

4
src/addon/mod/survey/components/index/addon-mod-survey-index.html
View File

@ -14,10 +14,10 @@
<!-- Content. -->
<core-loading [hideUntil]="loaded" class="core-loading-center">
<core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<!-- Survey already done -->
<ion-card padding *ngIf="survey && survey.surveydone">
<ion-card padding *ngIf="survey && survey.surveydone">
<p padding>{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
<a ion-button block icon-start [href]="externalUrl" core-link>
<ion-icon name="open" start></ion-icon>

4
src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
View File

@ -24,8 +24,8 @@
<!-- Content. -->
<core-loading [hideUntil]="loaded" class="core-loading-center">
<div padding *ngIf="(isMainPage && description) || pageIsOffline || hasOffline || pageWarning">
<core-course-module-description *ngIf="isMainPage" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<div padding *ngIf="description || pageIsOffline || hasOffline || pageWarning">
<core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<!-- Wiki has something offline. -->
<div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">

10
src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
View File

@ -13,8 +13,6 @@
<!-- Content. -->
<core-loading [hideUntil]="loaded" class="core-loading-center">
<core-course-module-description *ngIf="description" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
<ion-card class="with-borders" *ngIf="phases">
<a ion-item (click)="viewPhaseInfo()">
<h2 stacked text-wrap>{{ phases[workshop.phase].title }}</h2>
@ -39,6 +37,14 @@
{{ 'core.hasdatatosync' | translate: {$a: moduleName} }}
</div>
<!-- Description (setup phase only) -->
<ion-card *ngIf="description && workshop && workshop.phase == workshopPhases.PHASE_SETUP">
<ion-item text-wrap>
<h2>{{ 'core.description' | translate }}</h2>
<core-format-text [text]="description" [component]="component" [componentId]="componentId"></core-format-text>
</ion-item>
</ion-card>
<div *ngIf="access && workshop && workshop.phase >= workshopPhases.PHASE_SUBMISSION">
<!-- CLOSED PHASE -->
<ng-container *ngIf="workshop.phase >= workshopPhases.PHASE_CLOSED">