diff options
Diffstat (limited to 'modules-available/statistics_reporting/templates/columnChooser.html')
| -rw-r--r-- | modules-available/statistics_reporting/templates/columnChooser.html | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html index d6ff90b7..8664f776 100644 --- a/modules-available/statistics_reporting/templates/columnChooser.html +++ b/modules-available/statistics_reporting/templates/columnChooser.html @@ -14,7 +14,23 @@ {{lang_displaySelection}} </div> <div class="panel-body"> - <div class="row top-row"> + <div class="row"> + <div class="col-sm-6 col-md-4" style="display: flex; align-items: center; margin-bottom: 20px"> + <span style="width: 40px">From:</span> + <div class="input-group bootstrap-timepicker timepicker" style="margin: 0 20px"> + <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span> + <input name="from" id="date-from" class="form-control" autocomplete="off" value="{{from}}"> + </div> + </div> + <div class="col-sm-6 col-md-4" style="display: flex; align-items: center; margin-bottom: 20px"> + <span style="width: 40px">To:</span> + <div class="input-group bootstrap-timepicker timepicker" style="margin: 0 20px"> + <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span> + <input name="to" id="date-to" class="form-control" autocomplete="off" value="{{to}}"> + </div> + </div> + </div> + <div class="row"> <div class="col-md-2"> <select name="type" id="select-table" class="form-control"> {{#tables}} @@ -22,14 +38,8 @@ {{/tables}} </select> </div> - <div class="col-md-2"> - <select name="cutoff" id="select-cutoff" class="form-control"> - {{#days}} - <option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option> - {{/days}} - </select> - </div> - <div class="col-md-3" style="margin-top: 10px;"> + + <div class="col-md-5" style="margin-top: 10px;"> <div id="slider"> <div id="lower-handle" class="ui-slider-handle"></div> <div id="upper-handle" class="ui-slider-handle"></div> @@ -37,10 +47,8 @@ <input type="hidden" id="upper-field" name="upper" value="{{upper}}"> </div> </div> - <div class="col-md-1"> - <button type="submit" class="btn btn-primary">{{lang_show}}</button> - </div> - <div class="col-md-3"> + <div class="col-md-5" style="display: flex; justify-content: flex-end"> + <button type="submit" class="btn btn-primary" style="margin-right: 20px">{{lang_show}}</button> <div class="input-group"> <select class="form-control" name="format"> <option value="json">JSON</option> @@ -110,6 +118,10 @@ <script type="application/javascript"> document.addEventListener("DOMContentLoaded", function () { + const now = new Date(); + $('#date-from').datepicker({format : 'yyyy-mm-dd', endDate: now, todayHighlight: true, weekStart: 1}); + $('#date-to').datepicker({format : 'yyyy-mm-dd', endDate: now, todayHighlight: true, weekStart: 1}); + var lowerHandle = $("#lower-handle"); var upperHandle = $("#upper-handle"); var lower = $('#lower-field').val(); |