From 30a535d7e9bdc0e3cf637207c0c100a16db81586 Mon Sep 17 00:00:00 2001 From: Jeremy Plsek Date: Thu, 19 Dec 2019 12:58:33 -0500 Subject: style: make more consistent styles - Fix indentation in places - User settings have better labels - Lab info title now the same as others - Add "empty" sections to be more helpful to the user. They are not using links, since most of the "workflow" is handled by javascript. - Update padding in places to better line up with other elements - Add padding to bootstrap notifications (add check for messages to not just have random padding on the top of the page) - Remove unnecessary text in a form - Remove card-body from table-only or list-only cards (lists and tables are now flush with cards) - Add bg-danger to not-working hosts - Replace True/False text shown to the user with Yes/No - Remove ":" from some headers - Vertical buttons are now in a button group - Add pre-wrap class to avoid pre from breaking box sizing on the booking detail page - Reduce table indent in pod card and add table overflow scrollbar Signed-off-by: Jeremy Plsek Change-Id: If09dca2f2b7386c44eeeb817ef76e8f748e456da --- src/templates/booking/booking_detail.html | 394 ++++++++++++++---------------- 1 file changed, 187 insertions(+), 207 deletions(-) (limited to 'src/templates/booking/booking_detail.html') diff --git a/src/templates/booking/booking_detail.html b/src/templates/booking/booking_detail.html index 99de747..fea2bb6 100644 --- a/src/templates/booking/booking_detail.html +++ b/src/templates/booking/booking_detail.html @@ -8,236 +8,217 @@ {% endblock %} {% block content %} - -
-
-
-
-
-

Overview

- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Purpose{{ booking.purpose }}
Project{{ booking.project }}
Start Time{{ booking.start }}
End Time{{ booking.end }}
Pod Definition{{ booking.resource.template }}
Pod Configuration{{ booking.config_bundle }}
Lab Deployed At{{ booking.lab }}
-
-
+
+
+
+
+

Overview

+
-
-
-
-
-

Pod

- -
-
-
- - {% for host in booking.resource.hosts.all %} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Purpose{{ booking.purpose }}
Project{{ booking.project }}
Start Time{{ booking.start }}
End Time{{ booking.end }}
Pod Definition{{ booking.resource.template }}
Pod Configuration{{ booking.config_bundle }}
Lab Deployed At{{ booking.lab }}
+
+
+
+
+

Pod

+ +
+
+
+ {% for host in booking.resource.hosts.all %} +

{{host.template.resource.name}}

+
+ + + + + + + + + + + + + + + + + - + + + + + + + + + - {% endfor %} -
Hostname:{{host.template.resource.name}}
Machine:{{host.name}}
Role:{{host.config.opnfvRole}}
Image: + {{host.config.image}} +

{{host.template.resource.name}}

RAM:{{host.profile.ramprofile.first.amount}}G, + {{host.profile.ramprofile.first.channels}} channels
CPU: - +
- - + + - - + + - - - - - - - - - - + + +
Hostname:{{host.template.resource.name}}Arch:{{host.profile.cpuprofile.first.architecture}}
Profile:{{host.name}}Cores:{{host.profile.cpuprofile.first.cores}}
Role:{{host.config.opnfvRole}}
Image: - {{host.config.image}} -
RAM:{{host.profile.ramprofile.first.amount}}G, - {{host.profile.ramprofile.first.channels}} channelsSockets:{{host.profile.cpuprofile.first.cpus}}
+
DISK: + - - + + - - + + - - + +
CPU: - - - - - - - - - - - - - -
Arch:{{host.profile.cpuprofile.first.architecture}}
Cores:{{host.profile.cpuprofile.first.cores}}
Sockets:{{host.profile.cpuprofile.first.cpus}}
- 		Size:{{host.profile.storageprofile.first.size}} GiB
DISK: - - - - - - - - - - - - - -
Size:{{host.profile.storageprofile.first.size}} GiB
Type:{{host.profile.storageprofile.first.media_type}}
Mount Point:{{host.profile.storageprofile.first.name}}
- 		Type:{{host.profile.storageprofile.first.media_type}}
Interfaces: - - {% for intprof in host.profile.interfaceprofile.all %} - - - - {% endfor %} -
- - - - - - - - - -
Name:{{intprof.name}}
Speed:{{intprof.speed}}
-
- 		Mount Point:{{host.profile.storageprofile.first.name}}
-
+ + Interfaces: + + + {% for intprof in host.profile.interfaceprofile.all %} + + + + {% endfor %} +
+ + + + + + + + + +
Name:{{intprof.name}}
Speed:{{intprof.speed}}
+
+ + +
-
+ {% endfor %}
-
-
-
-

Deployment Progress

-

These are the different tasks that have to be completed before your deployment is ready

- -
-
-
- - - - - - - - {% for task in booking.job.get_tasklist %} - - - - + + + {% endfor %} +
StatusLab ResponseType
- {% if task.status < 100 %} -
- {% elif task.status < 200 %} - - {% 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 %} + +
+
+
+

Deployment Progress

+

These are the different tasks that have to be completed before your deployment is ready

+ +
+
+ + + + + + + + {% for task in booking.job.get_tasklist %} + + + + - - - {% endfor %} -
StatusLab ResponseType
+ {% if task.status < 100 %} +
+ {% elif task.status < 200 %} + + {% 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 %} - 		- {{ task.type_str }} -
-
-
+ {% else %} + Message from Lab: 
{{ task.message }}
+ {% endif %} + {% else %} + No response provided (yet) + {% endif %} +
+ {{ task.type_str }} +
-
-
-
-
-

PDF

- -
-
-
- 
-                                    {{pdf}}
-
-
-
-
+
+
+
+

PDF

+ +
+
+
+ 
+{{pdf}}
+
@@ -260,7 +241,6 @@ -
-- cgit 1.2.3-korg