Booking {{booking.id}}

{{booking.purpose}} ({{booking.id}})

id: {{booking.id}}
lab: {{booking.lab}}
resource: {{booking.resource.template.name}}
start: {{booking.start}}
end: {{booking.end}}
purpose: {{booking.purpose}}
Lab: {{booking.lab}}
Project: {{booking.project}}
Start: {{booking.start}}
End: {{booking.end}}

Details @@ -41,15 +39,14 @@

Booking {{booking.id}}

{{booking.purpose}} ({{booking.id}})

id: {{booking.id}}
lab: {{booking.lab}}
resource: {{booking.resource.template.name}}
start: {{booking.start}}
end: {{booking.end}}
purpose: {{booking.purpose}}
Owner: {{booking.owner}}
Lab: {{booking.lab}}
Project: {{booking.project}}
Start: {{booking.start}}
End: {{booking.end}}

Details @@ -72,17 +69,15 @@

Booking {{booking.id}}

{{booking.purpose}} ({{booking.id}})

id: {{booking.id}}
lab: {{booking.lab}}
resource: {{booking.resource.template.name}}
start: {{booking.start}}
end: {{booking.end}}
purpose: {{booking.purpose}}
owner: {{booking.owner.userprofile.email_addr}}

Owner: {{booking.owner}}

Lab: {{booking.lab}}

Project: {{booking.project}}

Start: {{booking.start}}

End: {{booking.end}}

Details

