From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 13 Apr 2015 16:11:37 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~39
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2d87b060d44dd87c762e104dd232524736ee683e;hp=69894313781f00267451de0266c7e31739bb483c;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/templates/_widget-monitor.html b/portal/templates/_widget-monitor.html
index cb7af4fc..6a7ab7a7 100644
--- a/portal/templates/_widget-monitor.html
+++ b/portal/templates/_widget-monitor.html
@@ -14,14 +14,18 @@
 	$(document).ready(function() {
 		$.get('/monitor/services', function(result) {
 			for (var r in result) {
-				html = '<div class="col-xs-6 col-sm-4 col-md-3 s-monitor"><div class="row">';
-				html += '<div class="col-md-2"><img src="{{ STATIC_URL }}icons/'+result[r].status+'.png"></div>';
-				html += '<div class="col-md-8">';
-				html += '<h4>'+result[r].name+'<h4>';
-				html += '<span class="subtitle">'+result[r].type+'</span>';
-				if (typeof(result[r].version) != 'undefined')
-					html += ' <span class="version">version '+result[r].version+'</span>';
-				html += '</div></div></div>';
+                if(r == 'error'){
+                    html = '<div style="padding-left:20px;">no monitoring available</div>'
+                }else{
+				    html = '<div class="col-xs-6 col-sm-4 col-md-3 s-monitor"><div class="row">';
+				    html += '<div class="col-md-2"><img src="{{ STATIC_URL }}icons/'+result[r].status+'.png"></div>';
+				    html += '<div class="col-md-8">';
+				    html += '<h4>'+result[r].name+'<h4>';
+				    html += '<span class="subtitle">'+result[r].type+'</span>';
+				    if (typeof(result[r].version) != 'undefined')
+				    	html += ' <span class="version">version '+result[r].version+'</span>';
+				    html += '</div></div></div>';
+                }
 				$('div#monitor-services').append(html);
 			}
 		});