moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64773_master' of git://github.com/markn86/moodle

Browse source
This commit is contained in:
Jake Dallimore 2019-03-13 11:03:52 +08:00
commit a6646dfd92
39 changed files with 1093 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
View file

@ -65,6 +65,9 @@
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
{{#pix}} i/star, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
{{#pix}} i/muted, core {{/pix}}
</span>
</div>
{{#showonlinestatus}}
<p class="m-0 font-weight-light text-truncate">
@ -105,6 +108,16 @@
{{#str}} unblockuser, core_message {{/str}}
</a>
</li>
<li class="{{#ismuted}}hidden{{/ismuted}}" data-action="confirm-mute">
<a class="dropdown-item" href="#">
{{#str}} muteconversation, core_message {{/str}}
</a>
</li>
<li class="{{^ismuted}}hidden{{/ismuted}}" data-action="confirm-unmute">
<a class="dropdown-item" href="#">
{{#str}} unmuteconversation, core_message {{/str}}
</a>
</li>
<li data-action="request-delete-conversation">
<a class="dropdown-item" href="#">
{{#str}} deleteconversation, core_message {{/str}}

3
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private_no_controls.mustache
View file

@ -64,6 +64,9 @@
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
{{#pix}} i/star, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
{{#pix}} i/muted, core {{/pix}}
</span>
</div>
{{#showonlinestatus}}
<p class="m-0 font-weight-light text-truncate">

13
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
View file

@ -63,6 +63,9 @@
<span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
{{#pix}} i/star, core {{/pix}}
</span>
<span class="{{^ismuted}}hidden{{/ismuted}} ml-1 text-primary" data-region="muted-icon-container">
{{#pix}} i/muted, core {{/pix}}
</span>
</div>
<p class="m-0 text-truncate">{{subname}}</p>
</div>
@ -78,6 +81,16 @@
{{#str}} groupinfo, core_message {{/str}}
</a>
</li>
<li class="{{#ismuted}}hidden{{/ismuted}}" data-action="confirm-mute">
<a class="dropdown-item" href="#">
{{#str}} muteconversation, core_message {{/str}}
</a>
</li>
<li class="{{^ismuted}}hidden{{/ismuted}}" data-action="confirm-unmute">
<a class="dropdown-item" href="#">
{{#str}} unmuteconversation, core_message {{/str}}
</a>
</li>
<li class="{{#isfavourite}}hidden{{/isfavourite}}" data-action="confirm-favourite">
<a class="dropdown-item" href="#">
{{#str}} addtofavourites, core_message {{/str}}