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/?a=commitdiff_plain;h=53f7d81c045337639dcbcb7c69bb7c197e8c5d5d;hp=12f6fb654348344e820a42d4b6c61c37ff4eb6eb;p=myslice.git

merge
---

diff --git a/portal/homeview.py b/portal/homeview.py
index bd7b2cd8..a3a145c4 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -115,9 +115,7 @@ class HomeView (FreeAccessView, ThemeView):
             # XXX Something like an invalid session seems to make the execute fail sometimes, and thus gives an error on the main page
             platform_details = execute_query(self.request, platform_query)
             account_details = execute_query(self.request, account_query)
-            if platform_details is None:
-                env['person'] = None
-            else:
+            if platform_detail is not None :
                 for platform_detail in platform_details:
                     for account_detail in account_details:
                         if 'platform_id' in platform_detail:
@@ -126,14 +124,14 @@ class HomeView (FreeAccessView, ThemeView):
                                     account_config = json.loads(account_detail['config'])
                                     if 'myslice' in platform_detail['platform']:
                                         acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
-                # assigning values
-                if acc_auth_cred=={} or acc_auth_cred=='N/A':
-                    pi = "is_not_pi"
-                else:
-                    pi = "is_pi"
-            
-                env['pi'] = pi 
-                env['person'] = self.request.user
+            # assigning values
+            if acc_auth_cred=={} or acc_auth_cred=='N/A':
+                pi = "is_not_pi"
+            else:
+                pi = "is_pi"
+
+            env['pi'] = pi     
+            env['person'] = self.request.user
         else: 
             env['person'] = None
 
diff --git a/portal/templates/onelab/onelab_management-tab-requests.html b/portal/templates/onelab/onelab_management-tab-requests.html
index 87b8e8e3..e2557794 100644
--- a/portal/templates/onelab/onelab_management-tab-requests.html
+++ b/portal/templates/onelab/onelab_management-tab-requests.html
@@ -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>
diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index 55b27531..1430dae6 100644
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -22,7 +22,7 @@
 	
 	<p>
 	 NITOS resources are not directly accessible. You will need to log in on a gateway server and from there access the node.
-	 The NITO server address is nitlab.inf.uth.gr, so to connect to the NITOS server:
+	 The NITOS server address is nitlab.inf.uth.gr, so to connect to the NITOS server:
 	</p>
 	<p class="command">
 	$ ssh your_slice_name@nitlab.inf.uth.gr