From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 15 Sep 2014 14:43:00 +0000 (+0200)
Subject: merge
X-Git-Tag: myslice-1.2~1^2~51
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=53f7d81c045337639dcbcb7c69bb7c197e8c5d5d

merge
---

53f7d81c045337639dcbcb7c69bb7c197e8c5d5d
diff --cc portal/templates/onelab/onelab_management-tab-requests.html
index 87b8e8e3,87b8e8e3..e2557794
--- a/portal/templates/onelab/onelab_management-tab-requests.html
+++ b/portal/templates/onelab/onelab_management-tab-requests.html
@@@ -78,12 -78,12 +78,12 @@@
  		<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}}
++            <b>{{request.first_name}} {{request.last_name}}</b> <a href="mailto:{{request.email}}">{{request.email}}</a>
          {% 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}}
++            <b>{{request.slice_name}}</b> -- 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}}
++            <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
              {% endif %}
          {% endif %}
  		</td>