X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;h=c278a1d1e0599827e7e278bece159b85cebd303e;hb=cea5cbc30b0ea84beddb00bbac59c0d9ca224c2d;hp=cdefd33399b709e67793175d872c2da3ac8661fe;hpb=d46e16e2f5947147a208ee9721660639330e0d6b;p=myslice.git

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index cdefd333..c278a1d1 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -28,7 +28,12 @@
             <h3>
                 <a href="/portal/slice_request"><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" /></a>EXPERIMENT
             </h3>
-            
+            <div>
+                <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
+            </div>
+            <div class="dashboard-create-slice">
+                <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
+            </div>
             <div class="projects-tree">
                 Your projects and slices
                 <span title="A <b>slice</b> is a set of testbed resources on which you can conduct an experiment. 
@@ -37,22 +42,25 @@
                 those slices will not appear here. <br /><br /> A <b>project</b> is a sub-authority under the responsability of your institution gathering users, 
                 who will be able to create slices for their experiments." class="glyphicon glyphicon-info-sign">&nbsp;</span> 
              
-                <div id="home-project-tree"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
+                <div id="home-project-tree"><img class="projects-loading" 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>
-            </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 class="jfed">
+                    <button id="start" class="btn btn-primary" type="button" onclick="launchjFed()"><span class="glyphicon glyphicon-cloud"></span> Start jFed</button>
                 </p>
+                <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">
@@ -133,18 +141,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 ) {
@@ -157,25 +161,10 @@
 			$('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>
--->
+<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 %}