consistent div name for Loading...

6 files changed, 8 insertions, 6 deletions

diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index b388a55776..5edf171b12 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -8,7 +8,7 @@
 {% if isSuperUser %}
     <h2>{{ 'General_GeneralSettings'|translate }}</h2>
     {{ ajax.errorDiv('ajaxError') }}
-    {{ ajax.loadingDiv('ajaxLoading') }}
+    {{ ajax.loadingDiv() }}
     <table class="adminTable" style='width:900px;'>
         <tr>
             <td style="width:400px;">{{ 'General_AllowPiwikArchivingToTriggerBrowser'|translate }}</td>
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index a5f6e9b943..2c20916bde 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -959,9 +959,9 @@ Segmentation = (function($) {
 
         function toggleLoadingMessage(segmentIsSet) {
             if (segmentIsSet) {
-                $('#ajaxLoading').find('.loadingSegment').show();
+                $('#ajaxLoadingDiv').find('.loadingSegment').show();
             } else {
-                $('#ajaxLoading').find('.loadingSegment').hide();
+                $('#ajaxLoadingDiv').find('.loadingSegment').hide();
             }
         }
 
diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js
index 1fa55f7c58..b6046ee6d9 100644
--- a/plugins/SitesManager/javascripts/SitesManager.js
+++ b/plugins/SitesManager/javascripts/SitesManager.js
@@ -206,7 +206,8 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
                 var idsiteToDelete = $(this).parent().parent().find('#idSite').html();
 
                 $('#confirm').find('h2').text(sprintf(_pk_translate('SitesManager_DeleteConfirm'), '"' + nameToDelete + '" (idSite = ' + idsiteToDelete + ')'));
-                piwikHelper.modalConfirm('#confirm', {yes: function () {
+                piwikHelper.modalConfirm('#confirm', { yes: function () {
+
                     sendDeleteSiteAJAX(idsiteToDelete);
                 }});
             }
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 3f9aaf296f..3f32b04638 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -124,6 +124,7 @@
     {% if adminSites|length == 0 %}
         {{ 'SitesManager_NoWebsites'|translate }}
     {% else %}
+
         <div class="ui-confirm" id="confirm">
             <h2></h2>
             <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 6d6794cd54..871fac3e0d 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -34,7 +34,7 @@
                     <input class="location-provider" name="location-provider" value="{{ id }}" type="radio" {% if currentProviderId == id %}checked="checked"{% endif %}
                            id="provider_input_{{ id }}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/>
                     <label for="provider_input_{{ id }}">{{ provider.title|translate }}</label><br/>
-                    <span class="loadingPiwik" style="display:none;"><img src=""./plugins/Zeitgeist/images/loading-blue.gif"/></span>
+                    <span class="loadingPiwik" style="display:none;"><img src="./plugins/Zeitgeist/images/loading-blue.gif"/></span>
                     <span class="ajaxSuccess" style="display:none;">{{ 'General_Done'|translate }}</span>
                 </p>
 
diff --git a/plugins/Zeitgeist/javascripts/ajaxHelper.js b/plugins/Zeitgeist/javascripts/ajaxHelper.js
index b3915f5897..34303f1346 100644
--- a/plugins/Zeitgeist/javascripts/ajaxHelper.js
+++ b/plugins/Zeitgeist/javascripts/ajaxHelper.js
@@ -275,7 +275,7 @@ function ajaxHelper() {
      */
     this.setLoadingElement = function (element) {
         if (!element) {
-            element = '#ajaxLoading';
+            element = '#ajaxLoadingDiv';
         }
         this.loadingElement = element;
     };