From a4ba880252b2bad72df3f16dd11fdf2206825335 Mon Sep 17 00:00:00 2001 From: Justin Choquette Date: Mon, 23 Oct 2023 16:24:13 -0400 Subject: Single Template Selection For Compatible Dashboards Change-Id: I0a795c2c49fdbe0427182a8789d622003997efcd Signed-off-by: Justin Choquette --- src/templates/anuket/base.html | 89 +++++++++++++++++++++++++++ src/templates/anuket/dashboard/landing.html | 12 ++++ src/templates/anuket/layout.html | 5 ++ src/templates/base/workflow/design_a_pod.html | 20 +++--- src/templates/laas/base.html | 89 --------------------------- src/templates/laas/dashboard/landing.html | 12 ---- src/templates/laas/layout.html | 5 -- src/templates/lfedge/base.html | 2 - src/templates/lfedge/dashboard/landing.html | 19 +----- 9 files changed, 119 insertions(+), 134 deletions(-) create mode 100644 src/templates/anuket/base.html create mode 100644 src/templates/anuket/dashboard/landing.html create mode 100644 src/templates/anuket/layout.html delete mode 100644 src/templates/laas/base.html delete mode 100644 src/templates/laas/dashboard/landing.html delete mode 100644 src/templates/laas/layout.html (limited to 'src/templates') diff --git a/src/templates/anuket/base.html b/src/templates/anuket/base.html new file mode 100644 index 0000000..f980268 --- /dev/null +++ b/src/templates/anuket/base.html @@ -0,0 +1,89 @@ +{% extends "base/base.html" %} +{% load staticfiles %} +{% block logo %} + + + + +{% endblock logo %} + diff --git a/src/templates/anuket/dashboard/landing.html b/src/templates/anuket/dashboard/landing.html new file mode 100644 index 0000000..12d8924 --- /dev/null +++ b/src/templates/anuket/dashboard/landing.html @@ -0,0 +1,12 @@ +{% extends "base/dashboard/landing.html" %} + +{% block about_us %} +

The Lab as a Service (LaaS) project aims to help in the development and testing of LFN projects such as + Anuket + by hosting hardware and providing access to the community. Currently, the only participating lab is the + University of New Hampshire Interoperability Lab (UNH-IOL).

+

To get started, you can request access to a server at the right. PTL's have the ability to design and + book a + whole block of servers with customized layer2 networks (e.g. a Pharos Pod). Read more here: + LaaS Wiki

+{% endblock %} \ No newline at end of file diff --git a/src/templates/anuket/layout.html b/src/templates/anuket/layout.html new file mode 100644 index 0000000..f9b1d99 --- /dev/null +++ b/src/templates/anuket/layout.html @@ -0,0 +1,5 @@ +{% extends "base/layout.html" %} + +{% block head-title %} +LaaS Dashboard +{% endblock head-title %} diff --git a/src/templates/base/workflow/design_a_pod.html b/src/templates/base/workflow/design_a_pod.html index c23e5a8..4804792 100644 --- a/src/templates/base/workflow/design_a_pod.html +++ b/src/templates/base/workflow/design_a_pod.html @@ -7,8 +7,6 @@ {% endblock %} {% block content %} -{% if dashboard == 'laas' %} - @@ -18,13 +16,13 @@
- + - +
@@ -40,18 +38,24 @@

Add Resources*

-

Add up to 8 configurable resources to your pod, then use the navigation arrows to proceed to the next step.

+ {% if constraints.max_hosts != "null" %} +

Add up to {{constraints.max_hosts}} configurable resources to your pod, then use the navigation arrows to proceed to the next step.

+ {% else %} +

Select a resource bundle that you would like to configure. To change the selected resource bundle, remove all added resources.

+ {% endif %}
- 0 / 8 + {% if constraints.max_hosts != "null" %} + 0 / {{constraints.max_hosts}} + {% endif %}
- +

Add Networks*

Define networks to use in your pod. A network may be set as public or private.

@@ -238,8 +242,8 @@ -{% endif %} {% endblock %} diff --git a/src/templates/laas/base.html b/src/templates/laas/base.html deleted file mode 100644 index f980268..0000000 --- a/src/templates/laas/base.html +++ /dev/null @@ -1,89 +0,0 @@ -{% extends "base/base.html" %} -{% load staticfiles %} -{% block logo %} - - - - -{% endblock logo %} - diff --git a/src/templates/laas/dashboard/landing.html b/src/templates/laas/dashboard/landing.html deleted file mode 100644 index 12d8924..0000000 --- a/src/templates/laas/dashboard/landing.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "base/dashboard/landing.html" %} - -{% block about_us %} -

The Lab as a Service (LaaS) project aims to help in the development and testing of LFN projects such as - Anuket - by hosting hardware and providing access to the community. Currently, the only participating lab is the - University of New Hampshire Interoperability Lab (UNH-IOL).

-

To get started, you can request access to a server at the right. PTL's have the ability to design and - book a - whole block of servers with customized layer2 networks (e.g. a Pharos Pod). Read more here: - LaaS Wiki

-{% endblock %} \ No newline at end of file diff --git a/src/templates/laas/layout.html b/src/templates/laas/layout.html deleted file mode 100644 index f9b1d99..0000000 --- a/src/templates/laas/layout.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "base/layout.html" %} - -{% block head-title %} -LaaS Dashboard -{% endblock head-title %} diff --git a/src/templates/lfedge/base.html b/src/templates/lfedge/base.html index 4413340..b8ed8c8 100644 --- a/src/templates/lfedge/base.html +++ b/src/templates/lfedge/base.html @@ -17,8 +17,6 @@
{% endblock logo %} -{% block dropDown %} -{% endblock dropDown %} {% block userDropDownText %} {% if request.user.username %} diff --git a/src/templates/lfedge/dashboard/landing.html b/src/templates/lfedge/dashboard/landing.html index 9a776dc..f04ed4d 100644 --- a/src/templates/lfedge/dashboard/landing.html +++ b/src/templates/lfedge/dashboard/landing.html @@ -1,23 +1,6 @@ {% extends "base/dashboard/landing.html" %} + {% block about_us %}

The Shared Community Lab at the IOL aims to help development and testing of LF Edge projects by hosting hardware and providing access to the community.

To get started, you can request access to a pod at the right.

{% endblock about_us %} - -{% block btnGrp %} - -

To get started, book a pod below:

-
Book a Pod -{% endblock btnGrp %} - -{% block returningUsers %} -{% endblock returningUsers %} -- cgit