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.0' into 'dev'

Browse Source 
Disable unfinish Feature

See merge request TheGamecraft/c-cms!38
This commit is contained in:
Mathieu Lagace
2019-08-21 17:48:08 +00:00
parent 1b4eecb54d bfdfcb87cf
commit 9a32aa1730
12 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PublicController.php
View File

@@ -78,7 +78,7 @@ class PublicController extends Controller
$config->save();
return redirect('/');;
return redirect('/?editMode');;
}
/**

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

@@ -93,11 +93,11 @@
<div class="card">
<div class="card-body">
<a name="changepsw" id="changepsw" class="btn btn-warning btn-block" href="/admin/profil/password" role="button">Modifier mon mot de passe</a>
<a name="changepsw" id="changepsw" class="btn btn-secondary btn-block" href="/admin/profil/avatar" role="button">Modifier ma photo de profil</a>
<a name="changepsw" id="changepsw" class="btn btn-secondary btn-block" href="/admin/profil/phone" role="button">Modifier mon numéro de téléphone</a>
<a name="changepsw" id="changepsw" class="btn btn-secondary btn-block" href="/admin/profil/adress" role="button">Modifier mon adresse</a>
<a name="changepsw" id="changepsw" class="btn btn-primary btn-block" href="/admin/profil/preference" role="button">Modifier mes préférences</a>
<a name="changepsw" id="changepsw" class="btn btn-danger btn-block" href="/logout" role="button">Déconnexion</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>
<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>
</div>
</div>

3
resources/views/layouts/admin/sidebar.blade.php
View File

@@ -69,6 +69,7 @@
<p> Horaire</p>
</a>
</li>
<!--
<li class="nav-item ">
<a class="nav-link" data-toggle="collapse" href="#inventory">
<i class="material-icons">shopping_basket</i>
@@ -98,7 +99,7 @@
</li>
</ul>
</div>
</li>
</li>-->
<li class="nav-item ">
<a class="nav-link" data-toggle="collapse" href="#stats">
<i class="material-icons">timeline</i>

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

@@ -13,7 +13,7 @@
<div class="col-md-6">
<div class="btn-group">
<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>
<a disabled 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>
<button disabled 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></button>
<button class="btn btn-danger" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button>
</div>
</div>

2
resources/views/layouts/public/banner.blade.php
View File

@@ -19,7 +19,7 @@
<div class="m-5">
<h4 class="m-md-5">
{{ App\Config::getData('text_public_banner_cadet_desc') }}
<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_cadet_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_cadet_desc"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif
</h4>
</div>
</div>

5
resources/views/layouts/public/calendar.blade.php
View File

@@ -1,9 +1,8 @@
<div class="inner">
<div class="title text-center">
<h1>{{ App\Config::getData('text_public_schedule_title')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_schedule_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></h1>
<p>{{ App\Config::getData('text_public_schedule_desc')}} <a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_schedule_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></p>
<h1>{{ App\Config::getData('text_public_schedule_title')}}@if(request()->has('editMode')) <a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_schedule_title"><i class="fa fa-pencil" aria-hidden="true"></i></a> @endif</h1>
<p>{{ App\Config::getData('text_public_schedule_desc')}} @if(request()->has('editMode')) <a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_schedule_desc"><i class="fa fa-pencil" aria-hidden="true"></i></a> @endif</p>
</div>
<hr class="mx-5">
<div id="public_calendar"></div>
<script src="/assets/js/calendar/calendar.js"></script>
</div>

8
resources/views/layouts/public/footer.blade.php
View File

@@ -1,10 +1,10 @@
<nav class="float-left">
<ul>
<li>
<li><a href="{{ App\Config::getData('media_twitter')}}" class="icon"><i class="fab fa-twitter mr-2"></i><span class="label">Twitter</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_twitter" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
<li><a href="{{ App\Config::getData('media_facebook')}}" class="icon"><i class="fab fa-facebook mr-2"></i><span class="label">Facebook</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_facebook" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
<li><a href="{{ App\Config::getData('media_instagram')}}" class="icon"><i class="fab fa-instagram mr-2"></i><span class="label">Instagram</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_instagram" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
<li><a href="mailto:{{ App\Config::getData('media_email')}}" class="icon"><i class="fas fa-envelope mr-2"></i><span class="label">Email</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_email" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
<li><a href="{{ App\Config::getData('media_twitter')}}" class="icon"><i class="fab fa-twitter mr-2"></i><span class="label">Twitter</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_twitter"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
<li><a href="{{ App\Config::getData('media_facebook')}}" class="icon"><i class="fab fa-facebook mr-2"></i><span class="label">Facebook</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_facebook"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
<li><a href="{{ App\Config::getData('media_instagram')}}" class="icon"><i class="fab fa-instagram mr-2"></i><span class="label">Instagram</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_instagram"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
<li><a href="mailto:{{ App\Config::getData('media_email')}}" class="icon"><i class="fas fa-envelope mr-2"></i><span class="label">Email</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_email"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
</li>
</ul>
</nav>

15
resources/views/layouts/public/header.blade.php
View File

@@ -49,11 +49,26 @@
</a>
</div>
</li>
@if(\Auth::check())
<li class="nav-item">
<a class="nav-link" href="/login">
<i class="material-icons">dashboard</i> Dashboard
</a>
</li>
@else
<li class="nav-item">
<a class="nav-link" href="/login">
<i class="material-icons">lock_open</i> Connexion
</a>
</li>
@endif
@if(request()->has('editMode'))
<li class="nav-item">
<a class="nav-link btn btn-warning" href="/">
<i class="material-icons">cancel</i> Quitter le mode edition
</a>
</li>
@endif
</ul>
</div>
</div>

4
resources/views/layouts/public/introduction.blade.php
View File

@@ -1,6 +1,6 @@
<div class="title">
<h1 class="title">
{{ App\Config::getData('text_public_intro_title')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_intro_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
{{ App\Config::getData('text_public_intro_title')}}@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_intro_title" ><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif
</h1>
<p>{{ App\Config::getData('text_public_intro_desc')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_intro_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></p>
<p>{{ App\Config::getData('text_public_intro_desc')}}@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_intro_desc" ><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</p>
</div>

6
resources/views/layouts/public/news.blade.php
View File

@@ -1,6 +1,6 @@
<div class="title">
<h1>{{ App\Config::getData('text_public_news_title')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_news_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></h1>
<p>{{ App\Config::getData('text_public_news_desc')}} <a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_news_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></p>
<h1>{{ App\Config::getData('text_public_news_title')}}@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_news_title" ><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</h1>
<p>{{ App\Config::getData('text_public_news_desc')}} @if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_news_desc" ><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</p>
</div>
<hr class="mx-5">
@if ($news->isEmpty())
@@ -17,5 +17,5 @@
@endforeach
</div>
<div class="align-center m-5">
<a name="news-all" id="news-all" class="btn btn-primary btn-block p-2 text-uppercase" href="/news" role="button">{{ App\Config::getData('text_public_news_button')}}</a><a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_news_button" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
<a name="news-all" id="news-all" class="btn btn-primary btn-block p-2 text-uppercase" href="/news" role="button">{{ App\Config::getData('text_public_news_button')}}</a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_news_button"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif
</div>

4
resources/views/layouts/public/picture.blade.php
View File

@@ -1,6 +1,6 @@
<div class="title">
<h1>{{ App\Config::getData('text_public_picture_title')}}</h1><a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_picture_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
<p>{{ App\Config::getData('text_public_picture_desc')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_picture_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></p>
<h1>{{ App\Config::getData('text_public_picture_title')}}</h1>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_picture_title"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif
<p>{{ App\Config::getData('text_public_picture_desc')}}@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_picture_desc"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</p>
</div>
<hr>
@if ($pictures->isEmpty())

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

@@ -14,9 +14,11 @@
<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 class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_apprendre_plus" style="top: 30vh;left: 8vw;display:none">
@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>
</a>
@endif
</div>
<div class="container">
<!-- Introduction -->
@@ -52,7 +54,7 @@
<!-- CTA -->
<div class="section text-center" id="cta">
<h2>{{ App\Config::getData('text_public_cta')}}<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></h2>
<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>
</div>
</div>