From 7fec796ae500313ddbbbedf32d4f7581985d41d4 Mon Sep 17 00:00:00 2001 From: Brandon Lo Date: Thu, 27 Jun 2019 15:43:55 -0400 Subject: Replace and change CSS Fix animation bugs Fix layout issues Replace custom CSS to bootstrap classes Remove unused files Change code to use es6 syntax Add dropdown styles Change-Id: Ie2ed31fa2e6763cf30d3b19e4bf9379019cbb0f5 Signed-off-by: Brandon Lo --- src/templates/dashboard/genericselect.html | 69 +------ src/templates/dashboard/grid.html | 10 - src/templates/dashboard/host_profile_detail.html | 1 - src/templates/dashboard/lab_detail.html | 212 +++++++++++---------- src/templates/dashboard/lab_list.html | 40 ++-- src/templates/dashboard/landing.html | 114 ++++------- .../dashboard/multiple_select_filter_widget.html | 152 +++------------ .../dashboard/searchable_select_multiple.html | 158 ++------------- src/templates/dashboard/table.html | 20 +- 9 files changed, 221 insertions(+), 555 deletions(-) delete mode 100644 src/templates/dashboard/grid.html (limited to 'src/templates/dashboard') diff --git a/src/templates/dashboard/genericselect.html b/src/templates/dashboard/genericselect.html index 441d8dc..f54cd90 100644 --- a/src/templates/dashboard/genericselect.html +++ b/src/templates/dashboard/genericselect.html @@ -5,77 +5,18 @@ {% block content %} - - -
+

Create a Resource

-
+

Or select from the list below:

-
-
+
+ {% csrf_token %} {{ form|default:"

no form loaded

" }} {% buttons %} diff --git a/src/templates/dashboard/grid.html b/src/templates/dashboard/grid.html deleted file mode 100644 index ca47f44..0000000 --- a/src/templates/dashboard/grid.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base.html" %} -{% load staticfiles %} -{% if script %} {% endif %} -{% block content %} - {% for item in grid_items %} -
- {{ item }} -
- {% endfor %} -{% endblock content %} diff --git a/src/templates/dashboard/host_profile_detail.html b/src/templates/dashboard/host_profile_detail.html index abc7648..f65d4fe 100644 --- a/src/templates/dashboard/host_profile_detail.html +++ b/src/templates/dashboard/host_profile_detail.html @@ -18,7 +18,6 @@ } ); -
-

About Us:

+

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 @@ -73,56 +31,54 @@

-

Get Started:

+

Get Started:

{% if request.user.is_anonymous %} -

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

+

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

{% else %}

To get started, book a server below:

- -

Book a Server

+

Book a Server

-

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

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

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

Returning Users:

+

Returning Users:

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

-
-
-
- -
- - {% if manager == True %} +
+
+ +
+ + {% if manager == True %}
- +
- {% endif %} -
+ {% endif %}
{% endif %} @@ -155,7 +111,7 @@ } -
+
{% csrf_token %} diff --git a/src/templates/dashboard/multiple_select_filter_widget.html b/src/templates/dashboard/multiple_select_filter_widget.html index 4302543..7fb8bcf 100644 --- a/src/templates/dashboard/multiple_select_filter_widget.html +++ b/src/templates/dashboard/multiple_select_filter_widget.html @@ -1,139 +1,37 @@ - - -
-{% for object_class, object_list in display_objects %} -
-
-

{{object_class}}

-
-
- {% for obj in object_list %} -
-

{{obj.name}}

-

{{obj.description}}

- +
+
+ {% for object_class, object_list in display_objects %} +
+
+

{{object_class}}

+
+
+ {% for obj in object_list %} +
+
+
+

{{obj.name}}

+
+
+

{{obj.description}}

+
+ +
+
+ {% endfor %} +
{% endfor %} -
-{% endfor %}
-