From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 16 Apr 2015 12:46:03 +0000 (+0200)
Subject: merge
X-Git-Tag: myslice-1.3~37^2~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1da2bca3b4955efe2a7b3f26a66574ad1d5e9c64;p=myslice.git
merge
---
1da2bca3b4955efe2a7b3f26a66574ad1d5e9c64
diff --cc portal/templates/fed4fire/fed4fire_home-view.html
index 1e99b36f,7e3a5ebe..e61a6475
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@@ -40,21 -40,26 +40,28 @@@
<div id="home-project-tree"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
</div>
<div>
- <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
+
<br />
<span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
+ <br />
+ <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
</div>
- <div class="experiment-tools">
- <h4 title="Some tools do their own slice creation and management.">Experiment now</h4>
- <p>
- <a class="btn btn-primary" id="webstart-button"
- href='http://jfed.iminds.be/releases/5.4-dev/r2314/webstart/experimenter/jfed-experimenter.jnlp'
- title="Click here to start your experiment with jFed">
- <span class="glyphicon glyphicon-cloud"></span> jFed</a>
- </p>
+ <div>
+ <h3 title="Some tools do their own slice creation and management.">Experiment now</h3>
+
+ <button id="start" class="btn btn-primary" style="width:150px;" type="button" onclick="launchjFed()"><span class="glyphicon glyphicon-cloud"></span> Start jFed</button>
+
+ <div id='java7Dialog' title="Old Java version detected" >
+ <p>The latest version of jFed is only compatible with Java 8 or higher. We detected that you are using an older version.</p>
+ <p>Please upgrade to Java 8 to get access to the newest version of jFed. Otherwise, you can use jFed 5.3.2, which is Java 7-compatible.</p>
+ </div>
+
+ <div id='noJavaDialog' title="No Java detected" >
+ <p>jFed requires Java to run. We however couldn't detect a Java installation in your browser.</p>
+ <p>Please install the latest version of Java to continue.</p>
+ </div>
+
</div>
</div>
<div class="col-sm-4">