webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

Merge branch 'bugfix/no-seconds'

This commit is contained in:
Jeroen De Meerleer 2018-09-14 15:12:59 +02:00
parent 0024996c8d 6f2e4c5ea9
commit b6b4350e31
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editjob.php
View File

@ -41,7 +41,7 @@ if ($_SERVER["REQUEST_METHOD"] == "GET") {
$host = $jobnameResult[0]['host'];
$delay = $jobnameResult[0]['delay'];
$expected = $jobnameResult[0]['expected'];
$nextrun = date("m/d/Y h:i A", $jobnameResult[0]['nextrun']);
$nextrun = date("m/d/Y H:i:s", $jobnameResult[0]['nextrun']);
$loader = new Twig_Loader_Filesystem('templates');

2
js/site.js
View File

@ -27,7 +27,7 @@ $(document).ready(function() {
$("body").on("click", "#patternDropdown li", function() {
if(this.value != "custom") { $("input#delay").val($(this).data("val")); }
});
$('#nextrunselector').datetimepicker();
$('#nextrunselector').datetimepicker( { format: 'MM/DD/YYYY HH:mm:ss' } );
$("body").on("click", ".runcron", function() {
$("#ajax_loader").show();

4
templates/base.html.twig
View File

@ -10,9 +10,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="/css/site.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
<script src="/js/site.js" type="text/javascript"></script>
</head>