From: Yasin Date: Thu, 27 Nov 2014 10:45:41 +0000 (+0100) Subject: fixing fed4fire portal X-Git-Tag: myslice-1.1~26^2~1^2~4 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=869ca47090d7b9f6d61495e39f5b4fbf0d339859 fixing fed4fire portal --- diff --git a/portal/templates/fed4fire/fed4fire_base.html b/portal/templates/fed4fire/fed4fire_base.html deleted file mode 100644 index 7eaaf05f..00000000 --- a/portal/templates/fed4fire/fed4fire_base.html +++ /dev/null @@ -1,49 +0,0 @@ -{# This is required by insert_above #}{% insert_handler %} - -Fed4Fire Portal - {{ section }} - - -{# This is where insert_str will end up #}{% media_container prelude %} -{% include 'messages-transient-header.html' %} - - - - - - -{{ header_prelude }} -{% block head %} {% endblock head %} -{# let's add these ones no matter what #} -{% insert_str prelude "js/jquery.min.js" %} -{% insert_str prelude "js/angular/angular.min.js" %} -{% insert_str prelude "js/jquery.html5storage.min.js" %} -{% insert_str prelude "js/messages-runtime.js" %} -{% insert_str prelude "js/class.js" %} -{% insert_str prelude "js/plugin-helper.js" %} -{% insert_str prelude "js/mustache.js" %} -{% insert_str prelude "js/hashtable.js" %} -{% insert_str prelude "js/plugin.js" %} -{% insert_str prelude "js/manifold.js" %} -{% insert_str prelude "css/manifold.css" %} -{% insert_str prelude "css/plugin.css" %} -{% insert_str prelude "js/bootstrap.js" %} -{% insert_str prelude "css/bootstrap.css" %} -{% insert_str prelude "js/bootstrap-datepicker.js" %} -{% insert_str prelude "css/datepicker.css" %} -{% insert_str prelude "js/bootstrap-slider.js" %} -{% insert_str prelude "css/slider.css" %} -{% insert_str prelude "css/topmenu.css" %} -{% insert_str prelude "js/logout.js" %} - - - -{% block container %} - {% block topmenu %} - {% include theme|add:"__widget-topmenu.html" %} - {% endblock topmenu %} - {% include 'messages-transient.html' %} - {% block base_content %} - {% endblock %} -{% endblock container %} - - diff --git a/portal/templates/fed4fire/fed4fire_footer.html b/portal/templates/fed4fire/fed4fire_footer.html new file mode 100644 index 00000000..e69de29b diff --git a/portal/templates/fed4fire/fed4fire_institution.html b/portal/templates/fed4fire/fed4fire_institution.html new file mode 100644 index 00000000..bd361de2 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_institution.html @@ -0,0 +1,185 @@ +{% extends "layout_wide.html" %} + +{% block head %} + +{% endblock head %} + +{% block content %} +
+
+
+
+ Management  >  Institution: +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
Loading Slices
+ + {%if 'is_pi' in pi %} +
+ +
+ {% endif %} +
+
+ +
+
+
Loading Slices
+ + {% if 'is_pi' in pi %} +
+ {% if 'is_pi' in pi %} + + {% else %} + + {% endif %} + + +
+ {% endif %} +
+
+
+
+
+ +{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire_management-tab-requests.html b/portal/templates/fed4fire/fed4fire_management-tab-requests.html new file mode 100644 index 00000000..ddac594d --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_management-tab-requests.html @@ -0,0 +1,288 @@ + + +
+
+

From your authorities

+
+{% if my_authorities %} +
+ + + + + + + + + + + + + + {% for authority, requests in my_authorities.items %} + + {% for request in requests %} + + {% if request.type == 'user' %} + + {% elif request.type == 'slice' %} + + {% else %} + + {% endif %} + + + + + + + + + + + + + {% endfor %} + + {% endfor %} + +
IDTypeAuthorityInfoDateStatus
{{ 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.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} + {% else %} + {{request.site_name}} ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}} + {% endif %} + {{ request.timestamp }}
+
+{% else %} +
+ There is no pending request waiting for validation. +
+{% endif %} +
+ + +
+
+

From your sub-authorities

+
+{% if sub_authorities %} + + {% for authority, requests in sub_authorities.items %} +
+

{{authority}}

+ + + + + + + + {% for request in requests %} + + + + + + + + + + + + {% 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' %} + 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}} -- 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}} + {% endif %} + {% endif %} + {{ request.timestamp }}
+
+ {% endfor %} +{% else %} +
+ There is no pending request waiting for validation. +
+{% endif %} +
+
+

From your authorities with delegation

+
+ +{% if delegation_authorities %} + + {% for authority, requests in delegation_authorities.items %} +
+

{{authority}}

+ + + + + + + + {% for request in requests %} + + + + + + + + + + + + {% 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' %} + 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}} -- 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}} + {% endif %} + {% endif %} + {{ request.timestamp }}
+
+ {% endfor %} +{% else %} +
+ There is no pending request waiting for validation. +
+{% endif %} +
+
+ + +