X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;h=5d632b6da2255615c78911ddfe26382012dbf726;hb=708e4ed85f2ef9d5b17097cb71a5879b244ebfe9;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..5d632b6d 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -6,8 +6,15 @@
 {% widget '_widget-news.html' %}
 </div> -->
 {% if username %}
+{% 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
@@ -16,42 +23,69 @@
 				<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>
+				<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'
+			<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/r1306/webstart/experimenter/jfed-experimenter.jnlp');">jFed</a>
-				</li></ul>
-			</div>
+					onclick="return  launchApplication('http://jfed.iminds.be/releases/5.4-dev/r2289/webstart/experimenter/jfed-experimenter.jnlp');">
+                    <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> 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" 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>
 		
 		<div class="col-md-3">
@@ -68,10 +102,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">
@@ -79,13 +114,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;">
@@ -101,6 +136,11 @@
 
 <script type="text/javascript">
 	$(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');
@@ -108,24 +148,32 @@
 			$('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/";
 		});
+		$('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) {
@@ -140,4 +188,7 @@ This should go into session
         return false;
      }
 </script>
+{# widget "_widget-monitor.html" #}
+{# widget "_widget-stats-top-slices.html" #}
+
 {% endblock %}