mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

MDL-64092 block_timeline: Separate the activity view and submission link

Browse Source 
* Reintroduce separate links similar to 35
* Hide submission links if not actionable
This commit is contained in:
Peter 2018-11-20 11:38:51 +08:00
parent 0225ad42ea
commit 495e1b5615
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
blocks/timeline/templates/event-list-item.mustache
View File

@ -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>

24
theme/bootstrapbase/templates/block_timeline/event-list-item.mustache
View File

@ -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>