MOBILE-2795 timeline: Restore event action buttons
parent
6fc0e81c3e
commit
07e1f70c8f
|
@ -3,13 +3,24 @@
|
||||||
<h2>{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h2>
|
<h2>{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h2>
|
||||||
</ion-item-divider>
|
</ion-item-divider>
|
||||||
<ng-container *ngFor="let event of dayEvents.events">
|
<ng-container *ngFor="let event of dayEvents.events">
|
||||||
<a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, event)" [title]="event.action.actionable ? event.action.name: event.name">
|
<a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, event.url)" [title]="event.name">
|
||||||
<img item-start [src]="event.iconUrl" core-external-content alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
|
<img item-start [src]="event.iconUrl" core-external-content alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
|
||||||
<h2><core-format-text [text]="event.name"></core-format-text></h2>
|
<h2><core-format-text [text]="event.name"></core-format-text></h2>
|
||||||
<p *ngIf="showCourse">
|
<p *ngIf="showCourse">
|
||||||
<core-format-text [text]="event.course.fullnamedisplay"></core-format-text>
|
<core-format-text [text]="event.course.fullnamedisplay"></core-format-text>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<button ion-button clear class="hidden-tablet" (click)="action($event, event.action.url)" [title]="event.action.name" [disabled]="!event.action.actionable" *ngIf="event.action">
|
||||||
|
{{event.action.name}}
|
||||||
|
<ion-badge item-end margin-start *ngIf="event.action.showitemcount">{{event.action.itemcount}}</ion-badge>
|
||||||
|
</button>
|
||||||
|
|
||||||
<ion-badge color="light" item-end>{{event.timesort * 1000 | coreFormatDate:"strftimetime24" }}</ion-badge>
|
<ion-badge color="light" item-end>{{event.timesort * 1000 | coreFormatDate:"strftimetime24" }}</ion-badge>
|
||||||
|
|
||||||
|
<button ion-button clear item-end class="hidden-phone" (click)="action($event, event.action.url)" [title]="event.action.name" [disabled]="!event.action.actionable" *ngIf="event.action">
|
||||||
|
{{event.action.name}}
|
||||||
|
<ion-badge item-end margin-start *ngIf="event.action.showitemcount">{{event.action.itemcount}}</ion-badge>
|
||||||
|
</button>
|
||||||
</a>
|
</a>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</ion-item-group>
|
</ion-item-group>
|
||||||
|
|
|
@ -21,4 +21,8 @@ ion-app.app-root core-courses-course-progress {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ion-app.app-root addon-block-timeline-events {
|
||||||
|
a button {
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -122,19 +122,14 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
|
||||||
* Action clicked.
|
* Action clicked.
|
||||||
*
|
*
|
||||||
* @param {Event} e Click event.
|
* @param {Event} e Click event.
|
||||||
* @param {any} event Calendar event info.
|
* @param {string} url Url of the action.
|
||||||
*/
|
*/
|
||||||
action(e: Event, event: any): void {
|
action(e: Event, url: string): void {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
let url;
|
|
||||||
|
|
||||||
if (event.action.actionable) {
|
// Fix URL format.
|
||||||
// Fix URL format.
|
url = this.textUtils.decodeHTMLEntities(url);
|
||||||
url = this.textUtils.decodeHTMLEntities(event.action.url);
|
|
||||||
} else {
|
|
||||||
url = this.textUtils.decodeHTMLEntities(event.url);
|
|
||||||
}
|
|
||||||
|
|
||||||
const modal = this.domUtils.showModalLoading();
|
const modal = this.domUtils.showModalLoading();
|
||||||
this.contentLinksHelper.handleLink(url, undefined, this.navCtrl).then((treated) => {
|
this.contentLinksHelper.handleLink(url, undefined, this.navCtrl).then((treated) => {
|
||||||
|
|
|
@ -50,6 +50,7 @@ ion-app.app-root {
|
||||||
align-items: center !important;
|
align-items: center !important;
|
||||||
> * {
|
> * {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
width: 100%;
|
||||||
max-width: 600px;
|
max-width: 600px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue