X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_home-view.html;h=c9be8b6b117c449ddee14d84373e94e8e80f1eda;hb=16a4bf955a76fee81209cd60458745040ed3c711;hp=08670c874744c53f2623b1479bf6ddccd045f79d;hpb=7464fb5c0d4d4857963b52b944b27df41e4ec1f6;p=unfold.git

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index 08670c87..c9be8b6b 100644
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -6,241 +6,163 @@
 {% 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>
-<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 %}
-		<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> 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."
-					class="glyphicon glyphicon-info-sign">
-				</span>
+{% block head %} 
+<script type="text/javascript" src="https://java.com/js/dtjava.js"></script>
+{% endblock head %}
 
-  				</p>
-			</div>
-			<div>	
-				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
-			</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="/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>
-		</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%}
+{% widget "_widget-no_credentials.html" %}
+<div class="container dashboard">
 	<div class="row">
-		<div class="col-md-4">
-			<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>
-				<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."
-					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>
-			{% 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%}	
-		</div>
-		<div class="col-md-4">
-			<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>
-		</div>
-		
-		<div class="col-md-4">
-			<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>
-	{%endif%}
+	    <div class="col-md-12" id="credentials_msg" style="display:none;">
+	{%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="" />EXPERIMENT</a>
+            </h3>
+            <div>
+                <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
+            </div>
+            <div class="dashboard-create-slice">
+                <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
+            </div>
+            <div class="projects-tree">
+                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 id="home-project-tree"><img class="projects-loading" src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
+            </div>
+            <!--            
+            <div class="experiment-tools">
+                <h4 title="Some tools do their own slice creation and management.">Experiment now</h4>
+                
+                <p class="jfed">
+                    <button id="start" class="btn btn-primary" type="button" onclick="launchjFed()"><span class="glyphicon glyphicon-cloud"></span> Start jFed</button>
+                </p>
+                <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">
+                <div class="col-sm-12">
+                    <h3>
+                        <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="" /></a><a href="/portal/account/">ACCOUNT</a>
+                    </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>
+            <div class="row">
+                <div class="col-sm-12">
+                    <h3>
+                        <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /></a><a href="/portal/institution">MANAGEMENT</a>
+                    </h3>
+                   
+                    <div>
+                        <span class="glyphicon glyphicon-ok"></span> <a href="/portal/institution#requests">Validate Requests</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-4">
+            <div class="row">
+                <div class="col-sm-12">
+                    <h3>
+                        <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="" /></a><a href="/portal/support">SUPPORT</a>
+                    </h3>
+                    <p>
+                        <span class="glyphicon glyphicon-envelope"></span> <a href="/portal/contact/">Contact</a>
+                    </p>
+                </div>
+            </div>            
+        </div>
+    </div>
 </div>
 {% else %}
 <div class="container-fluid home">
-	<div class="">
-		<div class="col-sm-2"></div>
-		<div class="col-sm-4 slogan">
-			<h2>
-				Your Easy Access to Computer Networking Testbeds:
-			</h2>
-			<h3>
-				A wide variety of world class testbeds available through your one account
-			</h3>
-		</div>
-		<div class="col-sm-5 col-sm-offset-1">
-   			<div class="row">
-				{% widget '_widget-login-user.html' %}
-			</div>
-		</div>
-		<div class="col-sm-1"></div>
-	</div>
+    <div class="">
+        <div class="col-sm-2"></div>
+        <div class="col-sm-4 slogan">
+            <h2>
+                Your Easy Access to Computer Networking Testbeds:
+            </h2>
+            <h3>
+                A wide variety of world class testbeds available through your one account
+            </h3>
+        </div>
+        <div class="col-sm-5 col-sm-offset-1">
+            <div class="row">
+                {% widget '_widget-login-user.html' %}
+            </div>
+        </div>
+        <div class="col-sm-1"></div>
+    </div>
 </div>
+<script type="text/javascript">
+	$(document).ready(function() {
+        localStorage.clear();
+    });
+</script>
+
 {% endif %}
 
 
 <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/institution#requests";
-		});
-		$('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/";
-		});
-
-        myslice.loadSlices();
-        
-});
+		
+    });
 </script>
-{# widget "_widget-monitor.html" #}
-{# widget "_widget-stats-top-slices.html" #}
+<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>
+<link rel='stylesheet' href='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.css' />
 
+{% widget "_widget-monitor.html" %}
 {% endblock %}