From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net> Date: Mon, 15 Sep 2014 15:22:47 +0000 (+0200) Subject: management requests table reorganization X-Git-Tag: myslice-1.2~1^2~49 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0da8ec3b44008ab846661f63d1cb44e90a362a80;p=unfold.git management requests table reorganization --- diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html index 346ecb03..5117f9ac 100644 --- a/portal/templates/management-tab-requests.html +++ b/portal/templates/management-tab-requests.html @@ -87,56 +87,90 @@ </div> {% if my_authorities %} - {% 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.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> - - <table class="table"> - <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}} -- Url: {{request.number_of_nodes}} -- Email: {{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}} + <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> + {% 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 %} - {% 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> + </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 %}