OneLab Dashboard: using session if user is PI

[unfold.git] / portal / templates / onelab / onelab_home-view.html

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index 944bcbe..d98d1b1 100644 (file)
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -6,54 +6,17 @@
 {% 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 '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 request.session.user.pi %}
                <div class="col-md-3">
                        <h3>
                                EXPERIMENT
@@ -232,14 +195,12 @@
                $('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
---------*/
+
+        myslice.loadSlices();
+        
 });
 </script>
-{# widget "_widget-monitor.html" #}
+{% widget "_widget-monitor.html" %}
 {# widget "_widget-stats-top-slices.html" #}
 
 {% endblock %}