diff options
Diffstat (limited to 'pharos-dashboard/src/templates/booking')
4 files changed, 66 insertions, 10 deletions
diff --git a/pharos-dashboard/src/templates/booking/booking_calendar.html b/pharos-dashboard/src/templates/booking/booking_calendar.html index de3e3b3..34f425c 100644 --- a/pharos-dashboard/src/templates/booking/booking_calendar.html +++ b/pharos-dashboard/src/templates/booking/booking_calendar.html @@ -1,4 +1,4 @@ -{% extends "dashboard/table.html" %} +{% extends "base.html" %} {% load staticfiles %} {% load bootstrap3 %} @@ -45,7 +45,8 @@ {% bootstrap_field form.end addon_after='<span class="glyphicon glyphicon-calendar"></span>' %} </div> {% bootstrap_field form.purpose %} - + {% bootstrap_field form.installer %} + {% bootstrap_field form.scenario %} {% buttons %} <button type="submit" class="btn btn btn-success"> Book @@ -69,7 +70,8 @@ <div class="modal-body" id="booking_detail_content"> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-default" data-dismiss="modal">Close + </button> </div> </div> diff --git a/pharos-dashboard/src/templates/booking/booking_detail.html b/pharos-dashboard/src/templates/booking/booking_detail.html index d3f4753..4b016b2 100644 --- a/pharos-dashboard/src/templates/booking/booking_detail.html +++ b/pharos-dashboard/src/templates/booking/booking_detail.html @@ -19,8 +19,8 @@ <b>Purpose: </b> {{ booking.purpose }} </p> <p> - <b>Jira: </b> - <a href="{{ jira_issue | jira_issue_url }}"> - {{ jira_issue }} - </a> + <b>Installer: </b> {{ booking.installer }} +</p> +<p> + <b>Scenario: </b> {{ booking.scenario }} </p>
\ No newline at end of file diff --git a/pharos-dashboard/src/templates/booking/booking_list.html b/pharos-dashboard/src/templates/booking/booking_list.html new file mode 100644 index 0000000..f2991e4 --- /dev/null +++ b/pharos-dashboard/src/templates/booking/booking_list.html @@ -0,0 +1,50 @@ +{% extends "base.html" %} +{% load staticfiles %} + +{% block extrahead %} + <!-- DataTables CSS --> + <link href="{% static "bower_components/datatables-plugins/integration/bootstrap/3/dataTables.bootstrap.css" %}" + rel="stylesheet"> + + <!-- DataTables Responsive CSS --> + <link href="{% static "bower_components/datatables-responsive/css/dataTables.responsive.css" %}" + rel="stylesheet"> +{% endblock extrahead %} + +{% block content %} + <div class="row"> + <div class="col-lg-12"> + <div class="panel panel-default"> + <div class="panel-body"> + <div class="dataTables_wrapper"> + <table class="table table-striped table-bordered table-hover" id="table" + cellspacing="0" + width="100%"> + {% include "booking/booking_table.html" %} + </table> + </div> + <!-- /.table-responsive --> + </div> + <!-- /.panel-body --> + </div> + <!-- /.panel --> + </div> + <!-- /.col-lg-12 --> + </div> +{% endblock content %} + +{% block extrajs %} + <!-- DataTables JavaScript --> + <link href="{% static "bower_components/datatables-plugins/integration/bootstrap/3/dataTables.bootstrap.css" %}" + rel="stylesheet"> + + + <script src={% static "bower_components/datatables/media/js/jquery.dataTables.min.js" %}></script> + <script src={% static "bower_components/datatables-plugins/integration/bootstrap/3/dataTables.bootstrap.min.js" %}></script> + + <script type="text/javascript"> + $(document).ready(function () { + $('#table').DataTable({}); + }); + </script> +{% endblock extrajs %}
\ No newline at end of file diff --git a/pharos-dashboard/src/templates/booking/booking_table.html b/pharos-dashboard/src/templates/booking/booking_table.html index 216eaf5..655b013 100644 --- a/pharos-dashboard/src/templates/booking/booking_table.html +++ b/pharos-dashboard/src/templates/booking/booking_table.html @@ -7,7 +7,8 @@ <th>Purpose</th> <th>Start</th> <th>End</th> - <th>Jira</th> + <th>Installer</th> + <th>Scenario</th> </tr> </thead> <tbody> @@ -25,8 +26,11 @@ <td> {{ booking.end }} </td> - <td><a target='_blank' - href={{ booking.get_jira_issue | jira_issue_url }}>{{ booking.get_jira_issue }}</a> + <td> + {{ booking.installer }} + </td> + <td> + {{ booking.scenario }} </td> </tr> {% endfor %} |