@@ -101,7 +96,7 @@ current_booking_id = booking_id; } - function submit_cancel_form() { + async function submit_cancel_form() { var ajaxForm = $("#booking_cancel_form"); var formData = ajaxForm.serialize(); req = new XMLHttpRequest(); @@ -110,6 +105,8 @@ req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); req.onerror = function() { alert("problem submitting form"); } req.send(formData); + await new Promise(r => setTimeout(r, 500)); // Quickest solution I could come up with to give liblaas time to mark it as deleted until we do an api rework + location.reload(); } diff --git a/src/templates/base/account/resource_list.html b/src/templates/base/account/resource_list.html index 33ccaff..c16fd07 100644 --- a/src/templates/base/account/resource_list.html +++ b/src/templates/base/account/resource_list.html @@ -1,21 +1,26 @@ {% extends "base.html" %} +{% block extrahead %} + +{% endblock %} {% block content %}

-{% for resource in resources %} +{% for resource in templates %}

Resource {{resource.id}}

id: {{resource.id}}
name: {{resource.name}}
description: {{resource.description}}
Description: {{resource.pod_desc}}
Lab: {{resource.lab_name}}
Hosts: {% for h in resource.host_list %}{{h.hostname}}{% if not forloop.last %}, {% endif %}{% endfor %}
Networks: {% for n in resource.networks %}{{n.name}}{% if not forloop.last %}, {% endif %}{% endfor %}

@@ -29,67 +34,19 @@ {% endfor %}

diff --git a/src/templates/base/base.html b/src/templates/base/base.html index 351bd9a..cd4269c 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -6,7 +6,6 @@ - {% endblock %} {% block basecontent %} @@ -101,7 +100,7 @@

+ -

{% if title %}

@@ -188,4 +169,4 @@

-{% endblock basecontent %} +{% endblock basecontent %} \ No newline at end of file diff --git a/src/templates/base/booking/booking_detail.html b/src/templates/base/booking/booking_detail.html index 70958f6..e4687ad 100644 --- a/src/templates/base/booking/booking_detail.html +++ b/src/templates/base/booking/booking_detail.html @@ -19,22 +19,28 @@ code {

Overview

- +

- - + + - - + + + + + + @@ -43,10 +49,6 @@ code { - - - - @@ -54,175 +56,6 @@ code {

Username	{{ posix_username }}	Owner	{{ booking.owner }}
Purpose	{{ booking.purpose }}	Collaborators	+ {{ collab_string}} +
Project	{{ booking.project }}
Purpose	{{ booking.purpose }}
Start Time	{{ booking.start }}	End Time	{{ booking.end }}
Pod Definition	{{ booking.resource.template }}
Lab Deployed At	{{ booking.lab }}

Pod

- -

- {% for host in booking.resource.get_resources %} -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Hostname:

Machine:

Role:

Is Headnode:

Image:

- {{host.config.image}} -

RAM:

{{host.profile.ramprofile.first.amount}}G, - {{host.profile.ramprofile.first.channels}} channels

CPU:

- - - - - - - - - - - - - -

Arch:	{{host.profile.cpuprofile.first.architecture}}
Cores:	{{host.profile.cpuprofile.first.cores}}
Sockets:	{{host.profile.cpuprofile.first.cpus}}

DISK:

- - - - - - - - - - - - - -

Size:	{{host.profile.storageprofile.first.size}} GiB
Type:	{{host.profile.storageprofile.first.media_type}}
Mount Point:	{{host.profile.storageprofile.first.name}}

Interfaces:

- - {% for intprof in host.profile.interfaceprofile.all %} - - - - {% endfor %} -

- - - - - - - - - -

Name:	{{intprof.name}}
Speed:	{{intprof.speed}}

- {% endfor %} -

Diagnostic Information

- -

- - - - - - - - - {% for host in booking.resource.get_resources %} - - - - {% endfor %} -

Job ID:

CI Files

- - - - - - - - - {% for ci_file in host.config.cloud_init_files.all %} - - - - - {% endfor %} -

Configs:
Host:	{{host.name}}
{{ci_file.id}}	- - - - - Cloud Config Content - - - - -{{ci_file.text}} - - - - - - -

@@ -230,144 +63,43 @@ code {

Deployment Progress

These are the different tasks that have to be completed before your deployment is ready. If this is taking a really long time, let us know here!

- +

+ - - - {% for task in booking.job.get_tasklist %} + {% for host in statuses %} - {% endfor %}

	Resource	Status	Lab Response	Type
- {% if task.status < 100 %} - - {% elif task.status < 200 %} - + + {% if host.status is 'Success' %} + + {% elif host.status is 'InProgress' %} + {% else %} - + {% endif %}	- {% if task.status < 100 %} - PENDING - {% elif task.status < 200 %} - IN PROGRESS - {% else %} - DONE - {% endif %} -	- {% if task.message %} - {% if task.type_str == "Access Task" and user_id != task.config.user.id %} - Message from Lab: --secret-- - {% else %} - Message from Lab: {{ task.message }} - {% endif %} - {% else %} - No response provided (yet) - {% endif %} + {{ host.hostname }}	- {{ task.type_str }} + {{ host.status }}

Resource

Status

Lab Response

Type

- {% if task.status < 100 %} -

- {% elif task.status < 200 %} -

+ + {% if host.status is 'Success' %} +

+ {% elif host.status is 'InProgress' %} +

{% else %} -

{% endif %}

- {% if task.status < 100 %} - PENDING - {% elif task.status < 200 %} - IN PROGRESS - {% else %} - DONE - {% endif %} -

- {% if task.message %} - {% if task.type_str == "Access Task" and user_id != task.config.user.id %} - Message from Lab:

--secret--

- {% else %} - Message from Lab:

{{ task.message }}

- {% endif %} - {% else %} - No response provided (yet) - {% endif %} + {{ host.hostname }}

- {{ task.type_str }} + {{ host.status }}

PDF

- -

-{{pdf}}
-

- - - - {% endblock content %} diff --git a/src/templates/base/dashboard/genericselect.html b/src/templates/base/dashboard/genericselect.html deleted file mode 100644 index 863d33f..0000000 --- a/src/templates/base/dashboard/genericselect.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "workflow/viewport-element.html" %} - -{% load bootstrap4 %} - -{% block content %} - -

Create a Resource - -

Or select from the list below:

- -

- - - -{% endblock content %} diff --git a/src/templates/base/dashboard/landing.html b/src/templates/base/dashboard/landing.html index 8d6a8f7..fea4deb 100644 --- a/src/templates/base/dashboard/landing.html +++ b/src/templates/base/dashboard/landing.html @@ -56,40 +56,15 @@ {% else %} {% block btnGrp %}

To get started, book a server below:

- - Book a Resource + + Book a Pod + + + Design a Pod -

PTLs can use our advanced options to book multi-node pods. If you are a PTL, you may use the options - below: -

- - -

{% endblock btnGrp %} {% endif %}

- - - {% if not request.user.is_anonymous %} - {% block returningUsers %} -

Returning Users

If you're a returning user, some of the following options may be of interest:

- - - My Bookings - - {% if manager == True %} - - {% endif %} -

- {% endblock returningUsers %} - {% endif %}

Booking {{booking.id}}

{{booking.purpose}} ({{booking.id}})

Booking {{booking.id}}

{{booking.purpose}} ({{booking.id}})

Booking {{booking.id}}

{{booking.purpose}} ({{booking.id}})

Resource {{resource.id}}

{{resource.pod_name}}

Overview

Pod

{{host.bundle.template.copy_of.name}}

{{host.config.name}}

Diagnostic Information

Book a Pod

Select Host Or Template:

Global Cloud Init Override

Booking Details

Add Collaborators:

Booking Summary

Confirm Session

Design a Pod

Select a Lab:

Add Resources:

Add Networks:

Configure Connections:

Pod Details

Pod Summary: