Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[unfold.git] / portal / templates / management-tab-requests.html

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index 6fe0e99..db4ace2 100644 (file)
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -1,8 +1,8 @@
 <script type="text/javascript">
        $(document).ready(function() {
                $("li#nav-request").addClass("active");
-               $('table.requests').dataTable( {
-            "sDom": "frtiS",
+               $('table.requests').dataTable({
+                   "sDom": "frtiS",
             "bScrollCollapse": true,
             "bStateSave": true,
             "bPaginate": false,
@@ -12,7 +12,7 @@
             "bInfo": false,
             "bAutoWidth": true,
             "bAutoHeight": false,
-        } );
+               });
        });
        function on_click_event() {
                var ids = []; 
@@ -99,7 +99,20 @@
        <h2>From your authorities</h2>
 </div>
 {% if my_authorities %}
-       <table class="table-responsive requests">
+<div class="col-md-12">
+       <table class="table requests">
+           <thead>
+        <tr>
+            <th>ID</th>
+            <th></th>
+            <th>Type</th>
+            <th>Authority</th>
+            <th>Info</th>
+            <th>Date</th>
+            <th>Status</th>
+        </tr>
+        </thead>
+        <tbody>
        {% for authority, requests in my_authorities.items %}
        
         {% for request in requests %}
@@ -126,6 +139,10 @@
                 <b>{{request.first_name}} {{request.last_name}}</b> &lt;<a href="mailto:{{request.email}}">{{request.email}}</a>&gt;
             {% elif request.type == 'slice' %}
             <b>{{request.slice_name}}</b> -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+            {% elif request.type == 'project' %}
+            <b>{{request.project_name}}</b>  -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
+            {% elif request.type == 'join' %}
+            <b>{{request.user_hrn}}</b> --  to join {{ request.authority_hrn }}
             {% else %}
             <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
             {% endif %}
@@ -140,7 +157,9 @@
         {% endfor %}
        
        {% endfor %}
+          </tbody>
     </table>
+   </div>
 {% else %}
        <div class="col-md-12">
                <i>There is no pending request waiting for validation.</i>
@@ -148,13 +167,12 @@
 {% endif %}
 </div>
 
-
+{% if sub_authorities %}
 <br />
 <div class="col-md-12">
        <h2>From your sub-authorities</h2>
 </div>
-{% if sub_authorities %}
-       
+
        {% for authority, requests in sub_authorities.items %}
        <div class="col-md-12">
        <h3>{{authority}}</h3>
@@ -187,6 +205,10 @@
                {% else %}
                    {% if request.type == 'slice' %}
                Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+                  {% elif request.type == 'project' %}
+            <b>{{request.project_name}}</b>  -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
+                  {% elif request.type == 'join' %}
+            <b>{{request.user_hrn}}</b> --  to join {{ request.authority_hrn }}
                    {% else %} {# authority #}
                Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
                    {% endif %}
@@ -202,18 +224,13 @@
            </table>
        </div>
        {% endfor %}
-{% else %}
-<div class="col-md-12">
-       <i>There is no pending request waiting for validation.</i>
-</div>
 {% endif %}
+{% if delegation_authorities %}
 <br />
 <div class="col-md-12">
        <h2>From your authorities with delegation</h2>
 </div>
 
-{% if delegation_authorities %}
-       
        {% for authority, requests in delegation_authorities.items %}
        <div class="col-md-12">
                <h3>{{authority}}</h3>
@@ -246,6 +263,8 @@
                        {% else %}
                            {% if request.type == 'slice' %}
                        Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+                           {% elif request.type == 'project' %}
+                    <b>{{request.project_name}}</b>  -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
                            {% else %} {# authority #}
                        Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
                            {% endif %}
@@ -261,10 +280,6 @@
                    </table>
                </div>
                {% endfor %}
-{% else %}
-<div class="col-md-12">
-       <i>There is no pending request waiting for validation.</i>
-</div>
 {% endif %}
 <br />
 <div class="col-md-12">