Merge branch 'MDL-64333_36' of git://github.com/markn86/moodle into M…

…OODLE_36_STABLE
moodle · Mar 6, 2019 · f33bc18 · f33bc18
2 parents da40ba1 + 00ee615
commit f33bc18
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/message/lib.php b/message/lib.php
@@ -844,6 +844,11 @@ function core_message_standard_after_main_region_html() {
     // Enter to send.
     $entertosend = get_user_preferences('message_entertosend', false, $USER);
 
+    $notification = '';
+    if (!get_user_preferences('core_message_migrate_data', false)) {
+        $notification = get_string('messagingdatahasnotbeenmigrated', 'message');
+    }
+
     return $renderer->render_from_template('core_message/message_drawer', [
         'contactrequestcount' => $requestcount,
         'loggedinuser' => [
@@ -861,6 +866,9 @@ function core_message_standard_after_main_region_html() {
         'settings' => [
             'privacy' => $choices,
             'entertosend' => $entertosend
+        ],
+        'overview' => [
+            'notification' => $notification
         ]
     ]);
 }
diff --git a/message/templates/message_drawer_lazy_load_list.mustache b/message/templates/message_drawer_lazy_load_list.mustache
@@ -40,10 +40,10 @@
     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}}

diff --git a/message/templates/message_drawer_view_overview_section_messages.mustache b/message/templates/message_drawer_view_overview_section_messages.mustache
@@ -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}}

diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_lazy_load_list.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_lazy_load_list.mustache
@@ -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}}