From 4965380e7c719de6027a04afc58b9a79242e9a61 Mon Sep 17 00:00:00 2001
From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 16 Apr 2015 13:22:36 +0200
Subject: [PATCH] jFed latest version on Dashboard
---
.../fed4fire/fed4fire_home-view.html | 58 ++++++++-----------
1 file changed, 25 insertions(+), 33 deletions(-)
diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 76fc42e4..6661c7a1 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -48,10 +48,19 @@
<div>
<h3 title="Some tools do their own slice creation and management.">Experiment now</h3>
- <a class="btn btn-primary" id="webstart-button" style="width: 150px;"
- 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>
+
+ <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">
@@ -129,18 +138,14 @@
<script type="text/javascript">
- $(document).ready(function() {
- $('#webstart-button').click(function(){
- var platform8 = new dtjava.Platform({javafx: '8+', jvm: '1.8+'});
- var config = {
- java8_jnlp: 'http://jfed.iminds.be/releases/5.4-dev/r2314/webstart/experimenter/jfed-experimenter.jnlp',
- java7_jnlp: 'http://jfed.iminds.be/releases/r2269/webstart/experimenter/jfed-experimenter.jnlp'
- };
- var certkey = "{{jfed_identity}}";
+ var config = {
+ java8_jnlp: 'http://jfed.iminds.be/jfed-f4f-java8.jnlp',
+ java7_jnlp: 'http://jfed.iminds.be/jfed-f4f-java7.jnlp'
+ };
- dtjava.launch({url: config.java8_jnlp, params: {'login-certificate-string' : certkey } } , platform8, {});
- //launchjFed();
- });
+ var certkey = "{{jfed_identity}}";
+
+ $(document).ready(function() {
{%if 'no_creds' in user_cred or 'creds_expired' in user_cred %}
localStorage.clear();
$.post("/cache/clear/", function( data ) {
@@ -155,23 +160,10 @@
});
</script>
-
-<!--
-for jfed tool
-<script type="text/javascript" src="{{STATIC_URL}}js/fed4fire_dtjava_orig.js"></script>
-<script>
- function launchApplication(jnlpfile) {
- dtjava.launch(
- { url : jnlpfile },
- {
- javafx : '2.2+',
- toolkit: 'swing'
- },
- {}
- );
- return false;
- }
-</script>
--->
+<script src='https://authority.ilabt.iminds.be/js/jquery/jquery.min.js'></script>
+<link rel='stylesheet' href='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.css' />
+<script src='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.min.js'></script>
+<script src="//java.com/js/dtjava.js"></script>
+<script src='https://authority.ilabt.iminds.be/js/jfed_webstart_f4fportal.js'></script>
{% endblock %}
--
2.47.0