X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fmanagement-tab-requests.html;h=db4ace23b85ab223d93af7ccc2d37122439ad27d;hb=111d0fcb9681bf94ff184fe43bf636b6d672cbff;hp=e784636308dbb66a74c2cd17353443e5ef352e3e;hpb=fcf3ea6fd57f59157e3d20ccc5b3a1aeb6b17f77;p=unfold.git

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index e7846363..db4ace23 100644
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -1,6 +1,18 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 		$("li#nav-request").addClass("active");
+		$('table.requests').dataTable({
+		    "sDom": "frtiS",
+            "bScrollCollapse": true,
+            "bStateSave": true,
+            "bPaginate": false,
+            "bLengthChange": false,
+            "bFilter": false,
+            "bSort": true,
+            "bInfo": false,
+            "bAutoWidth": true,
+            "bAutoHeight": false,
+		});
 	});
 	function on_click_event() {
 		var ids = []; 
@@ -82,84 +94,57 @@
 	}
 </script>
 
+<div class="container-fluid">
 <div class="col-md-12">
 	<h2>From your authorities</h2>
 </div>
 {% if my_authorities %}
+<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 authority in my_authorities.items %}
-    
-    <div class="col-md-12">
-        <h2>Authorities</h2>
-    </div>
-    <div class="col-md-12">
-        <table class="table">
         {% for request in requests %}
-    
-          <tr>
-            <td>{{authority}}</td>
-            <td>
+        
+        {% if request.type == 'user' %}
+    	<tr>
+    	{% elif request.type == 'slice' %}
+    	<tr class="info">
+    	{% else %}
+    	<tr class="active">
+    	{% endif %}
+    	    <td><span class="gray small">{{ request.id }}</span></td>
+    	    <td>
             {% if request.allowed == 'allowed' %}
             <input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
             {% else %}
                 {% if request.allowed == 'expired' %}expired{% else %}denied{% endif %}
             {% endif %}
             </td>
-            <td>{{ request.type }}</td>
-            <td>{{ request.id }}</td>
-            <td>
-            {% if request.type == 'user' %}
-                <b>{{request.first_name}} {{request.last_name}}</b> <a href="mailto:{{request.email}}">{{request.email}}</a>
-            {% else %}
-                {% if 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}}
-                {% else %} {# authority #}
-                <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
-                {% endif %}
-            {% endif %}
-            </td>
-            <td>{{ request.timestamp }}</td>
-            
-            <td><span id='portal__status__{{request.type}}__{{request.id}}'></span></td>
-    
-        <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
-          </tr>
-    
-        {% endfor %}
-        </table>
-    </div>
-    {% endfor %}
-    
-    
-	{% for requests in my_authorities.items %}
-	
-	<div class="col-md-12">
-		<h2>{{authority}}</h2>
-	</div>
-	<div class="col-md-12">
-        <table class="table">
-        {% for request in requests %}
-    
-    	  <tr>
-    	    <td>{{authority}}</td>
-    		<td>
-    		{% if request.allowed == 'allowed' %}
-    		<input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
-    		{% else %}
-    			{% if request.allowed == 'expired' %}expired{% else %}denied{% endif %}
-    		{% endif %}
-    		</td>
-    		<td>{{ request.type }}</td>
-    		<td>{{ request.id }}</td>
+            <td><span class="type">{{ request.type }}</span></td>
+    	    <td><i>{{authority}}{{request.site_authority}}</i></td>
     		<td>
             {% if request.type == 'user' %}
-                <b>{{request.first_name}} {{request.last_name}}</b> <a href="mailto:{{request.email}}">{{request.email}}</a>
+                <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 %}
-                {% if 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}}
-                {% else %} {# authority #}
-                <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
-                {% endif %}
+            <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
             {% endif %}
     		</td>
     		<td>{{ request.timestamp }}</td>
@@ -170,21 +155,24 @@
     	  </tr>
     
         {% endfor %}
-    	</table>
-	</div>
+    	
 	{% endfor %}
-
+	   </tbody>
+    </table>
+   </div>
 {% else %}
 	<div class="col-md-12">
 		<i>There is no pending request waiting for validation.</i>
 	</div>
 {% 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>
@@ -217,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 %}
@@ -232,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>
@@ -276,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 %}
@@ -291,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">