You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/08/08 15:16:58 UTC
svn commit: r1616746 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
js/app/controllers/controllers.js partials/jvm.html
Author: olamy
Date: Fri Aug 8 13:16:58 2014
New Revision: 1616746
URL: http://svn.apache.org/r1616746
Log:
add spinner during loading time
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js?rev=1616746&r1=1616745&r2=1616746&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js Fri Aug 8 13:16:58 2014
@@ -42,6 +42,7 @@ define(['angular','services','morris'],
jvmCpu.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(cpuResults){
var morrisDatas=toMorrisFormat(cpuResults.data);
+ $("#cpu" ).empty();
Morris.Line({
element: 'cpu',
data: morrisDatas,
@@ -59,6 +60,7 @@ define(['angular','services','morris'],
jvmMemory.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(memoryResults){
var morrisDatas=toMorrisFormat(memoryResults.data);
+ $("#memory" ).empty();
Morris.Line({
element: 'memory',
data: morrisDatas,
@@ -76,6 +78,7 @@ define(['angular','services','morris'],
nonHeapMemory.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(memoryResults){
var morrisDatas=toMorrisFormat(memoryResults.data);
+ $("#nonheapmemory" ).empty();
Morris.Line({
element: 'nonheapmemory',
data: morrisDatas,
@@ -93,6 +96,7 @@ define(['angular','services','morris'],
activeThreads.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(results){
var morrisDatas=toMorrisFormat(results.data);
+ $("#activethreads" ).empty();
Morris.Line({
element: 'activethreads',
data: morrisDatas,
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html?rev=1616746&r1=1616745&r2=1616746&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html Fri Aug 8 13:16:58 2014
@@ -23,7 +23,7 @@
</h3>
</div>
<div class="panel-body">
- <div id="cpu"></div>
+ <div id="cpu"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>
@@ -35,7 +35,7 @@
</h3>
</div>
<div class="panel-body">
- <div id="memory"></div>
+ <div id="memory"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>
@@ -47,7 +47,7 @@
</h3>
</div>
<div class="panel-body">
- <div id="nonheapmemory"></div>
+ <div id="nonheapmemory"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>
@@ -59,7 +59,7 @@
</h3>
</div>
<div class="panel-body">
- <div id="activethreads"></div>
+ <div id="activethreads"><i class="fa fa-spinner fa-spin"></i></div>
</div>
</div>
</div>