mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #527 from laf/issue-laf-130

Browse Source 
Final tidy up of the date search box for graphs
This commit is contained in:
Daniel Preussker
2015-03-01 18:31:27 +01:00
parent f2e5f0827d 082ac6cc66
commit ef691748d8
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
html/pages/graphs.inc.php
View File

@ -126,10 +126,6 @@ if (!$auth)
// datetime range picker
?>
<script type="text/javascript">
$(function () {
$('#dtpicker1').datetimepicker({useSeconds: false, useCurrent: true, sideBySide: true, useStrict: false, showToday: true});
$('#dtpicker2').datetimepicker({useSeconds: false, useCurrent: true, sideBySide: true, useStrict: false, showToday: true});
});
function submitCustomRange(frmdata) {
var reto = /to=([0-9])+/g;
var refrom = /from=([0-9])+/g;
@ -147,29 +143,23 @@ if (!$auth)
echo("
<form class='form-inline' id='customrange' action='test'>
<input type=hidden id='selfaction' value='" . $_SERVER['REQUEST_URI'] . "'>");
echo('<div class="row">
<div class="col-sm-2 form-group">
<label class="control-label" for="dtpicker1">From:</label>
<div class="input-group date" id="dtpicker1">
<input type="text" class="form-control" id="dtpickerfrom" maxlength="16" value="' . date('Y-m-d H:i', $graph_array['from']) . '" data-date-format="YYYY-MM-DD HH:mm">
<span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
</div>
</div>
<div class="col-sm-2 form-group">
<label class="control-label" for="dtpicker2">To: </label>
<div class="input-group date" id="dtpicker2">
<input type="text" class="form-control" id="dtpickerto" maxlength=16 value="' . date('Y-m-d H:i', $graph_array['to']) . '" data-date-format="YYYY-MM-DD HH:mm">
<span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
</div>
</div>
<div class="col-sm-2 form-group">
<label class="control-label" for="submit">&nbsp;</label>
<div class="input-group">
<input type="submit" class="btn btn-default" id="submit" value="Update" onclick="javascript:submitCustomRange(this.form);">
</div>
</div>
</div>
echo('
<div class="form-group">
<label for="dtpickerfrom">From</label>
<input type="text" class="form-control" id="dtpickerfrom" maxlength="16" value="' . date('Y-m-d H:i', $graph_array['from']) . '" data-date-format="YYYY-MM-DD HH:mm">
</div>
<div class="form-group">
<label for="dtpickerto">To</label>
<input type="text" class="form-control" id="dtpickerto" maxlength=16 value="' . date('Y-m-d H:i', $graph_array['to']) . '" data-date-format="YYYY-MM-DD HH:mm">
</div>
<input type="submit" class="btn btn-default" id="submit" value="Update" onclick="javascript:submitCustomRange(this.form);">
</form>
<script type="text/javascript">
$(function () {
$("#dtpickerfrom").datetimepicker({useSeconds: false, useCurrent: true, sideBySide: true, useStrict: false, showToday: true});
$("#dtpickerto").datetimepicker({useSeconds: false, useCurrent: true, sideBySide: true, useStrict: false, showToday: true});
});
</script>
');