X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;h=53f353c280da8228e0b76ec100c877850ed86e39;hb=958afd7b86e20e1529c2f7cc4662b47205945c40;hp=378f920d5c0489e0b4cb584a21549546235f6a4f;hpb=83164968c09d445ea8dc095414e5ce13fff59c99;p=unfold.git

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 378f920d..53f353c2 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -6,55 +6,90 @@
 {% 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">
+	{%if 'no_creds'  in user_cred %}
+      	<p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
+  	{%endif%}
+	{%if 'creds_expired'  in user_cred %}
+    	<p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
+    {%endif%}
 		<div class="col-md-3">
 			<h3>
 				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> Request 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>
+					<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
+					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
+					However, on the Fed4FIRE portal, you will only see slices that you have created through Fed4FIRE. If you have created slices elsewhere, 
+					those slices will not appear here."
+					class="glyphicon glyphicon-info-sign">
+				</span>
+
+  				</p>
 			</div>
 			<div>	
 				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 			</div>
-			 <div>
-     			<button id="jfed" type="button" class="btn btn-default" title="Some tools do their own slice creation and management.">
-				<span class="glyphicon glyphicon-globe"></span>Experiment now</button>
-			 </div>
-			<div>
-				<ul><li>
-					<a class="button2" href='http://jfed.iminds.be/releases/r1306/webstart/experimenter/jfed-experimenter.jnlp'
-					title="Click here to start your experiment with jFed" 
-					onclick="return  launchApplication('http://jfed.iminds.be/releases/r1306/webstart/experimenter/jfed-experimenter.jnlp');">jFed</a>
-				</li></ul>
-			</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>
 		</div>
 		<div class="col-md-3">
 			<h3>MANAGEMENT</h3>
 			<div>
 				<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> Create/Join project</button>
+			</div>
 			<div>
 				<button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
 			</div>
+			<div>
+				<p><strong>Your projects </strong>
+					<span title="A project 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">
+				</span>
+  				</p>
+			</div>
+			<div>	
+				<div id="home-project-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
+			</div>
+
 		</div>
 		<div class="col-md-3">
 			<h3>
 				SUPPORT
 			</h3>
 			<div>
-				<a href="http://doc.fed4fire.eu/support.html" target="_blank"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
+				<a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
 			</div>
 			<div>
 				<button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
 			</div>
 			<p></p>
 			<div>
-    			<button id="statbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-stats"></span>Testbeds' status</button>
+    			<button id="statbtn" type="button" style="width: 170px;" class="btn btn-default"><span class="glyphicon glyphicon-stats" style="margin-right: 10px;"></span>Testbeds' status</button>
+			</div>
+			<div>
+    			<button id="repbtn" type="button" style="width: 170px;" class="btn btn-default"><span class="glyphicon glyphicon-stats"></span>Testbeds' reputation</button>
 			</div>
 		</div>
 		
@@ -72,10 +107,11 @@
 				{% if person.last_name %}
 					{{person.first_name}} {{person.last_name}}<br />
 				{% endif %}
-    			<span class="label">Email:</span> <a href='/portal/account/'>{{person.email}}</a>
+    			<span class="label">Username:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
 	    	</div>
 		</div>
 	</div>
+
 </div>
 {% else %}
 <div class="container-fluid home">
@@ -105,6 +141,22 @@
 
 <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 ) {
+        });
+        {% endif %}
 		$('a.home-tab').click(function() {
 			$('ul.nav-tabs li').removeClass('active');
 			$(this).parent().addClass('active');
@@ -112,7 +164,7 @@
 			$('div#'+$(this).data('panel')).show();
 		});
 		$('button#validaterequestbtn').click(function() {
-			window.location="/portal/validate/";
+			window.location="/portal/institution#requests";
 		});
 		$('button#ticketbtn').click(function() {
 			window.location="/portal/contact/";
@@ -120,19 +172,25 @@
 		$('button#statbtn').click(function() {
     		window.location="https://flsmonitor.fed4fire.eu";
 		});
+		 $('button#repbtn').click(function() {
+     		window.location="/portal/reputation";
+		 });
 		$('button#signupbtn').click(function() {
 			window.location="/portal/register/";
 		});
 		$('button#slicerequestbtn').click(function() {
 			window.location="/portal/slice_request/";
 		});
-/*-------
-List of slices has been moved in 
-portal/templates/base.html
-This should go into session
---------*/
+		$('button#projectrequestbtn').click(function() {
+			window.location="/portal/project_request/";
+		});
+
+        myslice.loadSlices();
 });
 </script>
+
+<!--
+for jfed tool
 <script type="text/javascript" src="{{STATIC_URL}}js/fed4fire_dtjava_orig.js"></script>
 <script>
 	function launchApplication(jnlpfile) {
@@ -147,4 +205,8 @@ This should go into session
         return false;
      }
 </script>
+-->
+{# widget "_widget-monitor.html" #}
+{# widget "_widget-stats-top-slices.html" #}
+
 {% endblock %}