c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

3.2.4

Browse Source
This commit is contained in:
Mathieu Lagace
2019-09-17 21:40:55 -04:00
parent b24f0baddb
commit 2eabeb4205
7 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/js/calendar.js vendored
View File

@@ -45,6 +45,7 @@ function switchType(date) {
$.get( "/api/schedule/events/add/modal/"+selectInput.val()+"/"+date+"?api_token="+api_token, function( data ) {
$( "#container" ).html( data );
console.log( "Loading defaut value for activity type ("+selectInput.val()+")" );
$('select').selectpicker();
});
}

12
resources/views/admin/article/index.blade.php
View File

@@ -10,7 +10,7 @@
<div class="card-body">
<div class="row">
@foreach($activity as $a)
<div class="col-md-4">
<div class="col-xl-4 col-lg-6">
<div class="card">
<div class="card-header">
<h4 class="card-title">{{$a->name}}</h4>
@@ -23,17 +23,17 @@
<div class="card-footer">
<div class="row">
<div class="col-md-12">
<div class="btn-group w-100">
<div class="text-center">
@if(\Auth::user()->p('article_edit') == 1)
<a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-cog"></i>&nbsp; Modifier l'article</a>
<a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier l'article</a>
@endif
@if(\Auth::user()->p('article_edit') == 1 && \Auth::user()->p('picture_add'))
<a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-picture-o"></i>&nbsp; Gérer les photos</a>
<a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary"><i class="fa fa-picture-o"></i>&nbsp; Gérer les photos</a>
@endif
</div>
</div>
<div class="col-md-12">
<a href="/activity/{{$a->id}}" target="_blank" type="button" class="btn btn-outline-secondary btn-block"><i class="fa fa-picture-o"></i>&nbsp; Voir l'article</a>
<div class="col-md-12 text-center">
<a href="/activity/{{$a->id}}" target="_blank" type="button" class="btn btn-outline-secondary"><i class="fa fa-picture-o"></i>&nbsp; Voir l'article</a>
</div>
</div>
</div>

8
resources/views/admin/configs/activity.blade.php
View File

@@ -7,15 +7,15 @@
Configuration Générale
</div>
<div class="card-body">
<div class="row form-group">
<div class="row">
@foreach ($activities as $activity)
<div class="col-md-6 p-2">
<div class="col-lg-12 col-xl-6 p-2">
<div class="row m-auto">
<div class="col-md-8">
<div class="col">
<label for="text-input" class=" form-control-label">{{$activity->name}}</label>
<small class="form-text text-muted">{{$activity->admin_desc}}</small>
</div>
<div class="col-md-3">
<div class="col text-right">
<div class="btn-group">
<a href="/admin/config/activity/edit/{{$activity->id}}" class="btn btn-primary"><i class="fa fa-cog" aria-hidden="true"></i> Modifier</a>
<button class="btn btn-danger" onclick="delActivity({{$activity->id}})" ><i class="fa fa-times" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="Supprimer"></i></button>

2
resources/views/admin/dashboard.blade.php
View File

@@ -9,6 +9,7 @@
<h4 class="card-title"> Cours à venir</h4>
</div>
<div class="card-body">
<div class="row">
@if(\Auth::user()->courses->isEmpty())
<div class="col-sm-12 text-center">
<h4 class="m-4">Aucun cours à venir</h4>
@@ -31,6 +32,7 @@
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">

1
resources/views/admin/schedule/event/add.blade.php
View File

@@ -49,6 +49,7 @@ $('.datetimepicker').datetimepicker({
close: 'fa fa-remove'
}
});
$('select').selectpicker();
</script>
@endsection

36
resources/views/admin/schedule/modal/add.blade.php
View File

