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/dashboard/lab_detail.html | 85 ++++++++------- src/templates/dashboard/lab_list.html | 31 +++--- src/templates/dashboard/landing.html | 114 +++++++++------------ .../dashboard/multiple_select_filter_widget.html | 4 +- .../dashboard/searchable_select_multiple.html | 8 +- 5 files changed, 110 insertions(+), 132 deletions(-) (limited to 'src/templates/dashboard') diff --git a/src/templates/dashboard/lab_detail.html b/src/templates/dashboard/lab_detail.html index 3c41caf..a12c5da 100644 --- a/src/templates/dashboard/lab_detail.html +++ b/src/templates/dashboard/lab_detail.html @@ -9,14 +9,14 @@ {% block content %}
-
+

Lab Profile

-
- +
+
@@ -58,14 +58,14 @@ -
+

Host Profiles

-
-
Lab Name: {{lab.name}}
+
+
{% for profile in hostprofiles %} @@ -78,35 +78,32 @@ - -
+

Networking Capabilities

-
-
{{profile.name}}
- - - - - - - -
Block Size: (number of VLANs allowed per deployment){{lab.vlan_manager.block_size}}
Overlapping Vlans Allowed (user can pick which VLANs they wish to use): {{lab.vlan_manager.allow_overlapping}}
-
+ + + + + + + + +
Block Size: (number of VLANs allowed per deployment){{lab.vlan_manager.block_size}}
Overlapping Vlans Allowed (user can pick which VLANs they wish to use): {{lab.vlan_manager.allow_overlapping|yesno:"Yes,No"}}
-
+

Images

-
- +
+
@@ -128,37 +125,35 @@
-
+

Lab Hosts

-
-
Name Owner
+
+ + + + + + + + {% for host in lab.host_set.all %} - - - - - + + + + {% if host.working %} + + {% else %} + + {% endif %} + - {% for host in lab.host_set.all %} - - - - - {% if host.working %} - - {% else %} - - {% endif %} - - - {% endfor %} -
NameProfileBookedWorkingVendor
NameProfileBookedWorkingVendor{{host.labid}}{{host.profile}}{{host.booked|yesno:"Yes,No"}}YesNo{{host.vendor}}
{{host.labid}}{{host.profile}}{{host.booked}}{{host.working}}{{host.working}}{{host.vendor}}
-
+ {% endfor %} +
diff --git a/src/templates/dashboard/lab_list.html b/src/templates/dashboard/lab_list.html index 2efebfc..ba627bc 100644 --- a/src/templates/dashboard/lab_list.html +++ b/src/templates/dashboard/lab_list.html @@ -1,27 +1,26 @@ {% extends "base.html" %} {% block content %} -

Labs

{% for lab in labs %} -
+

{{lab.name}}

-
-
    -
  • name: {{lab.name}}
    • -
  • description: {{lab.description}}
    • -
  • location: {{lab.location}}
    • - {% if lab.status == 0 %} -
  • status: Up
    • - {% elif lab.status == 100 %} -
  • status: Down for Maintenance
    • - {% elif lab.status == 200 %} -
  • status: Down
    • - {% endif %} -
- Details +
    +
  • name: {{lab.name}}
    • +
  • description: {{lab.description}}
    • +
  • location: {{lab.location}}
    • + {% if lab.status == 0 %} +
  • status: Up
    • + {% elif lab.status == 100 %} +
  • status: Down for Maintenance
    • + {% elif lab.status == 200 %} +
  • status: Down
    • + {% endif %} +
+
+ Details
diff --git a/src/templates/dashboard/landing.html b/src/templates/dashboard/landing.html index 72f9e6e..f0fa954 100644 --- a/src/templates/dashboard/landing.html +++ b/src/templates/dashboard/landing.html @@ -15,74 +15,62 @@
{% csrf_token %} -
-
- -
-

About Us:

-

The Lab as a Service (LaaS) project aims to help in the development and testing of LFN projects such as - OPNFV - 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

+
+ +
+

About Us

+

The Lab as a Service (LaaS) project aims to help in the development and testing of LFN projects such as + OPNFV + 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

+
+ + +
+

Get Started

+ {% if request.user.is_anonymous %} +

+ To get started, please log in with your Linux Foundation Jira account +

+ {% else %} +

To get started, book a server below:

+ + Book a Server + +

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

+
+ + +
- -
-

Get Started:

- {% if request.user.is_anonymous %} -

- To get started, please log in with your Linux Foundation Jira account -

- {% else %} -

To get started, book a server below:

- -

Book a Server

+ {% endif %} +
+ + + {% if not request.user.is_anonymous %} +
+

Returning Users

+

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

+
+ + + My Bookings -

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

-
-
- -
-
- -
-
- -
-
+ {% if manager == True %} + {% endif %}
- - {% if not request.user.is_anonymous %} -
-

Returning Users:

-

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

-
-
- -
-
- - My Bookings - -
- {% if manager == True %} -
- -
- {% endif %} -
-
- {% endif %}
+ {% endif %}
diff --git a/src/templates/dashboard/multiple_select_filter_widget.html b/src/templates/dashboard/multiple_select_filter_widget.html index aee5f23..92aa1ba 100644 --- a/src/templates/dashboard/multiple_select_filter_widget.html +++ b/src/templates/dashboard/multiple_select_filter_widget.html @@ -1,7 +1,7 @@
{% for object_class, object_list in display_objects %} -
+

{{object_class}}

@@ -36,7 +36,7 @@