management requests table reorganization

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

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index 5117f9a..2445aab 100644 (file)
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -87,79 +87,34 @@
 </div>
 {% if my_authorities %}
        
-       {% for authority in my_authorities.items %}
-    
-    <div class="col-md-12">
-        <h2>Authorities</h2>
-    </div>
-    <div class="col-md-12">
+       {% for authority, requests in my_authorities.items %}
+       
+       <div class="col-md-12">
+               <h2>{{authority|default:"Authorities"}}</h2>
+       </div>
+       <div class="col-md-12">
         <table class="table">
+          
         {% for request in requests %}
     
-          <tr>
-            <td>{{authority}}</td>
-            <td>
+         <tr>
+           <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><u>{{ request.type }}</u></td>
+           <td><i>{{authority|default:request.site_name}}</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}}
             {% 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>
@@ -299,5 +254,5 @@
 <br />
 <div class="col-md-12">
        <button class="btn btn-onelab" type="button" id="portal__validate" onclick="on_click_event();"><span class="glyphicon glyphicon-ok"></span> Validate</button>
-       <button class="btn btn-onelab" type="button" id="portal__reject" onclick="on_click_reject();"><span class="glyphicon glyphicon-remove"></span> Reject</button>
+       <button class="btn btn-danger" type="button" id="portal__reject" onclick="on_click_reject();"><span class="glyphicon glyphicon-remove"></span> Reject</button>
 </div>