summaryrefslogtreecommitdiffstats
path: root/dashboard/src/templates
diff options
context:
space:
mode:
authorJack Morgan <jack.morgan@intel.com>2018-01-08 23:56:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-08 23:56:21 +0000
commitb55a6c39179813070bef63121965a4a045ac13ad (patch)
treea02c90db75d5e1d2f46008663337126cdf9dc1ca /dashboard/src/templates
parentac0ae9e3069e582fcaeaff35f28a5b45343bae84 (diff)
parenta6250e99eaa3a3525ea58904d77bbfcd555f208c (diff)
Merge "Add Dashboard OS Selection Menu on Booking"
Diffstat (limited to 'dashboard/src/templates')
-rw-r--r--dashboard/src/templates/booking/booking_calendar.html3
-rw-r--r--dashboard/src/templates/booking/booking_detail.html5
-rw-r--r--dashboard/src/templates/booking/booking_table.html6
3 files changed, 11 insertions, 3 deletions
diff --git a/dashboard/src/templates/booking/booking_calendar.html b/dashboard/src/templates/booking/booking_calendar.html
index 4644e85..16f0a4a 100644
--- a/dashboard/src/templates/booking/booking_calendar.html
+++ b/dashboard/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/dashboard/src/templates/booking/booking_detail.html b/dashboard/src/templates/booking/booking_detail.html
index 4b016b2..cb937d3 100644
--- a/dashboard/src/templates/booking/booking_detail.html
+++ b/dashboard/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/dashboard/src/templates/booking/booking_table.html b/dashboard/src/templates/booking/booking_table.html
index 655b013..af2248c 100644
--- a/dashboard/src/templates/booking/booking_table.html
+++ b/dashboard/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>