From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 21 Apr 2015 09:52:35 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a8104de58940697d33f0f38cb3c866b7ecf6f4f4;hp=26709c1cd29b40ac2e617a075a085e18da35e87c;p=myslice.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);
 			}
 		});
diff --git a/portal/templates/onelab/onelab_account-view.html b/portal/templates/onelab/onelab_account-view.html
index 985974fb..e0629490 100644
--- a/portal/templates/onelab/onelab_account-view.html
+++ b/portal/templates/onelab/onelab_account-view.html
@@ -260,6 +260,7 @@
 					<th>Slice Name</th> 
 		     		<th>Expiration Date</th>
 					<th>Download</th>
+                    <th>Delete</th>
 		    	</tr>
 				{% for row in my_slices %}     
 		    	<tr class="border_bottom">
@@ -270,6 +271,11 @@
 							<span class="glyphicon glyphicon-download"></span> Download
 						</button> 
 					</td>
+                    <td class="odd"> 
+                        <button class="btn btn-danger btn-xs" name= "del_{{row.slice_name}}" type="submit" title="Download Slice Credentials" onclick="return confirm('Are you sure? If you do so, the slice will be permanently deleted.'); javascript:document.getElementById('button_value').value='del_{{row.slice_name}}';">
+                            <span class="glyphicon glyphicon-remove"></span> Delete
+                        </button> 
+                    </td>
 		    	</tr>
 		    	{%endfor%}
 		  	</table>