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

Merge branch '3.2.4' into 'dev'

Browse Source 
3.2.4

See merge request TheGamecraft/c-cms!84
This commit is contained in:
Mathieu Lagace
2019-11-08 22:25:19 +00:00
parent 82c50eb03b 2f441f36f8
commit 57783b8e85
10 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/User.php
View File

@@ -80,9 +80,12 @@ class User extends Authenticatable
$filterCourse = collect();
foreach (\Auth::user()->courses as $course)
{
if(date('U',strtotime($course->event->date_begin)) >= date('U'))
if($course->event)
{
$filterCourse->push($course);
if(date('U',strtotime($course->event->date_begin)) >= date('U'))
{
$filterCourse->push($course);
}
}
}
return $filterCourse;

11
public/css/custom.css vendored
View File

@@ -1,3 +1,12 @@
.word-wrap {
white-space: normal;
word-break: break-word;
}
.container-fluid {
padding: 0px;
}
.calendar {
margin-top: 50px;
}
@@ -159,6 +168,8 @@
.modal-lg {
max-width: 85%;
margin-left: auto !important;
margin-right: auto !important;
}
/*!

11
resources/custom.css vendored
View File

@@ -1,3 +1,12 @@
.word-wrap {
white-space: normal;
word-break: break-word;
}
.container-fluid {
padding: 0px;
}
.calendar {
margin-top: 50px;
}
@@ -159,6 +168,8 @@
.modal-lg {
max-width: 85%;
margin-left: auto !important;
margin-right: auto !important;
}
/*!

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

@@ -3,14 +3,14 @@
@section('content')
<div class="row">
<div class="col-lg-8 col-md-12">
<div class="col-md-12">
<div class="col-md-12 p-0">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title"> Cours à venir</h4>
</div>
<div class="card-body">
<div class="row">
@if(\Auth::user()->courses->isEmpty())
@if(\Auth::user()->futureCourses()->isEmpty())
<div class="col-sm-12 text-center">
<h4 class="m-4">Aucun cours à venir</h4>
</div>
@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12 p-0">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">Activité à venir</h4>
@@ -44,24 +44,25 @@
<div class="col-sm-12 text-center">
<h4 class="m-4">Aucune activité à venir</h4>
</div>
@endif
@foreach ($futureEvent as $event)
<div class="col-md-12">
<div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
<div class="row text-white">
<div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
<h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
</div>
<div class="col-md">
{{$event->name}}
</div>
<div class="col-md-4">
{{$event->date_begin}}
@else
@foreach ($futureEvent as $event)
<div class="col-md-12">
<div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
<div class="row text-white">
<div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
<h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
</div>
<div class="col-md">
{{$event->name}}
</div>
<div class="col-md-4">
{{$event->date_begin}}
</div>
</div>
</div>
</div>
</div>
@endforeach
@endforeach
@endif
</div>
<br>
<a href="/admin/schedule" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
@@ -70,7 +71,7 @@
</div>
</div>
<div class="col-lg-4">
<div class="col-12">
<div class="col-12 p-0">
<div class="card card-profile">
<div class="card-avatar">
<a>
@@ -89,7 +90,7 @@
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12 p-0">
<div class="card">
<div class="card-header card-header-info">
<h4 class="card-title">Nouvelles</h4>
@@ -115,7 +116,7 @@
</div>
</div>
@if(\Auth::user()->p('stats_see') == 1)
<div class="col-12">
<div class="col-12 p-0">
<div class="card">
<div class="card-header card-header-primary">
<h4 class="card-title">Activité sur le site</h4>

2
resources/views/admin/inventory/index.blade.php
View File

@@ -14,7 +14,7 @@
@endif
</div>
<hr>
<table id="log-data" class="table table-striped table-bordered">
<table id="log-data" class="table table-striped table-bordered dt-responsive">
<thead>
<tr>
<th>#</th>

2
resources/views/admin/itemcategory/index.blade.php
View File

@@ -15,7 +15,7 @@
</div>
</div>
<div class="col-md-12">
<table id="log-data" class="table table-striped table-bordered">
<table id="log-data" class="table table-striped table-bordered dt-responsive">
<thead>
<tr>
<th class="text-center">ID</th>

4
resources/views/admin/log/display.blade.php
View File

@@ -8,8 +8,8 @@
</a></strong>
</div>
<div class="card-body">
<div class="material-datatables">
<table id="log-data" class="table table-striped table-no-bordered table-hover dataTable dtr-inline">
<div class="material-datatables ">
<table id="log-data" class="table table-striped dt-responsive table-no-bordered table-hover dataTable dtr-inline">
<thead>
<tr>
<th>Horodatage</th>

2
resources/views/admin/user/index.blade.php
View File

@@ -7,7 +7,7 @@
<h4 class="card-title">Liste des utilisateurs </h4>
</div>
<div class="card-body">
<table id="log-data" class="table table-striped table-no-bordered table-hover dataTable dtr-inline">
<table id="log-data" class="table table-striped table-no-bordered table-hover dataTable dtr-inline dt-responsive">
<thead>
<tr>
<th>ID</th>

32
resources/views/layouts/modal/schedule/show.blade.php
View File

@@ -1,7 +1,7 @@
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">{{$event->name}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
@@ -9,21 +9,19 @@
@yield('content')
</div>
<div class="modal-footer">
<div class="col-md-6">
<div class="btn-group">
@if(\Auth::user()->p('schedule_edit') == 1)
<a class="btn btn-primary" href="/admin/schedule/edit/{{$event->id}}" data-toggle="tooltip" data-placement="bottom" title="Modifier"><i class="material-icons">edit</i></a>
@endif
<a class="btn btn-primary" href="/admin/schedule/pdf/event/{{$event->id}}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Imprimer"><i class="material-icons">print</i></a>
@if(\Auth::user()->p('schedule_delete') == 1)
<button class="btn btn-danger" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button>
@endif
</div>
</div>
<div class="col-md-6 text-right">
<div class="btn-group">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Fermer</button>
</div>
<div class="modal-footer row">
<div class="col-sm-8 m-0 text-left">
@if(\Auth::user()->p('schedule_edit') == 1)
<a class="btn btn-primary btn-fab btn-fab-mini btn-round" href="/admin/schedule/edit/{{$event->id}}" data-toggle="tooltip" data-placement="bottom" title="Modifier"><i class="material-icons">edit</i></a>
@endif
<a class="btn btn-primary btn-fab btn-fab-mini btn-round" href="/admin/schedule/pdf/event/{{$event->id}}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Imprimer"><i class="material-icons">print</i></a>
@if(\Auth::user()->p('schedule_delete') == 1)
<button class="btn btn-danger btn-fab btn-fab-mini btn-round" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button>
@endif
</div>
<div class="col-sm-4 m-0 text-right">
<div class="btn-group">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Fermer</button>
</div>
</div>
</div>

4
resources/views/public/index.blade.php
View File

@@ -13,7 +13,7 @@
<div class="main main-raised">
<div class="w-100 text-center">
<a href="#one" class="btn btn-primary btn-lg" style="margin-top:-10rem;">{{ App\Config::getData('text_public_banner_apprendre_plus') }}</a>
<a href="#activity" class="btn btn-primary btn-lg" style="margin-top:-7rem;">{{ App\Config::getData('text_public_banner_apprendre_plus') }}</a>
@if(request()->has('editMode'))
<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_apprendre_plus">
<i class="fa fa-pencil" aria-hidden="true"></i>
@@ -55,7 +55,7 @@
<!-- CTA -->
<div class="section text-center" id="cta">
<h2>{{ App\Config::getData('text_public_cta')}}@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_cta" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</h2>
<a href="{{ App\Config::getData('escadron_direct_googlemap_link')}}" class="btn btn-big btn-primary">{{ App\Config::getData('escadron_address')}} - {{ App\Config::getData('escadron_phone')}}</a>
<a href="{{ App\Config::getData('escadron_direct_googlemap_link')}}" class="btn btn-big btn-primary word-wrap">{{ App\Config::getData('escadron_address')}} - {{ App\Config::getData('escadron_phone')}}</a>
</div>
</div>
</div>