MDL-54687 core_message: removed loading template

message/amd/src/contacts.js

@@ -141,7 +141,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification'],
          */
         Contacts.prototype._loadContactArea = function(webservice) {
             // Show loading template.
-            templates.render('core_message/loading', {}).done(function(html, js) {
+            templates.render('core/loading', {}).done(function(html, js) {
                 templates.replaceNodeContents("[data-region='contacts']", html, js);
             });
 

message/amd/src/messages.js

@@ -63,7 +63,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification'],
          */
         Messages.prototype._loadMessages = function(event, userid) {
             // Show loading template.
-            templates.render('core_message/loading', {}).done(function(html, js) {
+            templates.render('core/loading', {}).done(function(html, js) {
                 templates.replaceNodeContents("[data-region='messages-area']", html, js);
             });
 

message/amd/src/profile.js

@@ -62,7 +62,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
          */
         Profile.prototype._viewProfile = function(event, userid) {
             // Show loading template.
-            templates.render('core_message/loading', {}).done(function(html, js) {
+            templates.render('core/loading', {}).done(function(html, js) {
                 templates.replaceNodeContents("[data-region='messages-area']", html, js);
             });
 

message/templates/loading.mustache

@@ -1,34 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template core_message/loading
-
-    Loading spinner shown while waiting for an ajax request
-
-    Classes required for JS:
-    * None
-
-    Data attibutes required for JS:
-    * None
-
-    Context variables required for this template:
-    * None
-
-    Example context (json):
-    { }
-}}
-{{#pix}}y/loading, core, {{#str}}loading, core_message{{/str}}{{/pix}}

message/templates/message_popover.mustache

@@ -54,7 +54,7 @@
             data-original-title="{{#str}} markallread {{/str}}"
             aria-role="button">
             <span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
-            <span class="loading-icon">{{#pix}} y/loading, core, {{#str}} loading, mod_assign {{/str}} {{/pix}}</span>
+            {{> core/loading }}
         </a>
         <a href="{{{urls.preferences}}}"
             data-toggle="tooltip"

message/templates/notification_content_item.mustache

@@ -70,7 +70,7 @@
                     data-preference-loggedin="{{loggedin}}"
                     data-preference-loggedoff="{{loggedoff}}">
                     <div class="block-icon">{{#pix}} t/block {{/pix}}</div>
-                    <div class="loading-icon">{{> message/loading }}</div>
+                    {{> core/loading }}
                 </span>
             {{/preference}}
         {{/preferenceenabled}}

message/templates/notification_popover.mustache

@@ -59,7 +59,7 @@
             data-original-title="{{#str}} markallread {{/str}}"
             aria-role="button">
             <span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
-            <span class="loading-icon">{{#pix}} y/loading, core, {{#str}} loading, mod_assign {{/str}} {{/pix}}</span>
+            {{> core/loading }}
         </a>
         <a href="{{{urls.preferences}}}"
             data-toggle="tooltip"