X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_home-view.html;h=bb5b16c22191011d1c17ce423fa420a1472d812d;hb=a228a3f58b5be134ebd4085294da28618c55268e;hp=4d844f3b09b37ce4165179e183f168bfe66a5c22;hpb=37d19f4884a722c14202037ad08300869498b603;p=unfold.git

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 4d844f3b..bb5b16c2 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -6,57 +6,16 @@
 {% 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>
+{% widget "_widget-no_credentials.html" %}
 <div class="container dashboard">
-	   {%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="row">
-		{%if 'is_pi'  in pi %}
+	{%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%}
+		{% if pi %}
 		<div class="col-md-3">
 			<h3>
 				EXPERIMENT
@@ -71,8 +30,8 @@
 				<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,15 +40,35 @@
 			<div>	
 				<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');">
+                    <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>
@@ -103,7 +82,10 @@
 			</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>
 		
@@ -141,8 +123,8 @@
 				<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>
 				</p>
@@ -161,7 +143,13 @@
 			</ul>
 			</span>
 			</p>
-			{%endif%}	
+			{%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/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');">
+                    <span class="glyphicon glyphicon-cloud"></span> jFed</a>	
 		</div>
 		<div class="col-md-4">
 			<h3>
@@ -177,6 +165,9 @@
 			<div>
     			<button id="statbtn" type="button" style="width: 150px;" class="btn btn-default"><span class="glyphicon glyphicon-stats"></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">
@@ -243,39 +234,38 @@
 		$('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-->
+<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>
 {# widget "_widget-monitor.html" #}
 {# widget "_widget-stats-top-slices.html" #}