X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fvalidate_pending.html;h=c9b971fe44cee28abfaea870f1ecaa5c4285d83d;hb=cd4ef6cdd7ea6d4ead183970d20d4c3739481251;hp=24a6dbcb3a2e5146f8ee0d1105ecfdb2f9e36fd1;hpb=fb97c712a4dacebb73dbaa647549973f897f0b2a;p=unfold.git

diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html
index 24a6dbcb..c9b971fe 100644
--- a/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@ -45,10 +45,10 @@
 </script>
 {% endblock %}
 
-{% block unfold1_main %}
-
+{% block unfold_main %}
+<div class="onelab-title well-lg">
 <h1>Pending requests</h1>
-
+</div>
 <hr/>
 <h2>My authorities</h2>
 
@@ -56,7 +56,8 @@
 
 {% for authority, requests in my_authorities.items %}
 <h3>{{authority}}</h3>
-    <table width=100% border=1>
+<div class="container">
+    <table width=100% border=1 style="color:white;">
       <th>
         <td>type</td>
         <td>id</td>
@@ -87,7 +88,7 @@
             {% 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}}
             {% else %} {# authority #}
-        TODO
+        Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
             {% endif %}
         {% endif %}
 		</td>
@@ -106,6 +107,59 @@
 <i>There is no pending request waiting for validation.</i>
 {% endif %}
 
+{% if sub_authorities %}
+<hr/>
+<h2>Sub-Authorities</h2>
+
+{% for authority, requests in sub_authorities.items %}
+<h3>{{authority}}</h3>
+    <table width=100% border=1>
+      <th>
+        <td>type</td>
+        <td>id</td>
+        <td>details</td>
+        <td>timestamp</td>
+        <td>status</td>
+      </th>
+    {% for request in requests %}
+	  <tr>
+		<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 #}
+				denied
+			{% endif %}
+		{% endif %}
+		</td>
+		<td>{{ request.type }}</td>
+		<td>{{ request.id }}</td>
+		<td>
+        {% if request.type == 'user' %}
+        Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}}
+        {% 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}}
+            {% else %} {# authority #}
+        Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{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>
+{% endfor %}
+<hr/>
+
+{% endif %}
+
 
 {% if delegation_authorities %}
 <hr/>
@@ -143,9 +197,9 @@
             {% 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}}
             {% else %} {# authority #}
-        TODO
+        Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
             {% endif %}
-        {% endif %}
+       {% endif %}
 		</td>
 		<td>{{ request.timestamp }}</td>
 		
@@ -161,5 +215,6 @@
 {% endif %}
 
 <input type='button' id='portal__validate' value='Validate' onclick='on_click_event();'/>
-
+</div>
+<!-- End of the container div -->
 {% endblock %}