X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fvalidate_pending.html;h=9ddf01c946ffff74751f83c6b9899f58803b2ae9;hb=3167207804460a2c42e1e5a8346c597f9832d295;hp=74176ea329d4785e6142e3dc0c7daef8173fd1ec;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git

diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html
index 74176ea3..9ddf01c9 100644
--- a/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@ -6,7 +6,7 @@
 	function on_click_event() {
 		var ids = []; 
 		$('.portal__validate__checkbox').each(function(i, el) {
-			if ($(el).attr('checked')) {
+			if ($(el).prop('checked')) {
 				// portal__validate__checkbox__slice__2
 				var id_array = $(el).attr('id').split('__');
 				// push(slice__2)
@@ -28,10 +28,10 @@
 								status_str += ' -- ';
 
 							if (result.status) {
-								status_str += '<font color="green">' + name + '</font>';
+								status_str += '<font color="green">OK</font>';
 								$('#portal__validate__checkbox__' + request_type__id).hide();
 							} else {
-								status_str += '<font color="red">' + name + ' (' + result.description + ')</font>';
+								status_str += '<font color="red">ERROR: ' + result.description + '</font>';
 							}
 						});
 						$('#portal__status__' + request_type__id).html(status_str)
@@ -46,32 +46,29 @@
 {% endblock %}
 
 {% block unfold1_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>
-        
-        {% if request.type == 'user' %}
-        <span class='details'>First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}}</span>
-        {% 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>
-            {% else %} {# authority #}
-        <span class='details'>TODO</span>
-            {% endif %}
-        {% endif %}
 
+	  <tr>
+		<td>
 		{% if request.allowed == 'allowed' %}
 		<input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
 		{% else %}
@@ -81,26 +78,53 @@
 				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 #}
+        TODO
+            {% 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 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 +134,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 #}
+        TODO
+            {% 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 %}