From: Yasin Date: Fri, 28 Nov 2014 14:05:17 +0000 (+0100) Subject: f4f: merging with current onelab protal templates X-Git-Tag: myslice-1.1~26^2~1^2 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=cd417eba7221258a2d0cc204d545cd7bed01cd6a f4f: merging with current onelab protal templates --- diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html index 4d844f3b..f0d2387b 100644 --- a/portal/templates/fed4fire/fed4fire_home-view.html +++ b/portal/templates/fed4fire/fed4fire_home-view.html @@ -48,14 +48,13 @@
- {%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 '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 'is_pi' in pi %}

@@ -81,6 +80,12 @@
Loading Slices
+

Experiment now

+ + jFed

MANAGEMENT

@@ -161,7 +166,13 @@

- {%endif%} + {%endif%} +

Experiment now

+ + jFed

@@ -276,6 +287,22 @@ } }); + + + + {# widget "_widget-monitor.html" #} {# widget "_widget-stats-top-slices.html" #} diff --git a/portal/templates/fed4fire/fed4fire_slice-resource-view.html b/portal/templates/fed4fire/fed4fire_slice-resource-view.html new file mode 100644 index 00000000..3fefedf7 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice-resource-view.html @@ -0,0 +1,121 @@ +{% extends "layout_wide.html" %} +{% load portal_filters %} + +{% block head %} + + + +{% endblock %} + +{% block content %} +{% widget '_widget-slice-sections.html' %} +
+
+
+ + {{filter_testbeds}} +
+
+
+ {% if msg %} +

{{ msg }}

+ {% endif %} +
+ +
+
+ {{ filter_status }} +
+
+ {{ apply }} +
+
+ + +
+
+ +
+
+ + + + + +
+
+
+
+ + + {{list_resources}} + +
+
+ {{map_resources}} +
+
+ {{scheduler}} +
+ + + +
+
+
+
+
+
+{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire_slice-view.html b/portal/templates/fed4fire/fed4fire_slice-view.html new file mode 100644 index 00000000..c2d52c35 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice-view.html @@ -0,0 +1,18 @@ +{% extends "layout_wide.html" %} + +{% block head %} +{% endblock %} + +{% block content %} +{% include theme|add:"_widget-slice-sections.html" %} + +
+
...
+
...
+
...
+
...
+ + +
...
+
+{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire_slicerequest_view.html b/portal/templates/fed4fire/fed4fire_slicerequest_view.html new file mode 100644 index 00000000..211f35da --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slicerequest_view.html @@ -0,0 +1,108 @@ +{% extends "layout.html" %} +{% load i18n %} + +{% block content %} +
+
+
+ Experiment  >  Request a new Slice +
+
+
+ + {% if errors %} +
+
+
    + {% for error in errors %} +
  • {{ error }}
    • + {% endfor %} +
+
+
+ {% endif %} + +
+
+
+ {% csrf_token %} + +
+ +
+
+ {%if 'is_pi' in pi %} + + {%else%} + + {%endif%} +
+
+ +
+
+ +
+ {%if 'is_pi' in pi %} + + {%else%} + + {%endif%} +
+ +
+
+ + +{% endblock %} + diff --git a/portal/templates/fed4fire/fed4fire_widget-slice-sections.html b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html index 230a14d2..40761b55 100644 --- a/portal/templates/fed4fire/fed4fire_widget-slice-sections.html +++ b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html @@ -1,29 +1,37 @@ +
+
+
+
+ Experiment  >  Slice: {{ slice }} +
+
+
+
+
+
+
{% if section == "resources" %} {% else %} + {% endif %} +
+
+
\ No newline at end of file diff --git a/portal/templates/fed4fire/fed4fire_widget-topmenu.html b/portal/templates/fed4fire/fed4fire_widget-topmenu.html index 8bce7dda..ddb4518e 100644 --- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html +++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html @@ -20,7 +20,7 @@