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;hp=5e2a7ccbf63b0c71a74c21ca03454dbf0a81ca89;p=unfold.git

merge
---

diff --git a/portal/actions.py b/portal/actions.py
index 482a746d..aa156a54 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -61,8 +61,8 @@ def get_jfed_identity(request):
             private_key = account_config['user_private_key']
             user_hrn = account_config.get('user_hrn','N/A')
             platform_detail = get_myslice_platform(request)
-            #registry = get_registry_url(request)
-            registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/'
+            registry = get_registry_url(request)
+            #registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/'
             jfed_identity = user_hrn + '\n' + registry + '\n' + private_key 
             return jfed_identity
         else:
diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 1e99b36f..e61a6475 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -47,14 +47,21 @@
                 <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">
@@ -135,18 +142,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 ) {
@@ -159,25 +162,11 @@
 			$('div#'+$(this).data('panel')).show();
 		});
 		
-});
-</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>
--->
+<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 %}