X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;fp=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;h=53f353c280da8228e0b76ec100c877850ed86e39;hb=958afd7b86e20e1529c2f7cc4662b47205945c40;hp=5d632b6da2255615c78911ddfe26382012dbf726;hpb=6f1b4de65529aa12b6acad29575335bd8692837a;p=myslice.git

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 5d632b6d..53f353c2 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -6,6 +6,12 @@
 {% widget '_widget-news.html' %}
 </div> -->
 {% if username %}
+{% block head %} 
+<script type="text/javascript" src="https://java.com/js/dtjava.js"/>
+<script type="text/javascript">
+</script>
+{% endblock head %}
+
 {% widget "_widget-no_credentials.html" %}
 <div class="container dashboard">
 	<div class="row">
@@ -20,10 +26,10 @@
 				EXPERIMENT
 			</h3>
 			<div>
-				<a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
+				<a href="/portal/slice_request"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
 			</div>
 			<div>
-				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create Slice</button>
+				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
 			</div>
 			<div>
 				<p><strong>Your slices </strong>
@@ -40,10 +46,9 @@
 				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 			</div>
 			<h3 title="Some tools do their own slice creation and management.">Experiment now</h3>
-			<a class="btn btn-primary" style="width: 150px;" 
-                    href='http://jfed.iminds.be/releases/5.4-dev/r2289/webstart/experimenter/jfed-experimenter.jnlp'
-					title="Click here to start your experiment with jFed" 
-					onclick="return  launchApplication('http://jfed.iminds.be/releases/5.4-dev/r2289/webstart/experimenter/jfed-experimenter.jnlp');">
+			<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>
 		</div>
 		<div class="col-md-3">
@@ -52,7 +57,7 @@
 				<a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a>
 			</div>
 			<div>
-				<button id="projectrequestbtn" type="button" class="btn btn-default" style="width:165px;"><span class="glyphicon glyphicon-plus"></span> Join Project</button>
+				<button id="projectrequestbtn" type="button" class="btn btn-default" style="width:165px;"><span class="glyphicon glyphicon-plus"></span> Create/Join project</button>
 			</div>
 			<div>
 				<button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
@@ -136,6 +141,17 @@
 
 <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}}";
+
+            dtjava.launch({url: config.java8_jnlp, params: {'login-certificate-string' : certkey } } , platform8, {});
+            //launchjFed();
+        });
 	    {%if 'no_creds' in user_cred or 'creds_expired' in user_cred %}
         localStorage.clear();
         $.post("/cache/clear/", function( data ) {
@@ -173,7 +189,8 @@
 });
 </script>
 
-<!--for jfed tool-->
+<!--
+for jfed tool
 <script type="text/javascript" src="{{STATIC_URL}}js/fed4fire_dtjava_orig.js"></script>
 <script>
 	function launchApplication(jnlpfile) {
@@ -188,6 +205,7 @@
         return false;
      }
 </script>
+-->
 {# widget "_widget-monitor.html" #}
 {# widget "_widget-stats-top-slices.html" #}