From 07e1f70c8f758b1b5254a4acaf2c7073f45c8e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Jan 2019 13:11:58 +0100
Subject: [PATCH] MOBILE-2795 timeline: Restore event action buttons

---
 .../events/addon-block-timeline-events.html       | 15 +++++++++++++--
 .../block/timeline/components/events/events.scss  |  6 +++++-
 .../block/timeline/components/events/events.ts    | 13 ++++---------
 src/app/app.scss                                  |  1 +
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/addon/block/timeline/components/events/addon-block-timeline-events.html b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
index 0cfddb603..1cebcecc1 100644
--- a/src/addon/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
@@ -3,13 +3,24 @@
         <h2>{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h2>
     </ion-item-divider>
     <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">
             <h2><core-format-text [text]="event.name"></core-format-text></h2>
             <p *ngIf="showCourse">
                 <core-format-text [text]="event.course.fullnamedisplay"></core-format-text>
             </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>
+
+            <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>
     </ng-container>
 </ion-item-group>
@@ -22,4 +33,4 @@
     <ion-spinner *ngIf="loadingMore"></ion-spinner>
 </div>
 
-<core-empty-box *ngIf="empty" image="assets/img/icons/activities.svg" [message]="'addon.block_timeline.noevents' | translate" [inline]="!showCourse"></core-empty-box>
+<core-empty-box *ngIf="empty" image="assets/img/icons/activities.svg" [message]="'addon.block_timeline.noevents' | translate" [inline]="!showCourse"></core-empty-box>
\ No newline at end of file
diff --git a/src/addon/block/timeline/components/events/events.scss b/src/addon/block/timeline/components/events/events.scss
index 36475d624..1c722ae93 100644
--- a/src/addon/block/timeline/components/events/events.scss
+++ b/src/addon/block/timeline/components/events/events.scss
@@ -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;
+    }
+}
diff --git a/src/addon/block/timeline/components/events/events.ts b/src/addon/block/timeline/components/events/events.ts
index c4d1f413d..a4f50e96a 100644
--- a/src/addon/block/timeline/components/events/events.ts
+++ b/src/addon/block/timeline/components/events/events.ts
@@ -122,19 +122,14 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
      * Action clicked.
      *
      * @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.stopPropagation();
-        let url;
 
-        if (event.action.actionable) {
-            // Fix URL format.
-            url = this.textUtils.decodeHTMLEntities(event.action.url);
-        } else {
-            url = this.textUtils.decodeHTMLEntities(event.url);
-        }
+        // Fix URL format.
+        url = this.textUtils.decodeHTMLEntities(url);
 
         const modal = this.domUtils.showModalLoading();
         this.contentLinksHelper.handleLink(url, undefined, this.navCtrl).then((treated) => {
diff --git a/src/app/app.scss b/src/app/app.scss
index d193d4fc2..a38bb07a0 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -50,6 +50,7 @@ ion-app.app-root {
       align-items: center !important;
       > * {
         margin: 0 auto;
+        width: 100%;
         max-width: 600px;
       }
     }