This commit is contained in:
Mathieu Lagace
2019-09-30 17:06:31 -04:00
parent d1ce6ba6da
commit 0166c48daa
38 changed files with 618 additions and 201 deletions

34
resources/custom.css vendored
View File

@@ -2,6 +2,14 @@
margin-top: 50px;
}
.news-title {
height: 3.2rem;
}
.news-tags {
height: 1.5rem;
}
.news-body-small {
height: 15rem;
overflow: hidden;
@@ -53,6 +61,32 @@
height: 3rem;
overflow: hidden;
}
.autocomplete-items {
position: absolute;
border: 1px solid #d4d4d4;
border-bottom: none;
border-top: none;
z-index: 99;
/*position the autocomplete items to be the same width as the container:*/
top: 50%;
left: 0;
right: 0;
}
.autocomplete-items div {
padding: 10px;
cursor: pointer;
background-color: #fff;
border-bottom: 1px solid #d4d4d4;
}
.autocomplete-items div:hover {
/*when hovering an item:*/
background-color: #e9e9e9;
}
.autocomplete-active {
/*when navigating through the items using the arrow keys:*/
background-color: DodgerBlue !important;
color: #ffffff;
}
@media only screen and (max-width: 800px) {
.calendar-container {

View File

@@ -25,7 +25,11 @@
{{$event->fulldesc}}
</div>
<div class="col-md-6 text-right">
{{$event->user->fullname()}}
@if(is_numeric($event->user_id))
{{$event->user->fullname()}}
@else
{{$event->user_id}}
@endif
</div>
</div>
</div>

View File

@@ -0,0 +1,48 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4>Configuration des postes</h4>
</div>
<div class="card-body mt-5">
<div class="row">
<div class="col-md-12">
<a href="/admin/config/jobs/add" class="btn btn-primary btn-block mb-3">Ajouter un poste</a>
</div>
@foreach($jobs as $job)
<div class="col-md-4">
<div class="card">
<div class="card-header @if($job->id == 1) card-header-danger @else card-header-primary @endif">
<h4>{{$job->name}}</h4>
</div>
<div class="card-body">
<div>
{!! $job->desc!!}
</div>
<div class="row">
<div class="col-md-10">
@if($job->id == 1)
<button disabled class="btn btn-primary btn-block">Gérer</button>
@else
<a href="/admin/config/jobs/{{$job->id}}" class="btn btn-primary btn-block">Gérer</a>
@endif
</div>
<div class="col">
@if($job->id == 1)
<button disabled class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
@else
<button class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
@endif
</div>
</div>
</div>
</div>
</div>
@endforeach
</div>
</div>
</div>
</div>
@endsection

View File

@@ -8,6 +8,9 @@
</div>
<div class="card-body mt-5">
<div class="row">
<div class="col-md-12">
<a href="/admin/config/ranks/add" class="btn btn-primary btn-block mb-3">Ajouter un grade</a>
</div>
@foreach($ranks as $rank)
<div class="col-md-4">
<div class="card">
@@ -16,11 +19,22 @@
</div>
<div class="card-body">
<div>
{{$rank->desc}}
{!! $rank->desc!!}
</div>
<div class="row">
<div class="col-md-12">
<a href="/admin/config/ranks/{{$rank->id}}" class="btn btn-primary btn-block">Gérer</a>
<div class="col-md-10">
@if($rank->id == 1)
<button disabled class="btn btn-primary btn-block">Gérer</button>
@else
<a href="/admin/config/ranks/{{$rank->id}}" class="btn btn-primary btn-block">Gérer</a>
@endif
</div>
<div class="col">
@if($rank->id == 1)
<button disabled class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
@else
<button class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
@endif
</div>
</div>
</div>

View File

@@ -96,7 +96,7 @@
</div>
<div class="card-body">
<div class="row">
@foreach (\App\News::all()->forPage(1,4); as $msg)
@foreach (\App\News::all()->forPage(1,3) as $msg)
<div class="col-12 text-center">
<a href="/admin/message/{{$msg->id}}">
<div style="height:2rem;">{{$msg->title}}</div>

View File

@@ -15,7 +15,7 @@
<div class="col-md-8">
<div class="form-group">
<label>Titre</label>
<input class="form-control" type="text" name="title">
<input class="form-control" type="text" name="title" required>
<small class="form-text text-muted">Titre de la nouvelle à publier</small>
</div>
</div>
@@ -33,7 +33,7 @@
<div class="col-md-12">
<div class="form-group">
<label>Contenu</label>
<textarea id="body" name="body"></textarea>
<textarea id="body" name="body" required></textarea>
</div>
</div>
<div class="col-md-12">

View File

@@ -3,14 +3,14 @@
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header">
<div class="card-header card-header-primary">
<strong class="card-title">Nouvelles <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
</a></strong>
</div>
<div class="card-body">
<div class="btn-group btn-block">
@if(\Auth::user()->p('news_add') == 1)
<a name="add" id="add" class="btn btn-primary btn-block" href="/admin/news/add" role="button">Ajouter un nouvelle</a>
<a name="add" id="add" class="btn btn-outline-primary btn-block" href="/admin/news/add" role="button">Ajouter un nouvelle</a>
@endif
</div>
<hr>
@@ -24,8 +24,19 @@
<div class="col-md-4">
<div class="card">
<div class="card-header">
<h4 class="card-title">{{$n->title}}</h4>
<h4 class="card-title news-title">{{$n->title}}</h4>
<p class="category">{{$n->user->fullname()}} - {{$n->created_at}}
<div class="news-tags">
@if($n->tags != [])
@foreach($n->tags as $tag)
@if($tag == "Important")
<span class="badge badge-pill badge-danger">{{$tag}}</span>
@else
<span class="badge badge-pill badge-default">{{$tag}}</span>
@endif
@endforeach
@endif
</div>
@if($n->publish == 0) <span class="badge badge-warning float-right">Brouillon</span> @endif</p>
</div>
<div class="card-body news-body-small">
@@ -33,10 +44,12 @@
</div>
<div class="card-footer">
<div class="btn-group">
@if(\Auth::user()->p('news_edit') == 1)
@if(\Auth::user()->p('news_edit') == 1 && !isset($n->event_id))
<a href="/admin/news/edit/{{$n->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier</a>
@else
<a href="/admin/schedule/edit/{{$n->event_id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier</a>
@endif
@if(\Auth::user()->p('news_delete') == 1)
@if(\Auth::user()->p('news_delete') == 1 && !isset($n->event_id))
<a type="button" class="btn btn-danger" onclick="deleteEvent({{$n->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
@endif
</div>
@@ -44,6 +57,9 @@
</div>
</div>
@endforeach
<div class="col-12">
{{ $news->links() }}
</div>
</div>
</div>
</div>

View File

@@ -23,6 +23,9 @@
</div>
</div>
<div class="row" id="container">
<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>
@@ -30,26 +33,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-12 my-auto text-center">
<div class="form-group">
<div class="form-check">
<label class="form-check-label">
@@ -57,23 +60,54 @@
@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>
<span class="check"></span>
</span>
</label>
</div>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="desc">Commentaire</label>
<br>
<textarea class="form-control" name="desc" id="desc" rows="6" required>{!!$activity->desc!!}</textarea>
<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-pills mb-3 justify-content-center" id="pills-tab" role="tablist">
<li class="nav-item w-25">
<a class="nav-link active w-100" id="pills-home-tab" data-toggle="pill" href="#comment" role="tab" aria-controls="pills-home" aria-selected="true">Description</a>
</li>
<li class="nav-item w-25">
<a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#msg" role="tab" aria-controls="pills-profile" aria-selected="false">Message de la semaine</a>
</li>
</ul>
<div class="tab-content" id="pills-tabContent">
<div class="tab-pane fade show active" id="comment" role="tabpanel" aria-labelledby="pills-home-tab">
<div class="form-group">
<textarea class="form-control richeditor" name="desc" id="desc" rows="6" required>{{$activity->desc}}</textarea>
</div>
</div>
<div class="tab-pane fade" id="msg" role="tabpanel" aria-labelledby="pills-profile-tab">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="label-control">Date et heure de publication des messages de la semaine</label>
<input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker" required/>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<textarea class="form-control richeditor" name="msg" id="msg" rows="6" required>{{$activity->msg}}</textarea>
</div>
</div>
</div>
</div>
</div>
</div>
@if ($activity->type == 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++)
@@ -104,7 +138,9 @@
<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 @if($activity->course($p,$i) != null) value="{{\App\User::find($activity->course($p,$i)->user_id)->fullname()}}" @endif>
<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 @if($activity->course($p,$i) != null) value="@if(is_numeric($activity->course($p,$i)->user_id)){{\App\User::find($activity->course($p,$i)->user_id)->fullname()}} @else {{$activity->course($p,$i)->user_id}} @endif" @endif>
</div>
<small id="nameHelp" class="text-muted">Veuillez entrer le nom de l'instructeur</small>
</div>
</div>
@@ -146,9 +182,12 @@
@section('custom_scripts')
<script src="/js/calendar.js"></script>
<script src="/js/plugins/autocomplete.js"></script>
<script>
var countries = ["Afghanistan","Albania","Algeria","Andorra","Angola","Anguilla","Antigua &amp; Barbuda","Argentina","Armenia","Aruba","Australia","Austria","Azerbaijan","Bahamas","Bahrain","Bangladesh","Barbados","Belarus","Belgium","Belize","Benin","Bermuda","Bhutan","Bolivia","Bosnia &amp; Herzegovina","Botswana","Brazil","British Virgin Islands","Brunei","Bulgaria","Burkina Faso","Burundi","Cambodia","Cameroon","Canada","Cape Verde","Cayman Islands","Central Arfrican Republic","Chad","Chile","China","Colombia","Congo","Cook Islands","Costa Rica","Cote D Ivoire","Croatia","Cuba","Curacao","Cyprus","Czech Republic","Denmark","Djibouti","Dominica","Dominican Republic","Ecuador","Egypt","El Salvador","Equatorial Guinea","Eritrea","Estonia","Ethiopia","Falkland Islands","Faroe Islands","Fiji","Finland","France","French Polynesia","French West Indies","Gabon","Gambia","Georgia","Germany","Ghana","Gibraltar","Greece","Greenland","Grenada","Guam","Guatemala","Guernsey","Guinea","Guinea Bissau","Guyana","Haiti","Honduras","Hong Kong","Hungary","Iceland","India","Indonesia","Iran","Iraq","Ireland","Isle of Man","Israel","Italy","Jamaica","Japan","Jersey","Jordan","Kazakhstan","Kenya","Kiribati","Kosovo","Kuwait","Kyrgyzstan","Laos","Latvia","Lebanon","Lesotho","Liberia","Libya","Liechtenstein","Lithuania","Luxembourg","Macau","Macedonia","Madagascar","Malawi","Malaysia","Maldives","Mali","Malta","Marshall Islands","Mauritania","Mauritius","Mexico","Micronesia","Moldova","Monaco","Mongolia","Montenegro","Montserrat","Morocco","Mozambique","Myanmar","Namibia","Nauro","Nepal","Netherlands","Netherlands Antilles","New Caledonia","New Zealand","Nicaragua","Niger","Nigeria","North Korea","Norway","Oman","Pakistan","Palau","Palestine","Panama","Papua New Guinea","Paraguay","Peru","Philippines","Poland","Portugal","Puerto Rico","Qatar","Reunion","Romania","Russia","Rwanda","Saint Pierre &amp; Miquelon","Samoa","San Marino","Sao Tome and Principe","Saudi Arabia","Senegal","Serbia","Seychelles","Sierra Leone","Singapore","Slovakia","Slovenia","Solomon Islands","Somalia","South Africa","South Korea","South Sudan","Spain","Sri Lanka","St Kitts &amp; Nevis","St Lucia","St Vincent","Sudan","Suriname","Swaziland","Sweden","Switzerland","Syria","Taiwan","Tajikistan","Tanzania","Thailand","Timor L'Este","Togo","Tonga","Trinidad &amp; Tobago","Tunisia","Turkey","Turkmenistan","Turks &amp; Caicos","Tuvalu","Uganda","Ukraine","United Arab Emirates","United Kingdom","United States of America","Uruguay","Uzbekistan","Vanuatu","Vatican City","Venezuela","Vietnam","Virgin Islands (US)","Yemen","Zambia","Zimbabwe"];
var begin = "<?php echo $activity->date_begin ?>";
var end = "<?php echo $activity->date_end ?>";
var msg = "<?php echo $activity->date_msg ?>";
$('#datetimepickerbegin').datetimepicker({
icons: {
time: "fa fa-clock-o",
@@ -177,12 +216,24 @@
},
date: new Date(end)
});
$('#desc').trumbowyg({
$('#datetimepickermsg').datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
},
date: new Date(msg)
});
$('.richeditor').trumbowyg({
lang: 'fr'
});
$( ".basicAutoComplete" ).autocomplete({
source: '/api/user/list?api_token='+api_token
});
initAutoComplete("AutoComplete");
</script>
@endsection

View File

@@ -27,7 +27,7 @@
<small id="nameHelp" class="text-muted">Veuillez entrer le lieu de l'événement</small>
</div>
</div>
<div class="col-md-5 my-auto">
<div class="col-md-12 my-auto text-center">
<div class="form-group">
<div class="form-check">
<label class="form-check-label">
@@ -47,22 +47,39 @@
<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>
<ul class="nav nav-pills mb-3 justify-content-center" id="pills-tab" role="tablist">
<li class="nav-item w-25">
<a class="nav-link active w-100" id="pills-home-tab" data-toggle="pill" href="#comment" role="tab" aria-controls="pills-home" aria-selected="true">Description</a>
</li>
<li class="nav-item">
<a class="nav-link text-primary" href="#">Link</a>
<li class="nav-item w-25">
<a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#msg" role="tab" aria-controls="pills-profile" aria-selected="false">Message de la semaine</a>
</li>
</ul>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="desc">Commentaire</label>
<textarea class="form-control" name="desc" id="desc" rows="6" required>{{$activity->admin_desc}}</textarea>
<div class="tab-content" id="pills-tabContent">
<div class="tab-pane fade show active" id="comment" role="tabpanel" aria-labelledby="pills-home-tab">
<div class="form-group">
<label for="desc">Description</label>
<textarea class="form-control richeditor" name="desc" id="desc" rows="6" required>{{$activity->admin_desc}}</textarea>
</div>
</div>
<div class="tab-pane fade" id="msg" role="tabpanel" aria-labelledby="pills-profile-tab">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="label-control">Date et heure de publication des messages de la semaine</label>
<input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker" required/>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="desc">Message de le semaine</label>
<textarea class="form-control richeditor" name="msg" id="msg" rows="6" required>{{\App\Config::getData('default_weekly_msg')}}</textarea>
</div>
</div>
</div>
</div>
</div>
</div>
@if ($activity->id == 1)
<div class="col-md-12 mt-4 text-center">
<h4>Horaire d'instruction</h4>
@@ -89,7 +106,7 @@
<div class="col-sm-6 my-2">
<div class="form-group">
<label for="name">Nom du cours</label>
<input type="text" name="name_n{{$i}}_p{{$p}}" id="name_n{{$i}}_p{{$p}}" class="form-control" aria-describedby="nameHelp" required>
<input type="text" name="name_n{{$i}}_p{{$p}}" id="name_n{{$i}}_p{{$p}}" class="form-control" aria-describedby="nameHelp" required @if(env('APP_DEBUG') == true)value="Nom du cours"@endif>
<small id="nameHelp" class="text-muted">Veuillez entrer le nom du cours</small>
</div>
</div>
@@ -109,20 +126,17 @@
<div class="col-sm-6 my-2">
<div class="form-group">
<label for="name">OCOM</label>
<input type="text" name="ocom_n{{$i}}_p{{$p}}" id="ocom_n{{$i}}_p{{$p}}" class="form-control" aria-describedby="nameHelp" required>
<input type="text" name="ocom_n{{$i}}_p{{$p}}" id="ocom_n{{$i}}_p{{$p}}" class="form-control" aria-describedby="nameHelp" required @if(env('APP_DEBUG') == true)value="OCOM"@endif>
<small id="nameHelp" class="text-muted">Veuillez entrer l'OCOM</small>
</div>
</div>
<div class="col-sm-6 my-2">
<div class="form-group">
<label for="name">Lieux</label>
<input type="text" name="loc_n{{$i}}_p{{$p}}" id="loc_n{{$i}}_p{{$p}}" class="form-control" placeholder="" aria-describedby="nameHelp" required>
<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 class="col-sm-12">
<button type="button" class="btn btn-primary btn-block" disabled>Réservation de materiel (Disponible une fois l'événement sauvegarder)</button>
</div>
</div>#
</div>
<hr>
@endfor
@@ -137,6 +151,7 @@
<script>
var begin = "<?php echo $begin_time ?>";
var end = "<?php echo $end_time ?>";
var msg = "<?php echo $msg_time ?>";
$('#datetimepickerbegin').datetimepicker({
icons: {
time: "fa fa-clock-o",
@@ -165,7 +180,21 @@ $('#datetimepickerend').datetimepicker({
},
date: new Date(end)
});
$('#desc').trumbowyg({
$('#datetimepickermsg').datetimepicker({
icons: {
time: "fa fa-clock-o",
date: "fa fa-calendar",
up: "fa fa-chevron-up",
down: "fa fa-chevron-down",
previous: 'fa fa-chevron-left',
next: 'fa fa-chevron-right',
today: 'fa fa-screenshot',
clear: 'fa fa-trash',
close: 'fa fa-remove'
},
date: new Date(msg)
});
$('.richeditor').trumbowyg({
lang: 'fr'
});
$( ".basicAutoComplete" ).autocomplete({

View File

@@ -54,7 +54,7 @@
@if(\App\User::find($course->user_id))
{{\App\User::find($course->user_id)->fullname()}}
@else
Utilisateur Inconnu
{{$course->user_id}}
@endif
</div>
<div class="col-sm-6 my-2">

View File

@@ -23,7 +23,7 @@
<td style="width: 5%;">{{$item->id}}</td>
<td>{{$item->fullname()}}</td>
<td>{{$item->rank->name}}</td>
<td>{{\App\Job::find($item->job)->name}}</td>
<td>{{$item->job->name}}</td>
<td class="td-actions text-right" style="width: 12%;">
<a class="btn btn-info p-2 text-white" href="/admin/user/edit/{{$item->id}}"><i class="material-icons">edit</i></a>
<a class="btn btn-danger p-2 text-white" onclick="deleteEvent({{$item->id}});"><i class="material-icons">close</i></a>

View File

@@ -16,7 +16,7 @@
<div class="col-sm-6 text-center">
<div class="row mt-3">
<div class="col-md-12">
<p>{{\App\Rank::find($user->job)->name}}</p>
<p>{{$user->job->name}}</p>
<hr>
</div>
<div class="col-md-6">

View File

@@ -213,16 +213,28 @@
</li>
@endif
<li class="nav-item ">
<a class="nav-link" href="/admin/files">
<a class="nav-link" data-toggle="collapse" href="#file">
<i class="material-icons">folder</i>
<p> Fichier</p>
</a>
</li>
<li class="nav-item ">
<a class="nav-link" href="/admin/guide">
<i class="material-icons">library_books</i>
<p> Guide pédagogique</p>
<p> Fichier
<b class="caret"></b>
</p>
</a>
<div class="collapse" id="file">
<ul class="nav">
<li class="nav-item ">
<a class="nav-link" href="/admin/guide">
<span class="sidebar-mini"> <i class="fas fa-book"></i></span>
<span class="sidebar-normal"> Guide pédagogique </span>
</a>
</li>
<li class="nav-item ">
<a class="nav-link" href="/admin/files">
<span class="sidebar-mini"> <i class="fas fa-cog"></i> </span>
<span class="sidebar-normal"> Divers </span>
</a>
</li>
</ul>
</div>
</li>
@if(\Auth::user()->p('config_edit') == 1)
<li class="nav-item ">

View File

@@ -9,10 +9,27 @@
<div class="row">
@foreach ($news as $new)
<div class="col-md-4">
<h3>{{ $new->title }}</h3>
<h3 class="news-title mb-4">{{ $new->title }}</h3>
<div class="news-body-small"> {!! $new->body !!}</div>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{$new->created_at}}</span>
<a name="news" id="news" class="btn btn-block btn-secondary mt-2" href="/news/{{$new->id}}" role="button">Voir plus!</a>
<div class="news-tags">
@if($new->tags != [])
@foreach($new->tags as $tag)
@if($tag == "Important")
<span class="badge badge-pill badge-danger">{{$tag}}</span>
@else
<span class="badge badge-pill badge-default">{{$tag}}</span>
@endif
@endforeach
@endif
</div>
<a name="news" id="news" class="btn btn-block btn-secondary mt-2"
@if(isset($new->event_id))
href="/news/{{$new->event_id}}?type=msg" role="button">Voir plus!
@else
href="/news/{{$new->id}}" role="button">Voir plus!
@endif
</a>
</div>
@endforeach
</div>

View File

@@ -1,7 +1,7 @@
@extends('layouts.public.main')
@section('content')
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="page-header header-filter clear-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">
@@ -22,12 +22,29 @@
<div class="row">
@foreach ($news as $new)
<div class="col-md-4">
<h3>{{ $new->title }}</h3>
<h3 class="news-title" >{{ $new->title }}</h3>
<div class="news-body-small">
{!! $new->body !!}
</div>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span>
<a name="news" id="news" class="btn btn-block btn-secondary mt-2" href="/news/{{ $new->id }}" role="button">Voir plus!</a>
<div class="news-tags">
@if($new->tags != [])
@foreach($new->tags as $tag)
@if($tag == "Important")
<span class="badge badge-pill badge-danger">{{$tag}}</span>
@else
<span class="badge badge-pill badge-default">{{$tag}}</span>
@endif
@endforeach
@endif
</div>
<a name="news" id="news" class="btn btn-block btn-secondary mt-2" role="button"
@if(isset($new->event_id))
href="/news/{{$new->event_id}}?type=msg" role="button">Voir plus!
@else
href="/news/{{$new->id}}" role="button">Voir plus!
@endif
</a>
</div>
@endforeach
</div>

View File

@@ -1,12 +1,12 @@
@extends('layouts.public.main')
@section('content')
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="page-header header-filter clear-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h2>{{ $new->title }}</h2>
<h2 class="news-title">{{ $new->title }}</h2>
</div>
</div>
</div>
@@ -30,6 +30,17 @@
{!! $new->body !!}
</p>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span>
<div class="news-tags">
@if($new->tags != [])
@foreach($new->tags as $tag)
@if($tag == "Important")
<span class="badge badge-pill badge-danger">{{$tag}}</span>
@else
<span class="badge badge-pill badge-default">{{$tag}}</span>
@endif
@endforeach
@endif
</div>
</div>
</div>
<a href="{{ url()->previous() }}" class="btn button primary">Retour</a>