From 5bcbb9310d14bcef3afa11315abd2251fe4e4fc6 Mon Sep 17 00:00:00 2001 From: Brandon Lo Date: Thu, 20 Jun 2019 11:31:25 -0400 Subject: Add bootstrap 4 support Remove bootstrap 3 module and css/js Recreated almost everything in bootstrap 4 Change workflow layout to support bootstrap 4 and flex Add rotating glyphs for dropdowns Change breadcrumbs to use pagination and its styling Change account dropdown to use full width buttons Add version sock to bootstrap4 Fix indenting in base.html Change comments in base.html Remove dead code in booking_list Revert changes in mulitple_select_filter_widget Remove dead code, whitespace in inbox Fix formatting, dead code in viewport-base Remove unused media tag Make only .rotate classes rotate on dropdown click Attach back and next to breadcrumbs Resize breadcrumbs to be same width Disable pointer cursor on breadcrumb hover Change account page to account dropdown on left Change-Id: I6c5423db6f0f6f7f0b12e55347eddcc42b56e52b Signed-off-by: Brandon Lo --- .../src/templates/dashboard/genericselect.html | 2 +- dashboard/src/templates/dashboard/lab_detail.html | 71 +++++---- dashboard/src/templates/dashboard/lab_list.html | 44 +++--- dashboard/src/templates/dashboard/landing.html | 159 +++++++++++++-------- dashboard/src/templates/dashboard/resource.html | 10 +- .../src/templates/dashboard/resource_all.html | 10 +- dashboard/src/templates/dashboard/table.html | 9 +- 7 files changed, 172 insertions(+), 133 deletions(-) (limited to 'dashboard/src/templates/dashboard') diff --git a/dashboard/src/templates/dashboard/genericselect.html b/dashboard/src/templates/dashboard/genericselect.html index 1e9a29a..441d8dc 100644 --- a/dashboard/src/templates/dashboard/genericselect.html +++ b/dashboard/src/templates/dashboard/genericselect.html @@ -1,7 +1,7 @@ {% extends "workflow/viewport-element.html" %} {% load staticfiles %} -{% load bootstrap3 %} +{% load bootstrap4 %} {% block content %} diff --git a/dashboard/src/templates/dashboard/lab_detail.html b/dashboard/src/templates/dashboard/lab_detail.html index 7938e86..336b32e 100644 --- a/dashboard/src/templates/dashboard/lab_detail.html +++ b/dashboard/src/templates/dashboard/lab_detail.html @@ -9,12 +9,12 @@ {% block content %}
-
-
-

Lab Profile

- Expand +
+
+

Lab Profile

+
-
+
@@ -50,19 +50,18 @@
Lab Name: {{lab.name}}
-
-
-

Host Profiles

- - Expand +
+
+

Host Profiles

+
-
+
{% for profile in hostprofiles %} - + {% endfor %}
{{profile.name}} {{profile.description}}ProfileProfile
@@ -70,31 +69,30 @@
-
-
+
+

Networking Capabilities

- Expand +
-
- - - - - - - - - -
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}}
-
-
-

Images

- Expand +
+
+

Images

+
-
+
@@ -116,14 +114,13 @@
-
-
-

Lab Hosts

-

- Expand +
+
+

Lab Hosts

+
-
+
Name
diff --git a/dashboard/src/templates/dashboard/lab_list.html b/dashboard/src/templates/dashboard/lab_list.html index c459dd9..9cde80c 100644 --- a/dashboard/src/templates/dashboard/lab_list.html +++ b/dashboard/src/templates/dashboard/lab_list.html @@ -1,26 +1,28 @@ {% extends "base.html" %} {% block content %} -

Labs

-
+

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 +
+
+

{{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
- {% endfor %}
-{% endblock %} + {% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/dashboard/src/templates/dashboard/landing.html b/dashboard/src/templates/dashboard/landing.html index fb75d5f..e6a235f 100644 --- a/dashboard/src/templates/dashboard/landing.html +++ b/dashboard/src/templates/dashboard/landing.html @@ -2,27 +2,30 @@ {% load staticfiles %} {% block content %} -
- {% if not request.user.is_anonymous %} - {% if not request.user.userprofile.ssh_public_key %} -

- Warning: you need to upload an ssh key under account settings if you wish to log into the servers you book -

- {% endif %} - {% else %} - {% endif %} +
+ {% if not request.user.is_anonymous %} + {% if not request.user.userprofile.ssh_public_key %} + + {% endif %} + {% else %} + {% endif %} +
{% 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

+ h1 {} + +
+
+ +
+

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: +

+
+
+
+ +
+
+ +
+
+ +
+
+ {% 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 %} -
-
-
-
-

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:

-
- - - - - {% endif %} +
+

Returning Users:

+

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

+
+
+
+ +
+
+ My + Bookings +
+ {% if manager == True %} +
+ +
+ {% endif %} +
+
+ {% endif %}
- - - -
@@ -130,4 +169,4 @@ {% block vport_comm %} {% endblock %} -{% endblock content %} +{% endblock content %} \ No newline at end of file diff --git a/dashboard/src/templates/dashboard/resource.html b/dashboard/src/templates/dashboard/resource.html index 28e7998..f36ee7b 100644 --- a/dashboard/src/templates/dashboard/resource.html +++ b/dashboard/src/templates/dashboard/resource.html @@ -7,11 +7,11 @@ - - {% endblock extrahead %} @@ -23,11 +23,11 @@ {% block extrajs %} - - - + + diff --git a/dashboard/src/templates/dashboard/resource_all.html b/dashboard/src/templates/dashboard/resource_all.html index 0b0d0d4..fb8cc7e 100644 --- a/dashboard/src/templates/dashboard/resource_all.html +++ b/dashboard/src/templates/dashboard/resource_all.html @@ -7,11 +7,11 @@ - - {% endblock extrahead %} @@ -36,11 +36,11 @@ {% block extrajs %} - - - + + diff --git a/dashboard/src/templates/dashboard/table.html b/dashboard/src/templates/dashboard/table.html index b3f4b5f..0a37ded 100644 --- a/dashboard/src/templates/dashboard/table.html +++ b/dashboard/src/templates/dashboard/table.html @@ -4,11 +4,12 @@ {% block extrahead %} {{ block.super }} - - + {% endblock extrahead %} {% block content %} @@ -34,8 +35,8 @@ {% block extrajs %} - - + + -- cgit 1.2.3-korg
Name