X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;h=6661c7a17c908bcc89c67ecf0c1f74d31c1d99ac;hb=4965380e7c719de6027a04afc58b9a79242e9a61;hp=1b4549def51f5ce635a2fe67154214e8da4a1f77;hpb=299cc74138342ebb5c10409babe39364f989c7b2;p=myslice.git

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 1b4549de..6661c7a1 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -6,72 +6,110 @@
 {% widget '_widget-news.html' %}
 </div> -->
 {% if username %}
+
+{% block head %} 
+<script type="text/javascript" src="https://java.com/js/dtjava.js"></script>
+{% endblock head %}
+
+{% widget "_widget-no_credentials.html" %}
 <div class="container dashboard">
 	<div class="row">
-		<div class="col-md-3">
-			<h3>
-				EXPERIMENT
-			</h3>
-			<div>
-				<a href="#"><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>
-			</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>
-		</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="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
-			</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>
-			</div>
-			<div>
-				<button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
-			</div>
-		</div>
-		
-		<div class="col-md-3">
-			<h3>
-				ACCOUNT
-			</h3>
-			<div>
-				<a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
-			</div>
-			<div>
-				<button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
-			</div>
-			<div>
-				{% if person.last_name %}
-					{{person.first_name}} {{person.last_name}}<br />
-				{% endif %}
-    			<span class="label">Email:</span> <a href='/portal/account/'>{{person.email}}</a>
-	    	</div>
-		</div>
-	</div>
+	    <div class="col-md-12">
+	{%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>
+    </div>
+    <div class="row">
+        <div class="col-sm-4">
+            <h3>
+                <a href="/portal/slice_request"><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" /></a>EXPERIMENT
+            </h3>
+            
+            <div>
+                Your projects and slices
+                <span title="A <b>slice</b> 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. <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>
+            
+            <div>   
+                <div id="home-project-tree"><img 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>
+                <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
+            </div>
+            
+            <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">
+            <div class="row">
+                <h3>
+                    <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="" /></a>ACCOUNT
+                </h3>
+                {% if person.last_name %}
+                <p>
+                    {{person.first_name}} {{person.last_name}}
+                </p>
+                {% endif %}
+                <p>
+                    <span class="glyphicon glyphicon-user"></span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
+                </p>
+            </div>
+            <div class="row">
+                <h3>
+                    <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /></a>MANAGEMENT
+                </h3>
+               
+                <div>
+                    <span class="glyphicon glyphicon-ok"></span> <a href="/portal/institution#requests">Validate Requests</a>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-4">
+            <div class="row">
+                <h3>
+                    <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="" /></a>SUPPORT 
+                </h3>
+                <p>
+                    <span class="glyphicon glyphicon-envelope"></span> <a href="/portal/contact/">Contact</a>
+                </p>
+                <p>
+                    <span class="glyphicon glyphicon-stats"></span> <a target="_blank" href="https://flsmonitor.fed4fire.eu">Testbeds' status</a>
+                    </br />
+                    <span class="glyphicon glyphicon-stats"></span> <a href="/portal/reputation">Testbeds' reputation</a>
+                    
+                </p>
+                <p>
+                    <span class="glyphicon glyphicon-book"></span> <a target="_blank" href="http://doc.fed4fire.eu/">Documentation</a>
+                </p>
+           
+            </div>
+            
+            
+        </div>
+    </div>
 </div>
 {% else %}
 <div class="container-fluid home">
@@ -79,13 +117,13 @@
 		<div class="col-sm-2"></div>
 		<div class="col-sm-4 slogan">
 			<h2>
-				Your Easy Access to Computer Networking Testbeds.
+				Fed4FIRE Portal
 			</h2>
 			<h3>
-				A wide variety of world class testbeds available through your one account.
+				Your easy access to Future Internet Research and Experimentation testbeds belonging to the Fed4FIRE federation.
 			</h3>
 			<h3>
-				 <a href='http://doc.fed4fire.eu' target="_blank">Want to learn more?</a>
+				 <a href='http://doc.fed4fire.eu'>Want to learn more?</a>
 			</h3>
 		</div>
 		<div class="col-sm-4 col-sm-offset-1" style="width:400px; top:16px; float:left;">
@@ -100,44 +138,32 @@
 
 
 <script type="text/javascript">
+   var config = {
+       java8_jnlp: 'http://jfed.iminds.be/jfed-f4f-java8.jnlp',
+       java7_jnlp: 'http://jfed.iminds.be/jfed-f4f-java7.jnlp'
+   };
+
+   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 ) {
+        });
+        {% endif %}
 		$('a.home-tab').click(function() {
 			$('ul.nav-tabs li').removeClass('active');
 			$(this).parent().addClass('active');
 			$('div.home-panel').hide();
 			$('div#'+$(this).data('panel')).show();
 		});
-		$('button#validaterequestbtn').click(function() {
-			window.location="/portal/validate/";
-		});
-		$('button#ticketbtn').click(function() {
-			window.location="/portal/contact/";
-		});
-		$('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
---------*/
+		
 });
 </script>
-<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 %}