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

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index f0d2387b..53f353c2 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -6,47 +6,13 @@
 {% widget '_widget-news.html' %}
 </div> -->
 {% if username %}
-<!-- Modal- No credentials -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                            <h4 class="modal-title" id="myModalLabel">No credentials are delegated to the portal</h4>
-                    </div>
-                    <div class="modal-body" style="text-align:justify;">
-					<p>You are getting this message for any of the following reasons:</p>
-					<ul>
-						<li>If your account is still pending for validation</li>
-						<li>If you press the "Clear Credentials" button</li>
-						<li>If you "Generate a new key pair"</li>
-						<li>If a new slice is added to your account</li>
-					</ul>
-					<p>Unless your account has not yet been validated, it is sufficient to refresh the page or go back to the home page. 
-						The portal will then regenerate your credentials. In some cases it may take more time than usual. If nothing works, 
-						then please logout and login back into to the portal.
-					</p>
-					<h3>Manual delegation of credentials</h3>
-						<p>
-							You have selected upon sign-up to upload your public key. As you have uploaded your own public key, 
-							the portal can no longer generate your credentials automatically. In order to have your credentials 
-							delegated to the portal, please follow these instructions:
-						</p>
-						<ul>
-							<li>Your account must first be validated by the manager of your organization.</li>
-							<li>In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to
-								<a href="/portal/manual_delegation" target="_blank">delegate your credentials to the portal.</a></li>
-						</ul>
-					</p>
-					<h3>Contact support</h3>
-					<p>If you don't have the above mentioned cases and still have this message, please  <a href="/contact/" target="_blank">contact us</a>.</p>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-</div>
+{% 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 %}
@@ -55,23 +21,22 @@
 	{%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%}
-		{%if 'is_pi'  in pi %}
 		<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> 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>
 					<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 OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
-					such as on the PlanetLab Europe portal, those slices will not appear here."
+					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>
 
@@ -81,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/r1389/webstart/experimenter/jfed-experimenter.jnlp'
-					title="Click here to start your experiment with jFed" 
-					onclick="return  launchApplication('http://jfed.iminds.be/releases/r1389/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">
@@ -93,88 +57,24 @@
 				<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="/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: 150px;" class="btn btn-default"><span class="glyphicon glyphicon-stats"></span>Testbeds' status</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">Username:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
-	    	</div>
-		</div>
-	</div>
-	{%else%}
-	<div class="row">
-		<div class="col-md-4">
-			<h3>
-				EXPERIMENT
-			</h3>
-			<div>
-				<a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
+				<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="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
+				<button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</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 OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
-					such as on the PlanetLab Europe portal, those slices will not appear here."
+				<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>
+  				</p>
 			</div>
 			<div>	
-				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
+				<div id="home-project-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
 			</div>
-			{% if pending_slices %}
-			<p><strong>Pending slices</strong>
-			<span title="Slices that you have requested and are pending for validation by the contact person of your organization."
-				class="glyphicon glyphicon-info-sign">
-			<ul>
-			{% for slices in pending_slices %}
-			<li>{{slices}}</li>
-			{% endfor %}
-			</ul>
-			</span>
-			</p>
-			{%endif%}
-			<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/r1389/webstart/experimenter/jfed-experimenter.jnlp'
-					title="Click here to start your experiment with jFed" 
-					onclick="return  launchApplication('http://jfed.iminds.be/releases/r1389/webstart/experimenter/jfed-experimenter.jnlp');">
-                    <span class="glyphicon glyphicon-cloud"></span> jFed</a>	
+
 		</div>
-		<div class="col-md-4">
+		<div class="col-md-3">
 			<h3>
 				SUPPORT
 			</h3>
@@ -186,11 +86,14 @@
 			</div>
 			<p></p>
 			<div>
-    			<button id="statbtn" type="button" style="width: 150px;" 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>
 		
-		<div class="col-md-4">
+		<div class="col-md-3">
 			<h3>
 				ACCOUNT
 			</h3>
@@ -208,7 +111,6 @@
 	    	</div>
 		</div>
 	</div>
-	{%endif%}
 
 </div>
 {% else %}
@@ -239,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');
@@ -254,41 +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/";
 		});
+		$('button#projectrequestbtn').click(function() {
+			window.location="/portal/project_request/";
+		});
 
-        /*
-            Launch queries to get the resources and leases in Manifold Cache
-        */
-            
-        $.post("/rest/resource/", function( data ) {
-        });
-        $.post("/rest/lease/", function( data ) {
-        });
-        
-        /*-------
-        List of slices has been moved in 
-        portal/templates/base.html
-        This is now in localStorage 
-        --------*/
-        // myslice.user is in LocalStorage
-        if(myslice.user.slices.length>0){
-            $.each( myslice.user.slices, function(i, val) {
-                /*
-                Launch a Query for each slice to get resources and leases in Manifold Cache
-                */
-                $.post("/rest/slice/", { 'filters': { 'slice_hrn' : val } }, function(data) {
-                });
-            });
-        }
+        myslice.loadSlices();
 });
 </script>
 
-<!--for jfed tool-->
+<!--
+for jfed tool
 <script type="text/javascript" src="{{STATIC_URL}}js/fed4fire_dtjava_orig.js"></script>
 <script>
 	function launchApplication(jnlpfile) {
@@ -303,6 +205,7 @@
         return false;
      }
 </script>
+-->
 {# widget "_widget-monitor.html" #}
 {# widget "_widget-stats-top-slices.html" #}