Merge branch '3.2.4' into 'dev'

MAJ UI Calendar

See merge request TheGamecraft/c-cms!72
This commit is contained in:
Mathieu Lagace
2019-10-02 12:44:25 +00:00
3 changed files with 13 additions and 16 deletions

View File

@@ -68,10 +68,11 @@
border-top: none;
z-index: 99;
/*position the autocomplete items to be the same width as the container:*/
top: 50%;
top: 64%;
left: 0;
right: 0;
}
.autocomplete-items div {
padding: 10px;
cursor: pointer;

View File

@@ -68,10 +68,11 @@
border-top: none;
z-index: 99;
/*position the autocomplete items to be the same width as the container:*/
top: 50%;
top: 64%;
left: 0;
right: 0;
}
.autocomplete-items div {
padding: 10px;
cursor: pointer;

View File

@@ -111,16 +111,12 @@
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<div class="form-group">
<label for="name">Instructeur</label>
<select class="selectpicker d-block" data-style="btn btn-outline-primary w-100">
@foreach(\App\User::all() as $user)
<option value="{{$user->id}}">{{$user->fullname()}}</option>
@endforeach
</select>
<small id="nameHelp" class="text-muted">Veuillez entrer le nom de l'instructeur</small>
<div class="autocomplete">
<input type="text" name="instruc_n{{$i}}_p{{$p}}" id="instruc_n{{$i}}_p{{$p}}" class="form-control AutoComplete" aria-describedby="nameHelp" autocomplete="off" required>
</div>
<small id="nameHelp" class="text-muted">Veuillez entrer le nom de l'instructeur</small>
</div>
</div>
<div class="col-sm-6 my-2">
@@ -136,7 +132,7 @@
<input type="text" name="loc_n{{$i}}_p{{$p}}" id="loc_n{{$i}}_p{{$p}}" class="form-control" placeholder="" aria-describedby="nameHelp" required @if(env('APP_DEBUG') == true)value="Lieu"@endif>
<small id="nameHelp" class="text-muted">Veuillez entrer le lieux</small>
</div>
</div>#
</div>
</div>
<hr>
@endfor
@@ -148,6 +144,7 @@
</div>
@endif
<script src="/js/plugins/autocomplete.js"></script>
<script>
var begin = "<?php echo $begin_time ?>";
var end = "<?php echo $end_time ?>";
@@ -197,7 +194,5 @@ $('#datetimepickermsg').datetimepicker({
$('.richeditor').trumbowyg({
lang: 'fr'
});
$( ".basicAutoComplete" ).autocomplete({
source: '/api/user/list?api_token='+api_token
});
initAutoComplete("AutoComplete");
</script>