@@ -1,3 +1,6 @@
<div class="col-md-12 mt-4 text-center">
<h4>Information Générale</h4>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="name">Nom de l'événement</label>
@@ -5,26 +8,26 @@
<small id="nameHelp" class="text-muted">Veuillez entrer le nom de l'événement</small>
</div>
</div>
<div class="col-md-2">
<div class="col-lg-3 col-md-4">
<div class="form-group">
<label class="label-control">Date et Heure de début</label>
<input name="begin" type="text" id="datetimepickerbegin" class="form-control datetimepicker" required/>
</div>
</div>
<div class="col-md-2">
<div class="col-lg-3 col-md-4">
<div class="form-group">
<label class="label-control">Date et Heure de fin</label>
<input name="end" type="text" id="datetimepickerend" class="form-control datetimepicker" required/>
</div>
</div>
<div class="col-md-5">
<div class="col-lg-6 col-md-4">
<div class="form-group">
<label for="name">Lieux</label>
<input type="text" name="location" id="location" class="form-control" placeholder="" aria-describedby="nameHelp" value="{{$activity->location}}" required>
<small id="nameHelp" class="text-muted">Veuillez entrer le lieu de l'événement</small>
</div>
</div>
<div class="col-md-3 m-auto">
<div class="col-md-5 my-auto">
<div class="form-group">
<div class="form-check">
<label class="form-check-label">
@@ -32,7 +35,7 @@
@if ($activity->is_mandatory == 1)
checked
@endif>
L'événement est obligatoire
L'événement est t-il obligatoire pour tous les cadets ?
<span class="form-check-sign">
<span class="check"></span>
</span>
@@ -40,6 +43,19 @@
</div>
</div>
</div>
<div class="col-md-12 mt-4 text-center">
<h4>Options Supplémentaires</h4>
</div>
<div class="col-md-12 mt-4">
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link active text-primary" href="#">Active</a>
</li>
<li class="nav-item">
<a class="nav-link text-primary" href="#">Link</a>
</li>
</ul>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="desc">Commentaire</label>
@@ -48,6 +64,9 @@
</div>
@if ($activity->id == 1)
<div class="col-md-12 mt-4 text-center">
<h4>Horaire d'instruction</h4>
</div>
<div class="col-md-12">
<div id="accordion" role="tablist">
@for ($i = 1; $i <= \App\Config::getData('admin_level_in_schedule_nb'); $i++)
@@ -78,7 +97,11 @@
<div class="form-group">
<div class="form-group">
<label for="name">Instructeur</label>
<input type="text" name="instruc_n{{$i}}_p{{$p}}" id="instruc_n{{$i}}_p{{$p}}" class="form-control basicAutoComplete" aria-describedby="nameHelp" required>
<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>
</div>
@@ -111,7 +134,6 @@
</div>
@endif
<script>
var begin = "<?php echo $begin_time ?>";
var end = "<?php echo $end_time ?>";

6
resources/views/admin/user/profil.blade.php
View File

@@ -71,6 +71,7 @@
<thead class="thead-default">
<tr>
<th>Horodatage</th>
<th>Résultat</th>
<th>Action</th>
</tr>
</thead>
@@ -78,7 +79,8 @@
@foreach ($user->logs()->take(6)->get() as $log)
<tr>
<td scope="row">{{$log->created_at}}</td>
<td>{{$log->action}}</td>
<td><span class="badge badge-pill badge-{{$log->result}} text-uppercase">{{$log->result}}</span></td>
<td>{{$log->event}}</td>
</tr>
@endforeach
</tbody>
@@ -95,7 +97,7 @@
<a name="changepsw" id="changepsw" class="btn btn-warning btn-block" href="/admin/profil/password" role="button">Modifier mon mot de passe</a>
<a class="btn btn-secondary btn-block" href="/admin/profil/avatar" role="button">Modifier ma photo de profil</a>
<button disabled class="btn btn-secondary btn-block" href="/admin/profil/phone" role="button">Modifier mon numéro de téléphone</button>
<button disabled class="btn btn-secondary btn-block" href="/admin/profil/adress" role="button">Modifier mon adresse</button>
<a class="btn btn-secondary btn-block" href="/admin/profil/adress" role="button">Modifier mon adresse</a>
<button disabled class="btn btn-primary btn-block" href="/admin/profil/preference" role="button">Modifier mes préférences</button>
<a class="btn btn-danger btn-block" href="/logout" role="button">Déconnexion</a>
</div>