From 25275685e9a735e51fae8b1a936ba5733f6fb770 Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Wed, 10 Oct 2018 16:06:47 -0400 Subject: Lab as a Service 2.0 See changes here: https://wiki.opnfv.org/display/INF/Pharos+Laas Change-Id: I59ada5f98e70a28d7f8c14eab3239597e236ca26 Signed-off-by: Sawyer Bergeron Signed-off-by: Parker Berberian --- dashboard/src/templates/account/booking_list.html | 52 + .../src/templates/account/configuration_list.html | 28 + dashboard/src/templates/account/details.html | 9 + dashboard/src/templates/account/image_list.html | 27 + dashboard/src/templates/account/resource_list.html | 28 + dashboard/src/templates/account/user_list.html | 2 +- dashboard/src/templates/base.html | 118 +- .../src/templates/booking/booking_calendar.html | 65 + .../src/templates/booking/booking_detail.html | 361 +++- .../src/templates/booking/booking_grid_item.html | 11 + dashboard/src/templates/booking/booking_list.html | 6 +- dashboard/src/templates/booking/stats.html | 60 + .../templates/booking/steps/booking_confirm.html | 25 + .../src/templates/booking/steps/booking_meta.html | 66 + .../templates/booking/steps/resource_select.html | 73 + .../templates/booking/steps/swconfig_select.html | 73 + .../config_bundle/steps/config_software.html | 72 + .../config_bundle/steps/define_software.html | 102 ++ dashboard/src/templates/dashboard/ci_pods.html | 61 - dashboard/src/templates/dashboard/dev_pods.html | 70 - dashboard/src/templates/dashboard/grid.html | 10 + .../templates/dashboard/host_profile_detail.html | 71 + .../src/templates/dashboard/jenkins_slaves.html | 46 - dashboard/src/templates/dashboard/lab_detail.html | 157 ++ dashboard/src/templates/dashboard/lab_list.html | 87 + dashboard/src/templates/dashboard/landing.html | 88 + dashboard/src/templates/dashboard/login.html | 8 + .../dashboard/multiple_select_filter_widget.html | 402 +++++ dashboard/src/templates/dashboard/pdf.yaml | 95 + dashboard/src/templates/dashboard/resource.html | 3 +- .../src/templates/dashboard/resource_all.html | 5 +- .../src/templates/dashboard/resource_detail.html | 52 - .../dashboard/searchable_select_multiple.html | 408 +++++ dashboard/src/templates/dashboard/table.html | 1 + dashboard/src/templates/layout.html | 10 +- dashboard/src/templates/notifier/inbox.html | 86 + dashboard/src/templates/notifier/notification.html | 34 + dashboard/src/templates/resource/hosts.html | 45 + dashboard/src/templates/resource/mxClient.min.js | 1808 ++++++++++++++++++++ .../templates/resource/steps/define_hardware.html | 37 + .../src/templates/resource/steps/host_info.html | 43 + .../templates/resource/steps/pod_definition.html | 653 +++++++ dashboard/src/templates/resource/uncommon.css | 162 ++ .../templates/snapshot_workflow/steps/meta.html | 27 + .../snapshot_workflow/steps/select_host.html | 95 + dashboard/src/templates/workflow/confirm.html | 125 ++ dashboard/src/templates/workflow/no_workflow.html | 7 + .../src/templates/workflow/resource_select.html | 50 + .../src/templates/workflow/viewport-base.html | 426 +++++ .../src/templates/workflow/viewport-element.html | 69 + 50 files changed, 6089 insertions(+), 330 deletions(-) create mode 100644 dashboard/src/templates/account/booking_list.html create mode 100644 dashboard/src/templates/account/configuration_list.html create mode 100644 dashboard/src/templates/account/details.html create mode 100644 dashboard/src/templates/account/image_list.html create mode 100644 dashboard/src/templates/account/resource_list.html create mode 100644 dashboard/src/templates/booking/booking_grid_item.html create mode 100644 dashboard/src/templates/booking/stats.html create mode 100644 dashboard/src/templates/booking/steps/booking_confirm.html create mode 100644 dashboard/src/templates/booking/steps/booking_meta.html create mode 100644 dashboard/src/templates/booking/steps/resource_select.html create mode 100644 dashboard/src/templates/booking/steps/swconfig_select.html create mode 100644 dashboard/src/templates/config_bundle/steps/config_software.html create mode 100644 dashboard/src/templates/config_bundle/steps/define_software.html delete mode 100644 dashboard/src/templates/dashboard/ci_pods.html delete mode 100644 dashboard/src/templates/dashboard/dev_pods.html create mode 100644 dashboard/src/templates/dashboard/grid.html create mode 100644 dashboard/src/templates/dashboard/host_profile_detail.html delete mode 100644 dashboard/src/templates/dashboard/jenkins_slaves.html create mode 100644 dashboard/src/templates/dashboard/lab_detail.html create mode 100644 dashboard/src/templates/dashboard/lab_list.html create mode 100644 dashboard/src/templates/dashboard/landing.html create mode 100644 dashboard/src/templates/dashboard/login.html create mode 100644 dashboard/src/templates/dashboard/multiple_select_filter_widget.html create mode 100644 dashboard/src/templates/dashboard/pdf.yaml create mode 100644 dashboard/src/templates/dashboard/searchable_select_multiple.html create mode 100644 dashboard/src/templates/notifier/inbox.html create mode 100644 dashboard/src/templates/notifier/notification.html create mode 100644 dashboard/src/templates/resource/hosts.html create mode 100644 dashboard/src/templates/resource/mxClient.min.js create mode 100644 dashboard/src/templates/resource/steps/define_hardware.html create mode 100644 dashboard/src/templates/resource/steps/host_info.html create mode 100644 dashboard/src/templates/resource/steps/pod_definition.html create mode 100644 dashboard/src/templates/resource/uncommon.css create mode 100644 dashboard/src/templates/snapshot_workflow/steps/meta.html create mode 100644 dashboard/src/templates/snapshot_workflow/steps/select_host.html create mode 100644 dashboard/src/templates/workflow/confirm.html create mode 100644 dashboard/src/templates/workflow/no_workflow.html create mode 100644 dashboard/src/templates/workflow/resource_select.html create mode 100644 dashboard/src/templates/workflow/viewport-base.html create mode 100644 dashboard/src/templates/workflow/viewport-element.html (limited to 'dashboard/src/templates') diff --git a/dashboard/src/templates/account/booking_list.html b/dashboard/src/templates/account/booking_list.html new file mode 100644 index 0000000..ef4df3a --- /dev/null +++ b/dashboard/src/templates/account/booking_list.html @@ -0,0 +1,52 @@ +{% extends "base.html" %} +{% block content %} + +

