Unify loading animations across the system, fixes #930

Closes #930

Merge request studip/studip!546

11 files changed, 14 insertions, 17 deletions

diff --git a/resources/assets/javascripts/bootstrap/application.js b/resources/assets/javascripts/bootstrap/application.js
index 5dd746f..633062c 100644
--- a/resources/assets/javascripts/bootstrap/application.js
+++ b/resources/assets/javascripts/bootstrap/application.js
@@ -74,9 +74,6 @@ STUDIP.ready(function() {
  * application wide setup
  * ------------------------------------------------------------------------ */
 STUDIP.domReady(function () {
-    // AJAX Indicator
-    STUDIP.ajax_indicator = true;
-
     STUDIP.study_area_selection.initialize();
 
     if (document.createElement('textarea').style.resize === undefined) {
diff --git a/resources/assets/javascripts/bootstrap/files.js b/resources/assets/javascripts/bootstrap/files.js
index 2f0c172..72a2a6e 100644
--- a/resources/assets/javascripts/bootstrap/files.js
+++ b/resources/assets/javascripts/bootstrap/files.js
@@ -2,7 +2,7 @@ function searchMoreFiles (button) {
     var table = $(button).closest('table');
     var loading = $('<div class="loading" style="padding: 10px">').html(
         $('<img>')
-            .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+            .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
             .css('width', '24')
             .css('height', '24')
     );
diff --git a/resources/assets/javascripts/bootstrap/members.js b/resources/assets/javascripts/bootstrap/members.js
index b6a5191..ff689bc 100644
--- a/resources/assets/javascripts/bootstrap/members.js
+++ b/resources/assets/javascripts/bootstrap/members.js
@@ -9,7 +9,7 @@ STUDIP.domReady(() => {
                 $('<img>').attr({
                     width: 32,
                     height: 32,
-                    src: STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg'
+                    src: STUDIP.ASSETS_URL + 'images/loading-indicator.svg'
                 })
             );
 
diff --git a/resources/assets/javascripts/bootstrap/statusgroups.js b/resources/assets/javascripts/bootstrap/statusgroups.js
index c79bb32..3ec865b 100644
--- a/resources/assets/javascripts/bootstrap/statusgroups.js
+++ b/resources/assets/javascripts/bootstrap/statusgroups.js
@@ -12,7 +12,7 @@ STUDIP.ready(function() {
                 $('<img>').attr({
                     width: 32,
                     height: 32,
-                    src: STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg'
+                    src: STUDIP.ASSETS_URL + 'images/loading-indicator.svg'
                 })
             );
 
diff --git a/resources/assets/javascripts/bootstrap/subcourses.js b/resources/assets/javascripts/bootstrap/subcourses.js
index cf777da..dd4e1f7 100644
--- a/resources/assets/javascripts/bootstrap/subcourses.js
+++ b/resources/assets/javascripts/bootstrap/subcourses.js
@@ -38,7 +38,7 @@ $(document).on('click', '.toggle-subcourses', function(event) {
                 $('<div class="loading" style="padding: 10px">')
                     .html(
                         $('<img>')
-                            .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                            .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                             .css('width', '24')
                             .css('height', '24')
                     )
diff --git a/resources/assets/javascripts/lib/admission.js b/resources/assets/javascripts/lib/admission.js
index dd46422..307fb15 100644
--- a/resources/assets/javascripts/lib/admission.js
+++ b/resources/assets/javascripts/lib/admission.js
@@ -23,7 +23,7 @@ const Admission = {
         var loading = $gettext('Wird geladen');
         $('#instcourses').empty();
         $('<img/>', {
-            src: STUDIP.ASSETS_URL + 'images/ajax_indicator_small.gif'
+            src: STUDIP.ASSETS_URL + 'images/loading-indicator.svg'
         }).appendTo('#instcourses');
         $('#instcourses').append(loading);
         $('#instcourses').load(targetUrl, data);
diff --git a/resources/assets/javascripts/lib/course_wizard.js b/resources/assets/javascripts/lib/course_wizard.js
index 87e6570..be01ee1 100644
--- a/resources/assets/javascripts/lib/course_wizard.js
+++ b/resources/assets/javascripts/lib/course_wizard.js
@@ -188,7 +188,7 @@ const CourseWizard = {
                     target.children('ul').append(
                         $('<li class="tree-loading">').html(
                             $('<img>')
-                                .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                                .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                                 .css('width', '16')
                                 .css('height', '16')
                         )
@@ -237,7 +237,7 @@ const CourseWizard = {
                         .parent()
                         .append(
                             $('<img>')
-                                .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                                .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                                 .attr('id', 'sem-tree-search-loading')
                                 .css('width', '16')
                                 .css('height', '16')
@@ -542,7 +542,7 @@ const CourseWizard = {
                 left: pos.left
             });
         var loading = $('<img>')
-            .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+            .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
             .css({
                 width: 32,
                 height: 32,
diff --git a/resources/assets/javascripts/lib/fullcalendar.js b/resources/assets/javascripts/lib/fullcalendar.js
index 1a1945a..c511847 100644
--- a/resources/assets/javascripts/lib/fullcalendar.js
+++ b/resources/assets/javascripts/lib/fullcalendar.js
@@ -521,7 +521,7 @@ class Fullcalendar
                     if (!$('#loading-spinner').length) {
                         jQuery('#layout_content').append(
                             $('<div id="loading-spinner" style="position: absolute; top: calc(50% - 55px); left: calc(50% + 135px); z-index: 9001;">').html(
-                                $('<img>').attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                                $('<img>').attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                                     .css({
                                         width: 64,
                                         height: 64
diff --git a/resources/assets/javascripts/lib/resources.js b/resources/assets/javascripts/lib/resources.js
index 36fb3d7..ac182a9 100644
--- a/resources/assets/javascripts/lib/resources.js
+++ b/resources/assets/javascripts/lib/resources.js
@@ -737,7 +737,7 @@ class Resources
                 if (!$('#loading-spinner').length) {
                     jQuery('#layout_content').append(
                         $('<div id="loading-spinner" style="position: absolute; top: calc(50% - 55px); left: calc(50% + 135px); z-index: 9001;">').html(
-                            $('<img>').attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                            $('<img>').attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                                 .css({
                                     width: 64,
                                     height: 64
diff --git a/resources/assets/javascripts/lib/smiley_picker.js b/resources/assets/javascripts/lib/smiley_picker.js
index 8fd85ca..21d8bc2 100644
--- a/resources/assets/javascripts/lib/smiley_picker.js
+++ b/resources/assets/javascripts/lib/smiley_picker.js
@@ -37,7 +37,7 @@ function loadURL(url, callback) {
             var that = this,
                 src = this.src,
                 image = new Image();
-            this.src = STUDIP.ASSETS_URL + 'images/ajax_indicator_small.gif';
+            this.src = STUDIP.ASSETS_URL + 'images/loading-indicator.gif';
 
             image.onload = image.onerror = function() {
                 that.src = src;
diff --git a/resources/assets/javascripts/mvv_course_wizard.js b/resources/assets/javascripts/mvv_course_wizard.js
index 63822f5..d182f34 100644
--- a/resources/assets/javascripts/mvv_course_wizard.js
+++ b/resources/assets/javascripts/mvv_course_wizard.js
@@ -24,7 +24,7 @@ STUDIP.MVV.CourseWizard = {
                     target.children('ul').append(
                         $('<li class="tree-loading">').html(
                             $('<img>')
-                                .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                                .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                                 .css('width', '16')
                                 .css('height', '16')
                         )
@@ -83,7 +83,7 @@ STUDIP.MVV.CourseWizard = {
                         .parent()
                         .append(
                             $('<img>')
-                                .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+                                .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
                                 .attr('id', 'lvgroup-tree-search-loading')
                                 .css('width', '16')
                                 .css('height', '16')
@@ -260,7 +260,7 @@ STUDIP.MVV.CourseWizard = {
                 left: pos.left
             });
         var loading = $('<img>')
-            .attr('src', STUDIP.ASSETS_URL + 'images/ajax-indicator-black.svg')
+            .attr('src', STUDIP.ASSETS_URL + 'images/loading-indicator.svg')
             .css({
                 width: 32,
                 height: 32,