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 --- .../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 +++++ 9 files changed, 667 insertions(+), 73 deletions(-) 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 (limited to 'dashboard/src/templates/booking') 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 - -