From dd5ee4bf80742d76f1863a49c8e725dd896b51a0 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Wed, 4 Jun 2014 13:34:08 -0400
Subject: [PATCH] created generic "loading" page to sit behind loading sheet,
 avoids sheet getting re-used (which doesn't tend to work)

---
 .../src/main/webapp/WEB-INF/views/manage.jsp              | 8 +++++++-
 .../src/main/webapp/resources/js/admin.js                 | 4 ----
 .../src/main/webapp/resources/js/client.js                | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
index fe2dd83a1..b269629a2 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
@@ -24,11 +24,17 @@
 				<div id="breadcrumbs"></div>
 				<div id="loadingbox" class="sheet hide fade" data-sheet-parent="#breadcrumbs">
 					<div class="sheet-body">
-			                <p>Loading...</p>
+			                <p>Loading:</p>
 			                <p><span id="loading"></span></p>
 	                </div>
 	            </div>
                 <span id="content">
+                	<div class="well">
+	                	<div><h3>Loading...</h3></div>
+	               	    <div class="progress progress-striped active">
+							<div class="bar" style="width: 100%;"></div>
+						</div>
+					</div>
                 </span>
             </div>
         </div>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
index c1c9f4403..b0f0e47a7 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
@@ -470,15 +470,11 @@ var AppRouter = Backbone.Router.extend({
 
         this.breadCrumbView.render();
 
-        $('#loadingbox').sheet('show');
-        $("#loading").html('<span class="label" id="loading-system">System Configuration</span>');
         var base = $('base').attr('href');
         $.getJSON(base + '.well-known/openid-configuration', function(data) {
         	app.serverConfiguration = data;
-        	$('#loading-system').addClass('label-success');
         	var baseUrl = $.url(app.serverConfiguration.issuer);
 			Backbone.history.start({pushState: true, root: baseUrl.attr('relative') + 'manage/'});
-			$('#loadingbox').sheet('hide');
         });
 
     },
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index e7809f738..2b4df9aac 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -304,8 +304,8 @@ var ClientListView = Backbone.View.extend({
     	$('#loadingbox').sheet('show');
     	$('#loading').html('<span class="label" id="loading-clients">Clients</span> ' +
     			'<span class="label" id="loading-whitelist">Whitelist</span> ' + 
-    			'<span class="label" id="loading-stats">Statistics</span> ' + 
-    			'<span class="label" id="loading-scopes">Scopes</span> '
+    			'<span class="label" id="loading-scopes">Scopes</span> ' +
+    			'<span class="label" id="loading-stats">Statistics</span> ' 
     			);
 
     	$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-clients').addClass('label-success');}}),
@@ -412,8 +412,8 @@ var ClientListView = Backbone.View.extend({
     	$('#loadingbox').sheet('show');
     	$('#loading').html('<span class="label" id="loading-clients">Clients</span> ' +
     			'<span class="label" id="loading-whitelist">Whitelist</span> ' + 
-    			'<span class="label" id="loading-stats">Statistics</span> ' + 
-    			'<span class="label" id="loading-scopes">Scopes</span> '
+    			'<span class="label" id="loading-scopes">Scopes</span> ' + 
+    			'<span class="label" id="loading-stats">Statistics</span> ' 
     			);
 
     	var _self = this;