reference bootstrap datetime picker, remove bootstrap datepicker
update edit/create dialog to pull in datetime picker editor to the create edit dialog. #29
This commit is contained in:
parent
86e0b60386
commit
55a761f285
@ -5,17 +5,19 @@
|
||||
<link rel="shortcut icon" href="favicon.ico" />
|
||||
|
||||
<link rel="stylesheet preload" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"/>
|
||||
<link rel="stylesheet preload" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.1/css/bootstrap-datepicker3.min.css"/>
|
||||
<!--<link rel="stylesheet preload" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.1/css/bootstrap-datepicker3.min.css"/>-->
|
||||
<link href="spa.min.css" rel="stylesheet" />
|
||||
<link href="css/knockout.contextmenu.css" rel="stylesheet" type="text/css"/>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" />
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.0.0/knockout-min.js" type="text/javascript"></script>
|
||||
<script src="js/knockout.contextmenu.js" type="text/javascript"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/sammy.js/0.7.6/sammy.js" type="text/javascript"></script>
|
||||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/momentjs/2.10.6/moment.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.1/js/bootstrap-datepicker.js"></script>
|
||||
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.1/js/bootstrap-datepicker.js"></script>-->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
|
||||
</head>
|
||||
<body data-bind="css: {footerBody: errorData() !== null}">
|
||||
<nav class="navbar navbar-default">
|
||||
@ -330,7 +332,18 @@
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h4>MANUAL EDIT</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="modal-body" style="height: 300px;">
|
||||
<form action="#manualLog" method="post" class="form-group">
|
||||
<input type="hidden" name="Id" data-bind="value: Id"/>
|
||||
<div class="form-group">
|
||||
<div class='input-group date' id='datetimepicker1'>
|
||||
<input type='text' class="form-control" />
|
||||
<span class="input-group-addon">
|
||||
<span class="glyphicon glyphicon-calendar"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Event Time:</th>
|
||||
@ -338,7 +351,13 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Direction</th>
|
||||
<td data-bind="text: Direction"></td>
|
||||
<td>
|
||||
<select id="Direction">
|
||||
<option value="-1"></option>
|
||||
<option value="0">In</option>
|
||||
<option value="1">Out</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user