Bookings I Own

+ {% for booking in bookings %} +
+
    +
  • id: {{booking.id}}
  • +
  • lab: {{booking.resource.template.lab.lab_user.username}}
  • +
  • resource: {{booking.resource.template.name}}
  • +
  • start: {{booking.start}}
  • +
  • end: {{booking.end}}
  • +
  • purpose: {{booking.purpose}}
  • +
+
+ + +
+
+ {% endfor %} +

Bookings I Collaborate On

+ {% for booking in collab_bookings %} +
+
    +
  • id: {{booking.id}}
  • +
  • lab: {{booking.lab}}
  • +
  • resource: {{booking.resource_name}}
  • +
  • start: {{booking.start}}
  • +
  • end: {{booking.end}}
  • +
  • purpose: {{booking.purpose}}
  • +
+
+ + +
+
+ {% endfor %} +{% endblock %} diff --git a/dashboard/src/templates/account/configuration_list.html b/dashboard/src/templates/account/configuration_list.html new file mode 100644 index 0000000..ee61e97 --- /dev/null +++ b/dashboard/src/templates/account/configuration_list.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} +{% block content %} + + {% for config in configurations %} +
+
    +
  • id: {{config.id}}
  • +
  • name: {{config.name}}
  • +
  • description: {{config.description}}
  • +
