ALPHA 3.0.5

This commit is contained in:
TheGamecraft
2018-09-21 14:31:00 -04:00
parent 252ff658e0
commit 3b593297cd
33 changed files with 559 additions and 98 deletions

View File

@@ -0,0 +1,23 @@
<div class="row">
<div class="col-md-12">
@php
$configs = \App\Config::all();
@endphp
@if ($configs->where('name','is_schedule_public')->first()->state == 0)
@if (\Auth::User()->getPerm('schedule_edit'))
<div class="alert alert-danger" role="alert">
Attention ! L'horaire n'est présentement pas visible par le publique ! <a href="/admin/config#schedule_public">Cliquer ici pour accéder aux options</a>
</div>
@endif
@endif
@if ($configs->where('name','is_schedule_build')->first()->state == 0)
@if (\Auth::User()->getPerm('schedule_edit'))
<div class="alert alert-primary" role="alert">
Attention ! L'horaire n'est pas marqué comme complet, les utilisateurs ne receverons pas de notification concernant l'horaire <a href="/admin/config#schedule_build">Cliquer ici pour accéder aux options</a>
</div>
@endif
@endif
</div>
</div>

View File

@@ -55,8 +55,8 @@ foreach (Auth::user()->unreadNotifications as $notification) {
</a>
<div class="user-menu dropdown-menu">
<a class="nav-link" href="/admin/profil"><i class="fa fa-user"></i> {{ trans('admin/header.profil')}}</a>
<a class="nav-link" href="/admin/settings"><i class="fa fa-cog"></i> {{ trans('admin/header.settings')}}</a>
<!--<a class="nav-link" href="/admin/profil"><i class="fa fa-user"></i> {{ trans('admin/header.profil')}}</a>
<a class="nav-link" href="/admin/settings"><i class="fa fa-cog"></i> {{ trans('admin/header.settings')}}</a>-->
<a class="nav-link" href="/logout"><i class="fa fa-power-off"></i> {{ trans('admin/header.logout')}}</a>
</div>
</div>

View File

@@ -30,6 +30,8 @@ use App\Notifications\Alert;
<!-- Yield Content -->
@include('layouts.admin.alert')
@yield('content')
</div>

View File

@@ -71,7 +71,7 @@
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-plus"></i><a href="/admin/user/add">Ajouter un utilisateur</a></li>
<li><i class="menu-icon fa fa-list"></i><a href="/admin/user">Liste des utilisateurs</a></li>
<li><i class="menu-icon fa fa-user-secret"></i><a href="/admin/log">Activitées des utilisateurs</a></li>
<!--<li><i class="menu-icon fa fa-user-secret"></i><a href="/admin/log">Activitées des utilisateurs</a></li>-->
</ul>
</li>
@@ -79,9 +79,9 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-cogs"></i>Configuration</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-cog"></i><a href="/admin/config">Général</a></li>
<li><i class="menu-icon fa fa-building"></i><a href="/admin/config/local">Locaux</a></li>
<!--<li><i class="menu-icon fa fa-building"></i><a href="/admin/config/local">Locaux</a></li>
<li><i class="menu-icon fa fa-briefcase"></i><a href="/admin/config/job">Poste</a></li>
<!--<li><i class="menu-icon fa fa-address-card"></i><a href="/admin/config/rank">Grade</a></li>-->
<li><i class="menu-icon fa fa-address-card"></i><a href="/admin/config/rank">Grade</a></li>-->
</ul>
</li>
<h3 class="menu-title">{{ trans('admin/sidebar.tools_title') }}</h3>

View File

@@ -16,17 +16,38 @@
<!-- Fonts -->
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
<style>
.fa-beat {
margin-left:10px;
animation:fa-beat 2s ease infinite;
}
@keyframes fa-beat {
25% {
transform:scale(1);
}
50% {
transform:scale(1.4);
}
}
</style>
</head>
<body style="background-color: #343a40 !important">
<div id="app">
<nav class="navbar navbar-expand-md navbar-light navbar-laravel">
<nav class="navbar navbar-expand-md navbar-light navbar-laravel" style="background-color:rgb(39, 44, 51)">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
<a class="navbar-brand" href="{{ url('/') }}" style="color:white">
{{ config('squadron.fullname') }}
</a>
<div class="float-right" style="color: white;"><a href="https://status.c-cms.cf/" style="color:white">Status
@if (getStatus())
<i class="fas fa-circle fa-beat" style="color: red;"></i></a></div>
@else
<i class="fas fa-circle" style="color: green;"></i></a></div>
@endif
</div>
</nav>