1
0
Fork 0

Add bootstrap daterangepicker for telemetry

merge-requests/111/head
keikreutler 2017-01-03 21:07:55 +01:00 committed by Nikos Roussos
parent 4760bd1562
commit 4839647c56
No known key found for this signature in database
GPG Key ID: BADFF1767BA7C8E1
3 changed files with 41 additions and 1 deletions

View File

@ -10,6 +10,8 @@
"underscore": "1.8.x",
"backbone": "1.3.x",
"d3": "3.5.x",
"chart.js": "^2.4.0"
"chart.js": "^2.4.0",
"moment": "2.10.6",
"bootstrap-daterangepicker": "2.1.x"
}
}

View File

@ -326,3 +326,31 @@ svg.chart {
stroke: #286090;
stroke-width: 2;
}
/* Telemetry Datepicker */
.datepicker {
border-radius: 3px;
padding-bottom: 25px;
}
.datepicker input {
font-family: 'ClearSans';
font-size: 13px;
padding: 5px 10px;
border: none;
box-shadow: inset 0px 0px 8px rgba(0,0,0,0.3);
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
cursor: pointer;
}
.datepicker .input-group-addon {
background: #777;
color: #fff;
border: none;
}
.daterangepicker {
font-size: 13px;
}

View File

@ -5,6 +5,10 @@
{% block title %} - Suggest{% endblock %}
{% block css %}
<link rel="stylesheet" href="{% static 'lib/bootstrap-daterangepicker/daterangepicker.css' %}">
{% endblock %}
{% block top %}{% endblock %}
{% block content %}
@ -271,6 +275,10 @@
<div class="row panel-body">
<div class="panel-satellite chart">
<div class="col-md-3 panel-satellite">
<div class="input-group datepicker">
<span class="input-group-addon">Date range</span>
<input type="text" name="daterange" value="01/01/2015 - 01/31/2015" />
</div>
<ul id="telemetry-descriptors">
</ul>
</div>
@ -368,5 +376,7 @@
<script src="{% static 'lib/underscore/underscore-min.js' %}"></script>
<script src="{% static 'lib/backbone/backbone-min.js' %}"></script>
<script src="{% static 'lib/d3/d3.min.js' %}"></script>
<script src="{% static 'lib/moment/moment.js' %}"></script>
<script src="{% static 'lib/bootstrap-daterangepicker/daterangepicker.js' %}"></script>
<script src="{% static 'js/app.backbone.js' %}"></script>
{% endblock %}