+ +
+ {% endfor %} +{% endblock %} diff --git a/dashboard/src/templates/account/details.html b/dashboard/src/templates/account/details.html new file mode 100644 index 0000000..5641064 --- /dev/null +++ b/dashboard/src/templates/account/details.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% load staticfiles %} +{% block content %} +

Account Details

+ + + + +{% endblock content %} diff --git a/dashboard/src/templates/account/image_list.html b/dashboard/src/templates/account/image_list.html new file mode 100644 index 0000000..fb436df --- /dev/null +++ b/dashboard/src/templates/account/image_list.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{% block content %} +

Images I Own

+ {% for image in images %} +
+
    +
  • id: {{image.id}}
  • +
  • lab: {{image.from_lab.name}}
  • +
  • name: {{image.name}}
  • +
  • description: {{image.description}}
  • +
  • host profile: {{image.host_type.name}}
  • +
+
+ {% endfor %} +

Public Images

+ {% for image in public_images %} +
+
    +
  • id: {{image.id}}
  • +
  • lab: {{image.from_lab.name}}
  • +
  • name: {{image.name}}
  • +
  • description: {{image.description}}
  • +
  • host profile: {{image.host_type.name}}
  • +
+
+ {% endfor %} +{% endblock %} diff --git a/dashboard/src/templates/account/resource_list.html b/dashboard/src/templates/account/resource_list.html new file mode 100644 index 0000000..482a000 --- /dev/null +++ b/dashboard/src/templates/account/resource_list.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} +{% block content %} + + {% for resource in resources %} +
+
    +
  • id: {{resource.id}}
  • +
  • name: {{resource.name}}
  • +
  • description: {{resource.description}}
  • +
+ +
+ {% endfor %} +{% endblock %} diff --git a/dashboard/src/templates/account/user_list.html b/dashboard/src/templates/account/user_list.html index 58ddda6..e564524 100644 --- a/dashboard/src/templates/account/user_list.html +++ b/dashboard/src/templates/account/user_list.html @@ -47,7 +47,7 @@ + + +{% endblock %} {% block basecontent %}
@@ -54,36 +120,61 @@ @@ -93,14 +184,15 @@
+ {% if title %}

{{ title }}

- - {% bootstrap_messages %} + {% endif %} +
{% bootstrap_messages %}
{% block content %} diff --git a/dashboard/src/templates/booking/booking_calendar.html b/dashboard/src/templates/booking/booking_calendar.html index b60db3c..349cb0a 100644 --- a/dashboard/src/templates/booking/booking_calendar.html +++ b/dashboard/src/templates/booking/booking_calendar.html @@ -4,6 +4,8 @@ {% load bootstrap3 %} {% block extrahead %} + {{ block.super }} + + {% bootstrap_field form.opsys %} {% bootstrap_field form.purpose %} {% bootstrap_field form.installer %} {% bootstrap_field form.scenario %} @@ -95,6 +98,15 @@ {% endbuttons %}
+ {% else %}

Please @@ -132,8 +144,61 @@ var booking_detail_prefix = "{% url 'booking:detail_prefix' %}"; var booking_delete_prefix = "{% url 'booking:delete_prefix' %}"; var user_timezone = "{{ request.user.userprofile.timezone }}" + {% autoescape off %} + var sup_installer_dict = {{ installer_filter }} + var sup_scenario_dict = {{ scenario_filter }} + {% endautoescape %} + + - -

- Resource: - - {{ booking.resource.name }} - -

-

- User: {{ booking.user.username }} -

-

- Start: {{ booking.start }} -

-

- End: {{ booking.end }} -

-

- Purpose: {{ booking.purpose }} -

-

- Operating System: {{ booking.opsys }} -

-

- Installer: {{ booking.installer }} -

-

- Scenario: {{ booking.scenario }} -

-

- Extensions Remaining: {{ booking.ext_count }} -

- -{% if user.is_authenticated %} -{% if user.get_username == booking.user.username %} -

- - Edit Booking - - - Delete Booking - -