diff options
| author |   Sawyer Bergeron <sbergeron@iol.unh.edu> | 2017-12-01 12:11:12 -0500 |
|---|---|---|
| committer | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2017-12-13 10:07:58 -0500 |
| commit | eb75879a4632015b427d97ab945eaaa0bc26959a (patch) | |
| tree | 70bf5143ab1c2fc00272f304923d161be37f6b8e /src/templates/booking | |
| parent | 42763c659dd029cbe2c88e2292f638fd0735825e (diff) | |
Add Dashboard OS Selection Menu on Booking
JIRA: PHAROS-326
Implement dropdown menu on pod booking page for user to
select base OS, as well as associated support in API and
pod status/booking status views
This patch includes the migration file mentioned by Parker Berbarian
Change-Id: I46a7b0e5e7020a89bc8fa0fe53c10bbda14a2e2d
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Diffstat (limited to 'src/templates/booking')
| -rw-r--r-- | src/templates/booking/booking_calendar.html | 3 | ||||
| -rw-r--r-- | src/templates/booking/booking_detail.html | 5 | ||||
| -rw-r--r-- | src/templates/booking/booking_table.html | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/templates/booking/booking_calendar.html b/src/templates/booking/booking_calendar.html index 4644e85..16f0a4a 100644 --- a/src/templates/booking/booking_calendar.html +++ b/src/templates/booking/booking_calendar.html @@ -45,6 +45,7 @@ <div class='input-group' id='endtimepicker'> {% bootstrap_field form.end addon_after='<span class="glyphicon glyphicon-calendar"></span>' %} </div> + {% bootstrap_field form.opsys %} {% bootstrap_field form.purpose %} {% bootstrap_field form.installer %} {% bootstrap_field form.scenario %} @@ -100,4 +101,4 @@ <script src={% static "js/fullcalendar-options.js" %}></script> <script src={% static "js/datetimepicker-options.js" %}></script> <script src={% static "js/booking-calendar.js" %}></script> -{% endblock extrajs %}
\ No newline at end of file +{% endblock extrajs %} diff --git a/src/templates/booking/booking_detail.html b/src/templates/booking/booking_detail.html index 4b016b2..cb937d3 100644 --- a/src/templates/booking/booking_detail.html +++ b/src/templates/booking/booking_detail.html @@ -19,8 +19,11 @@ <b>Purpose: </b> {{ booking.purpose }} </p> <p> + <b>Operating System: </b> {{ booking.opsys }} +</p> +<p> <b>Installer: </b> {{ booking.installer }} </p> <p> <b>Scenario: </b> {{ booking.scenario }} -</p>
\ No newline at end of file +</p> diff --git a/src/templates/booking/booking_table.html b/src/templates/booking/booking_table.html index 655b013..af2248c 100644 --- a/src/templates/booking/booking_table.html +++ b/src/templates/booking/booking_table.html @@ -7,6 +7,7 @@ <th>Purpose</th> <th>Start</th> <th>End</th> + <th>Operating System</th> <th>Installer</th> <th>Scenario</th> </tr> @@ -27,6 +28,9 @@ {{ booking.end }} </td> <td> + {{ booking.opsys }} + </td> + <td> {{ booking.installer }} </td> <td> @@ -34,4 +38,4 @@ </td> </tr> {% endfor %} -</tbody>
\ No newline at end of file +</tbody> |