From 495e1b5615afc5fa94a14091c3de55f9cb294c43 Mon Sep 17 00:00:00 2001
From: Peter <peter@moodle.com>
Date: Tue, 20 Nov 2018 11:38:51 +0800
Subject: [PATCH] MDL-64092 block_timeline: Separate the activity view and
 submission link

* Reintroduce separate links similar to 35
* Hide submission links if not actionable
---
 .../templates/event-list-item.mustache        | 23 +++++++++++-------
 .../block_timeline/event-list-item.mustache   | 24 +++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/blocks/timeline/templates/event-list-item.mustache b/blocks/timeline/templates/event-list-item.mustache
index 40fe0dccf4e..1ff653ced1a 100644
--- a/blocks/timeline/templates/event-list-item.mustache
+++ b/blocks/timeline/templates/event-list-item.mustache
@@ -41,23 +41,28 @@
         }
     }
 }}
-<a
-    class="list-group-item list-group-item-action flex-column py-2 pl-0 pr-0 border-0"
-    href="{{{action.url}}}"
-    title="{{name}}"
+<div class="list-group-item flex-column py-2 pl-0 pr-0 border-0"
     data-region="event-list-item"
-    aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": "{{name}}", "course": "{{course.fullnamedisplay}}", "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
->
+    >
     <div class="d-flex">
-        <div class="icon-size-4 d-flex align-self-center">
+        <div class="icon-size-4 d-flex align-self-top">
             {{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
         </div>
         <div class="w-100 event-name-container text-truncate line-height-3">
-            <h6 class="event-name text-truncate mb-0">{{{name}}}</h6>
+            <a href="{{url}}"
+               title="{{name}}"
+               aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": "{{name}}", "course": "{{course.fullnamedisplay}}", "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
+            ><h6 class="event-name text-truncate mb-0">{{{name}}}</h6></a>
             <small class="text-muted text-truncate m-b-0">{{{course.fullnamedisplay}}}</small>
+            {{#action.actionable}}
+            <h6 class="m-b-0 pt-2">
+                <a href="{{{action.url}}}" aria-label="{{{action.name}}}" title="{{{action.name}}}" class="list-group-item-action">{{{action.name}}}</a>
+            </h6>
+            {{/action.actionable}}
         </div>
         <small class="text-right text-nowrap ml-1">
             {{#userdate}} {{timesort}}, {{#str}} strftimetime24, core_langconfig {{/str}} {{/userdate}}
         </small>
+
     </div>
-</a>
+</div>
diff --git a/theme/bootstrapbase/templates/block_timeline/event-list-item.mustache b/theme/bootstrapbase/templates/block_timeline/event-list-item.mustache
index af008b17919..981a6c40565 100644
--- a/theme/bootstrapbase/templates/block_timeline/event-list-item.mustache
+++ b/theme/bootstrapbase/templates/block_timeline/event-list-item.mustache
@@ -42,13 +42,7 @@
     }
 }}
 <li class="media">
-    <a
-        class="media"
-        href="{{{action.url}}}"
-        title="{{name}}"
-        data-region="event-list-item"
-        aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": "{{name}}", "course": "{{course.fullnamedisplay}}", "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
-    >
+    <div class="media" data-region="event-list-item">
         <div class="icon-size-4 pull-left">
             {{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
         </div>
@@ -56,8 +50,18 @@
             {{#userdate}} {{timesort}}, {{#str}} strftimetime24, core_langconfig {{/str}} {{/userdate}}
         </small>
         <div class="text-truncate line-height-3 media-body">
-            <h6 class="text-truncate m-0">{{{name}}}</h6>
-            <small class="text-muted text-truncate">{{{course.fullnamedisplay}}}</small>
+            <a href="{{url}}"
+               title="{{name}}"
+               aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": "{{name}}", "course": "{{course.fullnamedisplay}}", "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
+            >
+                <h6 class="text-truncate m-0">{{{name}}}</h6>
+                <small class="text-muted text-truncate">{{{course.fullnamedisplay}}}</small>
+            </a>
+            {{#action.actionable}}
+            <h6 class="m-b-0 pt-2">
+                <a href="{{{action.url}}}" aria-label="{{{action.name}}}" title="{{{action.name}}}" class="list-group-item-action">{{{action.name}}}</a>
+            </h6>
+            {{/action.actionable}}
         </div>
-    </a>
+    </div>
 </li>