From 8dac4f0bbfda0b99d1b5b077522cd11e03ee590e Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 7 May 2015 17:37:25 +0200 Subject: [PATCH] Templates: Homeview Dashboard made generic with partial for the specifics --- portal/templates/_login.html | 15 + .../fed4fire/fed4fire_dashboard_links.html | 10 + .../fed4fire/fed4fire_home-view.html | 52 +--- .../fed4fire/fed4fire_jfed_button.html | 16 + portal/templates/fed4fire/fed4fire_login.html | 18 ++ .../fed4fire/fed4fire_registration_view.html | 202 ------------- portal/templates/home-view.html | 277 +++++++----------- portal/templates/onelab/onelab_home-view.html | 16 +- .../onelab/onelab_registration_view.html | 168 ----------- 9 files changed, 170 insertions(+), 604 deletions(-) create mode 100644 portal/templates/_login.html create mode 100644 portal/templates/fed4fire/fed4fire_dashboard_links.html create mode 100644 portal/templates/fed4fire/fed4fire_jfed_button.html create mode 100644 portal/templates/fed4fire/fed4fire_login.html delete mode 100644 portal/templates/fed4fire/fed4fire_registration_view.html delete mode 100644 portal/templates/onelab/onelab_registration_view.html diff --git a/portal/templates/_login.html b/portal/templates/_login.html new file mode 100644 index 00000000..3dffebb0 --- /dev/null +++ b/portal/templates/_login.html @@ -0,0 +1,15 @@ +
+
+

+ Your Easy Access to Computer Networking Testbeds: +

+

+ A wide variety of world class testbeds available through your one account +

+
+
+
+ {% widget '_widget-login-user.html' %} +
+
+
diff --git a/portal/templates/fed4fire/fed4fire_dashboard_links.html b/portal/templates/fed4fire/fed4fire_dashboard_links.html new file mode 100644 index 00000000..925c2b76 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_dashboard_links.html @@ -0,0 +1,10 @@ +

+ Testbeds' status +
+ Testbeds' reputation + +

+

+ Documentation +

+ diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html index ba489516..45b46455 100644 --- a/portal/templates/fed4fire/fed4fire_home-view.html +++ b/portal/templates/fed4fire/fed4fire_home-view.html @@ -26,7 +26,7 @@

- EXPERIMENT + EXPERIMENT

Create/Join project @@ -44,24 +44,7 @@
Loading projects
- -
-

Experiment now

- -

- -

-
-

The latest version of jFed is only compatible with Java 8 or higher. We detected that you are using an older version.

-

Please upgrade to Java 8 to get access to the newest version of jFed. Otherwise, you can use jFed 5.3.2, which is Java 7-compatible.

-
- -
-

jFed requires Java to run. We however couldn't detect a Java installation in your browser.

-

Please install the latest version of Java to continue.

-
- -
+ {% include theme|add:"_jfed_button.html" %}
@@ -100,41 +83,16 @@

Contact

-

- Testbeds' status -
- Testbeds' reputation - -

-

- Documentation -

+ {% include theme|add:"_dashboard_links.html" %}
{% else %} -
+
-
-

- Fed4FIRE Portal -

-

- Your easy access to Future Internet Research and Experimentation testbeds belonging to the - Fed4FIRE federation. -

-
-

- Want to learn more? -

-
-
-
- {% widget '_widget-login-user.html' %} -
-
+ {% include theme|add:"_login.html" %}
diff --git a/portal/templates/fed4fire/fed4fire_jfed_button.html b/portal/templates/fed4fire/fed4fire_jfed_button.html new file mode 100644 index 00000000..92729deb --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_jfed_button.html @@ -0,0 +1,16 @@ +
+

Experiment now

+

+ +

+
+

The latest version of jFed is only compatible with Java 8 or higher. We detected that you are using an older version.

+

Please upgrade to Java 8 to get access to the newest version of jFed. Otherwise, you can use jFed 5.3.2, which is Java 7-compatible.

+
+
+

jFed requires Java to run. We however couldn't detect a Java installation in your browser.

+

Please install the latest version of Java to continue.

+
+ +
+ diff --git a/portal/templates/fed4fire/fed4fire_login.html b/portal/templates/fed4fire/fed4fire_login.html new file mode 100644 index 00000000..0ec31a86 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_login.html @@ -0,0 +1,18 @@ +
+

+ Fed4FIRE Portal +

+

+ Your easy access to Future Internet Research and Experimentation testbeds belonging to the + Fed4FIRE federation. +

+
+

+ Want to learn more? +

+
+
+
+ {% widget '_widget-login-user.html' %} +
+
diff --git a/portal/templates/fed4fire/fed4fire_registration_view.html b/portal/templates/fed4fire/fed4fire_registration_view.html deleted file mode 100644 index ed24384c..00000000 --- a/portal/templates/fed4fire/fed4fire_registration_view.html +++ /dev/null @@ -1,202 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} - -
-
-

User RegistrationUser sign-up

-
-
-
-
-

Questions? Contact us.

-
-
-{% if errors %} -
-
-
    - {% for error in errors %} -
  • {{ error | safe }}
    • - {% endfor %} -
-
-
-{% endif %} -
-
-
-

- {% csrf_token %} - -

-

- -

- {% include theme|add:"_authority_notListed.html" %} -

-
-
- -
-
-

- -

-

- -

-

- -

-

- -

-
- -
-

- -

-

- -

-

- -

-

- -

- -
-
-
-
-

-    I agree to the - terms and conditions. -

-
-
-{% include theme|add:"_register_info.html" %} -
-
-
-

- -

-
-
-
-
- - - - - -{% endblock %} - diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html index 379547cc..45b46455 100644 --- a/portal/templates/home-view.html +++ b/portal/templates/home-view.html @@ -6,199 +6,132 @@ {% widget '_widget-news.html' %}
--> {% if username %} + +{% block head %} + +{% endblock head %} + {% widget "_widget-no_credentials.html" %}
+
+ +
+
+
+

+ EXPERIMENT +

+
+ Create/Join project +
+
+ Create slice +
+
+ Your projects and slices +   + +
Loading projects
+
+ {% include theme|add:"_jfed_button.html" %} +
+
+
+
+

+ ACCOUNT +

+ {% if person.last_name %} +

+ {{person.first_name}} {{person.last_name}} +

+ {% endif %} +

+ {{person.email}} +

+
+
+
+
+

+ MANAGEMENT +

+ + +
+
+
+
+
+
+

+ SUPPORT +

+

+ Contact +

+ {% include theme|add:"_dashboard_links.html" %} +
+
+
+
{% else %}
-
-
-

- Your Easy Access to Computer Networking Testbeds: -

-

- A wide variety of world class testbeds available through your one account -

-
-
-
- {% widget '_widget-login-user.html' %} -
-
-
+ {% include theme|add:"_login.html" %}
+ + + {% endif %} - + + + + {% endblock %} diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html index c9be8b6b..3cf79907 100644 --- a/portal/templates/onelab/onelab_home-view.html +++ b/portal/templates/onelab/onelab_home-view.html @@ -108,21 +108,7 @@ {% else %}
-
-
-

- Your Easy Access to Computer Networking Testbeds: -

-

- A wide variety of world class testbeds available through your one account -

-
-
-
- {% widget '_widget-login-user.html' %} -
-
-
+ {% include theme|add:"_login.html" %}
-{% endblock %} -- 2.43.0