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

diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html
index e21cac8a..c9b971fe 100644
--- a/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@ -45,33 +45,85 @@
 </script>
 {% endblock %}
 
-{% block unfold1_main %}
-
+{% block unfold_main %}
+<div class="onelab-title well-lg">
 <h1>Pending requests</h1>
-
+</div>
+<hr/>
 <h2>My authorities</h2>
 
 {% if my_authorities %}
 
 {% for authority, requests in my_authorities.items %}
 <h3>{{authority}}</h3>
+<div class="container">
+    <table width=100% border=1 style="color:white;">
+      <th>
+        <td>type</td>
+        <td>id</td>
+        <td>details</td>
+        <td>timestamp</td>
+        <td>status</td>
+      </th>
     {% for request in requests %}
-    <div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'>
-		<span class='type'>{{ request.type }}</span>
-		<span class='id'>{{ request.id }}</span>
-		<span class='timestamp'>{{ request.timestamp }}</span>
-		<span class='authority'>{{ request.authority_hrn }}</span>
-        
+
+	  <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' %}
-        <span class='details'>First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}}</span>
+        Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}}
         {% else %}
             {% if request.type == 'slice' %}
-        <span class='details'>Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}</span>
+        Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
             {% else %} {# authority #}
-        <span class='details'>TODO</span>
+        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 %}
+
+{% else %}
+<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 %}
@@ -81,26 +133,51 @@
 				denied
 			{% endif %}
 		{% endif %}
-		<span class='status' id='portal__status__{{request.type}}__{{request.id}}'></span>
-	</div>
+		</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/>
 
-{% else %}
-<i>There is no pending request waiting for validation.</i>
 {% endif %}
 
+
 {% if delegation_authorities %}
+<hr/>
 <h2>Authorities with delegation</h2>
 
 {% for authority, requests in delegation_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 %}
-    <div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'>
-		<span class='type'>{{ request.type }}</span>
-		<span class='id'>{{ request.id }}</span>
-		<span class='timestamp'>{{ request.timestamp }}</span>
-		<span class='details'>{{ request.details }}</span>
+	  <tr>
+		<td>
 		{% if request.allowed == 'allowed' %}
 		<input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
 		{% else %}
@@ -110,13 +187,34 @@
 				denied
 			{% endif %}
 		{% endif %}
-		<span class='status' id='portal__status__{{request.type}}__{{request.id}}'></span>
-	</div>
+		</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 %}
 
 <input type='button' id='portal__validate' value='Validate' onclick='on_click_event();'/>
-
+</div>
+<!-- End of the container div -->
 {% endblock %}