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

diff --git a/portal/static/js/experiment.js b/portal/static/js/experiment.js
index 37e98dd..2094cda 100644 (file)
--- a/portal/static/js/experiment.js
+++ b/portal/static/js/experiment.js
@@ -44,8 +44,8 @@ function render_node(platform, node){
         newElement = document.createElement('p');
         var commands = "$ omf stat -t "+node['@component_name']+" # check the status of the node <br>"; 
         commands += "$ omf tell -a on -t "+node['@component_name']+" # turn on the node <br>";
-        commands += "$ omf load -i baseline_grid.nzb -t "+node['@component_name']+" # loading OMF image on the node <br>";
-        commands += "$ omf root@"+node['@component_name']+" # ssh to the node";
+        commands += "$ omf load -i baseline.ndz -t "+node['@component_name']+" # loading OMF image on the node <br>";
+        commands += "$ ssh root@"+node['@component_name']+" # ssh to the node";
 
         newElement.innerHTML = "<p class='command'>"+commands+"</p>";
         elm.appendChild(newElement); 

diff --git a/portal/templates/smartfire/smartfire_email_default_recipients.txt b/portal/templates/smartfire/smartfire_email_default_recipients.txt
new file mode 100644 (file)
index 0000000..f122fa2
--- /dev/null
+++ b/portal/templates/smartfire/smartfire_email_default_recipients.txt
@@ -0,0 +1 @@
+SmartFIRE Support <support@myslice.info>

diff --git a/portal/templates/smartfire/smartfire_email_default_sender.txt b/portal/templates/smartfire/smartfire_email_default_sender.txt
new file mode 100644 (file)
index 0000000..f122fa2
--- /dev/null
+++ b/portal/templates/smartfire/smartfire_email_default_sender.txt
@@ -0,0 +1 @@
+SmartFIRE Support <support@myslice.info>