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

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

Browse Source
This commit is contained in:
Jun Pataleta 2019-03-06 17:34:10 +08:00
commit 6c2fc65887
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
message/classes/helper.php
View File

@ -720,6 +720,11 @@ class helper {
// Enter to send.
$entertosend = get_user_preferences('message_entertosend', $CFG->messagingdefaultpressenter, $USER);
$notification = '';
if (!get_user_preferences('core_message_migrate_data', false)) {
$notification = get_string('messagingdatahasnotbeenmigrated', 'message');
}
if ($isdrawer) {
$template = 'core_message/message_drawer';
$messageurl = new \moodle_url('/message/index.php');
@ -747,7 +752,8 @@ class helper {
'entertosend' => $entertosend
],
'overview' => [
'messageurl' => $messageurl
'messageurl' => $messageurl,
'notification' => $notification
],
'sendtouser' => false,
'conversationid' => false

5
message/templates/message_drawer_lazy_load_list.mustache
View File

@ -40,10 +40,9 @@
data-user-id="{{loggedinuser.id}}"
{{$rootattributes}}{{/rootattributes}}
>
{{$notification}}{{/notification}}
<div class="hidden text-center p-2" data-region="empty-message-container">
<p class="text-muted mt-2">
{{$emptymessage}}{{/emptymessage}}
</p>
{{$emptymessage}}{{/emptymessage}}
</div>
<div class="hidden list-group" data-region="content-container">
{{$content}}{{/content}}

7
message/templates/message_drawer_view_overview_section_messages.mustache
View File

@ -41,6 +41,13 @@
{{$placeholder}}
<div class="text-center py-2">{{> core/loading }}</div>
{{/placeholder}}
{{$notification}}
{{#overview.notification}}
<div class="text-center p-2">
<p class="text-center text-muted mt-2">{{.}}</p>
</div>
{{/overview.notification}}
{{/notification}}
{{$emptymessage}}
<p class="text-muted mt-2">{{#str}} noindividualconversations, core_message {{/str}}</p>
{{/emptymessage}}

5
theme/bootstrapbase/templates/core_message/message_drawer_lazy_load_list.mustache
View File

@ -46,10 +46,9 @@
>
<div class="onepix">
</div>
{{$notification}}{{/notification}}
<div class="hidden text-center p-2" data-region="empty-message-container">
<p class="text-muted mt-2">
{{$emptymessage}}{{/emptymessage}}
</p>
{{$emptymessage}}{{/emptymessage}}
</div>
<div class="hidden list-group" data-region="content-container">
{{$content}}{{/content}}