diff options
| author |   maxbr <maxbr@mi.fu-berlin.de> | 2017-07-27 12:51:47 +0200 |
|---|---|---|
| committer | maxbr <maxbr@mi.fu-berlin.de> | 2017-07-27 12:56:48 +0200 |
| commit | b21ea724ac619f218d6e18ee2439492609d5755b (patch) | |
| tree | e532e9112fc6a3785a4c623c6710617b5a58a910 /tools/pharos-dashboard/src/templates/dashboard | |
| parent | 7cbe4e7447280d39fdb5a56b3d9a0fea437b5b15 (diff) | |
Fix Booking API
This fixes a server error for the booking REST api and some html errors.
Change-Id: I86475967bbc8cd4c8f82f62e03789f1c9752d446
Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'tools/pharos-dashboard/src/templates/dashboard')
4 files changed, 7 insertions, 11 deletions
diff --git a/tools/pharos-dashboard/src/templates/dashboard/ci_pods.html b/tools/pharos-dashboard/src/templates/dashboard/ci_pods.html index 7ef62a43..a20be957 100644 --- a/tools/pharos-dashboard/src/templates/dashboard/ci_pods.html +++ b/tools/pharos-dashboard/src/templates/dashboard/ci_pods.html @@ -50,6 +50,7 @@ <script type="text/javascript"> $(document).ready(function () { $('#table').DataTable({ + scrollX: true, columnDefs: [ {type: 'status', targets: 2} ], @@ -57,4 +58,4 @@ }); }); </script> -{% endblock tablejs %}
\ No newline at end of file +{% endblock tablejs %} diff --git a/tools/pharos-dashboard/src/templates/dashboard/dev_pods.html b/tools/pharos-dashboard/src/templates/dashboard/dev_pods.html index 2b4b0177..a6f3b2ee 100644 --- a/tools/pharos-dashboard/src/templates/dashboard/dev_pods.html +++ b/tools/pharos-dashboard/src/templates/dashboard/dev_pods.html @@ -59,6 +59,7 @@ <script type="text/javascript"> $(document).ready(function () { $('#table').DataTable({ + scrollX: true, columnDefs: [ {type: 'status', targets: 6} ], @@ -66,4 +67,4 @@ }); }); </script> -{% endblock tablejs %}
\ No newline at end of file +{% endblock tablejs %} diff --git a/tools/pharos-dashboard/src/templates/dashboard/jenkins_slaves.html b/tools/pharos-dashboard/src/templates/dashboard/jenkins_slaves.html index aa74507c..fa361b13 100644 --- a/tools/pharos-dashboard/src/templates/dashboard/jenkins_slaves.html +++ b/tools/pharos-dashboard/src/templates/dashboard/jenkins_slaves.html @@ -35,6 +35,7 @@ <script type="text/javascript"> $(document).ready(function () { $('#table').DataTable({ + scrollX: true, columnDefs: [ {type: 'status', targets: 1} ], @@ -42,4 +43,4 @@ }); }); </script> -{% endblock tablejs %}
\ No newline at end of file +{% endblock tablejs %} diff --git a/tools/pharos-dashboard/src/templates/dashboard/table.html b/tools/pharos-dashboard/src/templates/dashboard/table.html index addd5c12..d59f0e34 100644 --- a/tools/pharos-dashboard/src/templates/dashboard/table.html +++ b/tools/pharos-dashboard/src/templates/dashboard/table.html @@ -13,8 +13,6 @@ {% 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%"> @@ -25,9 +23,7 @@ </table> </div> <!-- /.table-responsive --> - </div> <!-- /.panel-body --> - </div> <!-- /.panel --> </div> <!-- /.col-lg-12 --> @@ -36,9 +32,6 @@ {% 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> @@ -47,4 +40,4 @@ {% block tablejs %} {% endblock tablejs %} -{% endblock extrajs %}
\ No newline at end of file +{% endblock extrajs %} |