From 5d8668700f81d760566d4829e5c3bba506cbc9c9 Mon Sep 17 00:00:00 2001
From: Upayavira <upayavira@apache.org>
Date: Mon, 29 Jun 2015 08:54:27 +0000
Subject: [PATCH] SOLR-7732 Loader icon keeps spinning and is chopped in half

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1688156 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/webapp/web/css/angular/common.css | 4 +++-
 solr/webapp/web/js/angular/app.js      | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/solr/webapp/web/css/angular/common.css b/solr/webapp/web/css/angular/common.css
index e733fb0ba8b..9cc7a18957e 100644
--- a/solr/webapp/web/css/angular/common.css
+++ b/solr/webapp/web/css/angular/common.css
@@ -182,8 +182,10 @@ ul
 
 .universal-loader {
   position: absolute;
-  left: 0px;
+  left: -16px;
   top: 0px;
+  width: 16px;
+  height: 16px;
 }
 
 #wrapper
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js
index c77067df1fe..a99c000682b 100644
--- a/solr/webapp/web/js/angular/app.js
+++ b/solr/webapp/web/js/angular/app.js
@@ -253,7 +253,6 @@ solrAdminApp.config([
   var activeRequests = 0;
 
   var started = function(config) {
-    console.log("start HTTP for " + config.url);
     if (activeRequests == 0) {
       $rootScope.$broadcast('loadingStatusActive');
     }
@@ -267,7 +266,6 @@ solrAdminApp.config([
     if (activeRequests == 0) {
       $rootScope.$broadcast('loadingStatusInactive');
     }
-    console.log("ended");
     if ($rootScope.retryCount>0) {
       $rootScope.connectionRecovered = true;
       $rootScope.retryCount=0;
@@ -280,14 +278,13 @@ solrAdminApp.config([
   };
 
   var failed = function(rejection) {
-    if (rejection.config.params.doNotIntercept) {
-        return rejection;
-    }
     activeRequests--;
     if (activeRequests == 0) {
       $rootScope.$broadcast('loadingStatusInactive');
     }
-    console.log("ERROR " + rejection.status + ": " + rejection.config.url);
+    if (rejection.config.params.doNotIntercept) {
+        return rejection;
+    }
     if (rejection.status === 0) {
       $rootScope.$broadcast('connectionStatusActive');
       if (!$rootScope.retryCount) $rootScope.retryCount=0;