Skip to content

Commit 7b1477c

Browse files
jricherjricher
committed
added sub indicators to loading sheets
1 parent 6f5d689 commit 7b1477c

File tree

7 files changed

+88
-98
lines changed

7 files changed

+88
-98
lines changed

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
<div id="breadcrumbs"></div>
2525
<div id="loadingbox" class="sheet hide fade" data-sheet-parent="#breadcrumbs">
2626
<div class="sheet-body">
27-
Loading <span id="loading"></span>...
28-
<div class="progress progress-striped active">
29-
<div class="bar" style="width: 0%"></div>
30-
</div>
27+
<p>Loading...</p>
28+
<p><span id="loading"></span></p>
3129
</div>
3230
</div>
3331
<span id="content">

‎openid-connect-server-webapp/src/main/webapp/resources/js/admin.js‎

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -460,61 +460,15 @@ var AppRouter = Backbone.Router.extend({
460460

461461
this.breadCrumbView.render();
462462

463-
// set up loading dependencies
464-
465-
/*
466-
this.clientListView.dependsOn = [this.systemScopeList];
467-
this.whiteListListView.dependsOn = [this.whiteListList, this.clientList];
468-
this.accessTokensListView.dependsOn = [this.clientList];
469-
this.refreshTokenListView.dependsOn = [this.clientList];
470-
*/
471-
472-
473-
//
474-
// Several items depend on the clients and whitelists being loaded, so we're going to pre-fetch them here
475-
// and not start the app router until they're loaded.
476-
//
477-
478-
// load things in the right order:
479-
480-
$('#loadingbox').show('slow');
481-
$("#loading").html("server configuration");
463+
$('#loadingbox').sheet('show');
464+
$("#loading").html('<span class="label" id="loading-system">System Configuration</span>');
482465
var base = $('base').attr('href');
483466
$.getJSON(base + '.well-known/openid-configuration', function(data) {
484467
app.serverConfiguration = data;
485-
/** /
486-
$("#content .progress .bar").css("width", "20%");
487-
$("#loading").html("scopes");
488-
app.systemScopeList.fetch({
489-
success: function(collection, response) {
490-
$("#content .progress .bar").css("width", "40%");
491-
$("#loading").html("clients");
492-
app.clientList.fetch({
493-
success: function(collection, response) {
494-
$("#content .progress .bar").css("width", "60%");
495-
$("#loading").html("whitelists");
496-
app.whiteListList.fetch({
497-
success: function(collection, response) {
498-
$("#content .progress .bar").css("width", "80%");
499-
$("#loading").html("statistics");
500-
app.clientStats.fetch({
501-
success: function(model, response) {
502-
/**/
503-
$("#loadingbox .progress .bar").css("width", "100%");
504-
$("#loading").html("console");
505-
var baseUrl = $.url(app.serverConfiguration.issuer);
506-
Backbone.history.start({pushState: true, root: baseUrl.attr('relative') + 'manage/'});
507-
$('#loadingbox').sheet('hide');
508-
/** /
509-
}
510-
});
511-
}
512-
});
513-
}
514-
});
515-
}
516-
});
517-
/**/
468+
$('#loading-system').addClass('label-success');
469+
var baseUrl = $.url(app.serverConfiguration.issuer);
470+
Backbone.history.start({pushState: true, root: baseUrl.attr('relative') + 'manage/'});
471+
$('#loadingbox').sheet('hide');
518472
});
519473

520474
},

‎openid-connect-server-webapp/src/main/webapp/resources/js/client.js‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,17 @@ var ClientListView = Backbone.View.extend({
248248
}
249249

250250
$('#loadingbox').sheet('show');
251-
$('#loading').html('clients');
252-
253-
$.when(this.model.fetchIfNeeded(),
254-
this.options.whiteListList.fetchIfNeeded(),
255-
this.options.stats.fetchIfNeeded(),
256-
this.options.systemScopeList.fetchIfNeeded()).done(function() {
251+
$('#loading').html('<span class="label" id="loading-clients">Clients</span> ' +
252+
'<span class="label" id="loading-whitelist">Whitelist</span> ' +
253+
'<span class="label" id="loading-stats">Statistics</span> ' +
254+
'<span class="label" id="loading-scopes">Scopes</span> '
255+
);
256+
257+
$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-clients').addClass('label-success');}}),
258+
this.options.whiteListList.fetchIfNeeded({success:function(e) {$('#loading-whitelist').addClass('label-success');}}),
259+
this.options.stats.fetchIfNeeded({success:function(e) {$('#loading-stats').addClass('label-success');}}),
260+
this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
261+
.done(function() {
257262
$('#loadingbox').sheet('hide');
258263
callback();
259264
});
@@ -306,13 +311,18 @@ var ClientListView = Backbone.View.extend({
306311
refreshTable:function(e) {
307312
e.preventDefault();
308313
$('#loadingbox').sheet('show');
309-
$('#loading').html('clients');
314+
$('#loading').html('<span class="label" id="loading-clients">Clients</span> ' +
315+
'<span class="label" id="loading-whitelist">Whitelist</span> ' +
316+
'<span class="label" id="loading-stats">Statistics</span> ' +
317+
'<span class="label" id="loading-scopes">Scopes</span> '
318+
);
310319

311320
var _self = this;
312-
$.when(this.model.fetch(),
313-
this.options.whiteListList.fetch(),
314-
this.options.stats.fetch(),
315-
this.options.systemScopeList.fetch()).done(function() {
321+
$.when(this.model.fetch({success:function(e) {$('#loading-clients').addClass('label-success');}}),
322+
this.options.whiteListList.fetch({success:function(e) {$('#loading-whitelist').addClass('label-success');}}),
323+
this.options.stats.fetch({success:function(e) {$('#loading-stats').addClass('label-success');}}),
324+
this.options.systemScopeList.fetch({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
325+
.done(function() {
316326
$('#loadingbox').sheet('hide');
317327
_self.render();
318328
});

‎openid-connect-server-webapp/src/main/webapp/resources/js/grant.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,15 @@ var ApprovedSiteListView = Backbone.View.extend({
4545
}
4646

4747
$('#loadingbox').sheet('show');
48-
$('#loading').html('approved sites');
48+
$('#loading').html('<span class="label" id="loading-grants">Approved Sites</span> ' +
49+
'<span class="label" id="loading-clients">Clients</span> ' +
50+
'<span class="label" id="loading-scopes">Scopes</span> '
51+
);
4952

50-
$.when(this.model.fetchIfNeeded(),
51-
this.options.clientList.fetchIfNeeded(),
52-
this.options.systemScopeList.fetchIfNeeded()).done(function() {
53+
$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-grants').addClass('label-success');}}),
54+
this.options.clientList.fetchIfNeeded({success:function(e) {$('#loading-clients').addClass('label-success');}}),
55+
this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
56+
.done(function() {
5357
$('#loadingbox').sheet('hide');
5458
callback();
5559
});
@@ -115,11 +119,15 @@ var ApprovedSiteListView = Backbone.View.extend({
115119
e.preventDefault();
116120
var _self = this;
117121
$('#loadingbox').sheet('show');
118-
$('#loading').html('approved sites');
122+
$('#loading').html('<span class="label" id="loading-grants">Approved Sites</span> ' +
123+
'<span class="label" id="loading-clients">Clients</span> ' +
124+
'<span class="label" id="loading-scopes">Scopes</span> '
125+
);
119126

120-
$.when(this.model.fetch(),
121-
this.options.clientList.fetch(),
122-
this.options.systemScopeList.fetch()).done(function() {
127+
$.when(this.model.fetch({success:function(e) {$('#loading-grants').addClass('label-success');}}),
128+
this.options.clientList.fetch({success:function(e) {$('#loading-clients').addClass('label-success');}}),
129+
this.options.systemScopeList.fetch({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
130+
.done(function() {
123131
$('#loadingbox').sheet('hide');
124132
_self.render();
125133
});

‎openid-connect-server-webapp/src/main/webapp/resources/js/scope.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ var SystemScopeListView = Backbone.View.extend({
143143
}
144144

145145
$('#loadingbox').sheet('show');
146-
$('#loading').html('approved sites');
146+
$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
147147

148-
$.when(this.model.fetchIfNeeded()).done(function() {
148+
$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
149+
.done(function() {
149150
$('#loadingbox').sheet('hide');
150151
callback();
151152
});
@@ -166,9 +167,10 @@ var SystemScopeListView = Backbone.View.extend({
166167
e.preventDefault();
167168
var _self = this;
168169
$('#loadingbox').sheet('show');
169-
$('#loading').html('approved sites');
170+
$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
170171

171-
$.when(this.model.fetch()).done(function() {
172+
$.when(this.model.fetch({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
173+
.done(function() {
172174
$('#loadingbox').sheet('hide');
173175
_self.render();
174176
});

‎openid-connect-server-webapp/src/main/webapp/resources/js/token.js‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,17 @@ var TokenListView = Backbone.View.extend({
325325
}
326326

327327
$('#loadingbox').sheet('show');
328-
$('#loading').html('tokens');
329-
330-
$.when(this.model.access.fetchIfNeeded(),
331-
this.model.refresh.fetchIfNeeded(),
332-
this.options.clientList.fetchIfNeeded(),
333-
this.options.systemScopeList.fetchIfNeeded()).done(function() {
328+
$('#loading').html('<span class="label" id="loading-access">Access Tokens</span> ' +
329+
'<span class="label" id="loading-refresh">Refresh Tokens</span> ' +
330+
'<span class="label" id="loading-clients">Clients</span> ' +
331+
'<span class="label" id="loading-scopes">Scopes</span> '
332+
);
333+
334+
$.when(this.model.access.fetchIfNeeded({success:function(e) {$('#loading-access').addClass('label-success');}}),
335+
this.model.refresh.fetchIfNeeded({success:function(e) {$('#loading-refresh').addClass('label-success');}}),
336+
this.options.clientList.fetchIfNeeded({success:function(e) {$('#loading-clients').addClass('label-success');}}),
337+
this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
338+
.done(function() {
334339
$('#loadingbox').sheet('hide');
335340
callback();
336341
});
@@ -340,12 +345,17 @@ var TokenListView = Backbone.View.extend({
340345
refreshTable:function(e) {
341346
e.preventDefault();
342347
$('#loadingbox').sheet('show');
343-
$('#loading').html('tokens');
348+
$('#loading').html('<span class="label" id="loading-access">Access Tokens</span> ' +
349+
'<span class="label" id="loading-refresh">Refresh Tokens</span> ' +
350+
'<span class="label" id="loading-clients">Clients</span> ' +
351+
'<span class="label" id="loading-scopes">Scopes</span> '
352+
);
344353
var _self = this;
345-
$.when(this.model.access.fetch(),
346-
this.model.refresh.fetch(),
347-
this.options.clientList.fetch(),
348-
this.options.systemScopeList.fetch()).done(function(){
354+
$.when(this.model.access.fetch({success:function(e) {$('#loading-access').addClass('label-success');}}),
355+
this.model.refresh.fetch({success:function(e) {$('#loading-refresh').addClass('label-success');}}),
356+
this.options.clientList.fetch({success:function(e) {$('#loading-clients').addClass('label-success');}}),
357+
this.options.systemScopeList.fetch({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
358+
.done(function(){
349359
_self.render();
350360
$('#loadingbox').sheet('hide');
351361
});

‎openid-connect-server-webapp/src/main/webapp/resources/js/whitelist.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,15 @@ var WhiteListListView = Backbone.View.extend({
5959
}
6060

6161
$('#loadingbox').sheet('show');
62-
$('#loading').html('whitelist');
62+
$('#loading').html('<span class="label" id="loading-whitelist">Whitelist</span>' +
63+
'<span class="label" id="loading-clients">Clients</span>' +
64+
'<span class="label" id="loading-scopes">Scopes</span>'
65+
);
6366

64-
$.when(this.model.fetchIfNeeded(),
65-
this.options.clientList.fetchIfNeeded(),
66-
this.options.systemScopeList.fetchIfNeeded()).done(function() {
67+
$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-whitelist').addClass('label-success');}}),
68+
this.options.clientList.fetchIfNeeded({success:function(e) {$('#loading-clients').addClass('label-success');}}),
69+
this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
70+
.done(function() {
6771
$('#loadingbox').sheet('hide');
6872
callback();
6973
});
@@ -107,11 +111,15 @@ var WhiteListListView = Backbone.View.extend({
107111
e.preventDefault();
108112
var _self = this;
109113
$('#loadingbox').sheet('show');
110-
$('#loading').html('whitelist');
114+
$('#loading').html('<span class="label" id="loading-whitelist">Whitelist</span> ' +
115+
'<span class="label" id="loading-clients">Clients</span> ' +
116+
'<span class="label" id="loading-scopes">Scopes</span> '
117+
);
111118

112-
$.when(this.model.fetch(),
113-
this.options.clientList.fetch(),
114-
this.options.systemScopeList.fetch()).done(function() {
119+
$.when(this.model.fetch({success:function(e) {$('#loading-whitelist').addClass('label-success');}}),
120+
this.options.clientList.fetch({success:function(e) {$('#loading-clients').addClass('label-success');}}),
121+
this.options.systemScopeList.fetch({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
122+
.done(function() {
115123
$('#loadingbox').sheet('hide');
116124
_self.render();
117125
});

0 commit comments

Comments
 (0)