From 2d8c7b1e7dd89e0607807e379ae9e8f69e76fb36 Mon Sep 17 00:00:00 2001 From: Yasin Date: Fri, 28 Nov 2014 11:41:42 +0100 Subject: [PATCH] f4f: template migration from onelab to f4f --- .../fed4fire/fed4fire_account-view.html | 169 ++++++++++++----- .../fed4fire_management-tab-about.html | 71 +++++++ .../fed4fire_management-tab-requests.html | 174 ++++++------------ 3 files changed, 255 insertions(+), 159 deletions(-) create mode 100644 portal/templates/fed4fire/fed4fire_management-tab-about.html diff --git a/portal/templates/fed4fire/fed4fire_account-view.html b/portal/templates/fed4fire/fed4fire_account-view.html index ac85870a..13da1254 100644 --- a/portal/templates/fed4fire/fed4fire_account-view.html +++ b/portal/templates/fed4fire/fed4fire_account-view.html @@ -1,7 +1,20 @@ -{% extends "layout_wide.html" %} +{% extends "layout.html" %} {% block content %} +
+
+
+ Account  >  {{ person.email }} +
+
+ {%if 'no_creds' in user_cred %} +

NO CREDENTIALS are delegated to the portal!

+ {%endif%} + {%if 'creds_expired' in user_cred %} +

EXPIRED CREDENTIALS Please delegate again your credentials to the portal!

+ {%endif%} +
{% if messages %} {% endif %} -
-
-
- -
-
+
+
+ +
-
+
@@ -30,14 +41,14 @@ @@ -98,7 +109,7 @@ @@ -108,7 +119,7 @@ {%endif%} - - {%if 'N/A' not in user_private_key%} - - + + - {%else%} - - - {%endif%} - + + + @@ -222,9 +225,9 @@ - + {%endfor%} @@ -277,6 +280,90 @@ {%endif%} + + + + + + + +
@@ -295,7 +382,7 @@
diff --git a/portal/templates/fed4fire/fed4fire_management-tab-about.html b/portal/templates/fed4fire/fed4fire_management-tab-about.html new file mode 100644 index 00000000..bc768a69 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_management-tab-about.html @@ -0,0 +1,71 @@ +{% load portal_filters %} +
+
+ {{authority.name}} +
+
+ {% if authority.name and authority.url %} +

{{authority.name}}

+ {% elif authority.name %} +

{{authority.name}}

+ {% endif %} +

+ {% if authority.address %} + {{authority.address}}
+ {% endif %} + {% if authority.postcode %} + {{authority.postcode}} + {% endif %} + {% if authority.address %} + {{authority.city}}
+ {% endif %} + {% if authority.address %} + {{authority.country}} + {% endif %} +

+
+ + {% if authority.address %} +

Onelab membership

+

+ {{ authority.onelab_membership }} +

+ {% endif %} +
+
+ {% if authority.legal %} +

Legal Contact:

+

+ {% for c in authority_contacts.legal %} + {{ c }}
+ {% endfor %} +

+
+ {% endif %} + {% if authority.scientific %} +

Scientific Contact:

+

+ {% for c in authority_contacts.scientific %} + {{ c }}
+ {% endfor %} +

+
+ {% endif %} + {% if authority.technical %} +

Technical Contact:

+

+ {% for c in authority_contacts.technical %} + {{ c }}
+ {% endfor %} +

+ {% endif %} +
+ diff --git a/portal/templates/fed4fire/fed4fire_management-tab-requests.html b/portal/templates/fed4fire/fed4fire_management-tab-requests.html index ddac594d..e2557794 100644 --- a/portal/templates/fed4fire/fed4fire_management-tab-requests.html +++ b/portal/templates/fed4fire/fed4fire_management-tab-requests.html @@ -1,18 +1,6 @@ -

From your authorities

{% if my_authorities %} -
-
-
Platform: Myslice
+

Platform: Myslice
Email {{ person.email }} -
Generate Keys - ******** - +
@@ -128,7 +139,7 @@ {%if 'N/A' not in user_private_key%} 		Private Key ******** - Private Key ******** -
Identity -
sfi_config use sfi_config file with sfi.py package (pip install sfa) + - Identity - -
-

Tradeoff: Ease-of-use vs Security.
- Ease-of-use: Automatic account delegation. Don't delete private key.
- Security: Manual account delegation. Download & Delete private key. +

+ Automatic vs. Manual delegation of credentials: + Trade-off between ease-of-use & security
{{ row.account_type }} {{ row.account_reference }} -
- - - - - - - - - - - - + {% for authority, requests in my_authorities.items %} - {% for request in requests %} - +
+

{{authority}}

+
+ +
IDTypeAuthorityInfoDateStatus
+ + + + + + + {% for request in requests %} + + + + + + - {% elif request.type == 'slice' %} - - {% else %} - - {% endif %} - - - - - - - - - - - - - {% endfor %} - + {% endif %} + + + + + + + + + {% endfor %} +
+ TypeIdDetailsTimestampStatus
+ {% if request.allowed == 'allowed' %} + + {% else %} + {% if request.allowed == 'expired' %} + expired + {% else %} {# denied #} + denied + {% endif %} + {% endif %} + {{ request.type }}{{ request.id }} {% if request.type == 'user' %} -
{{ request.id }} - {% if request.allowed == 'allowed' %} - - {% else %} - {% if request.allowed == 'expired' %}expired{% else %}denied{% endif %} - {% endif %} - {{ request.type }}{{authority}}{{request.site_authority}} - {% if request.type == 'user' %} - {{request.first_name}} {{request.last_name}} <{{request.email}}> - {% elif request.type == 'slice' %} + {{request.first_name}} {{request.last_name}} {{request.email}} + {% else %} + {% if request.type == 'slice' %} {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} - {% else %} + {% else %} {# authority #} {{request.site_name}} ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}} {% endif %} - {{ request.timestamp }}
{{ request.timestamp }}
{% endfor %} - - -
+ {% else %}
There is no pending request waiting for validation.
{% endif %} -
- - -
+
nnllknjkn

From your sub-authorities

@@ -172,8 +111,10 @@ {% for authority, requests in sub_authorities.items %}
-

{{authority}}

- +

{{authority}}

+ + +
@@ -214,15 +155,14 @@ {% endfor %} -
Type Id
-
+ {% endfor %} {% else %}
There is no pending request waiting for validation.
{% endif %} -
+

From your authorities with delegation

@@ -232,7 +172,8 @@ {% for authority, requests in delegation_authorities.items %}

{{authority}}

- + +
@@ -273,16 +214,13 @@ {% endfor %} -
Type Id
-
+ {% endfor %} {% else %}
There is no pending request waiting for validation.
{% endif %} -
-
-- 2.43.0