Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -6,8 +6,8 @@
|
||||
|
||||
<li class="d-inline-block">
|
||||
|
||||
<a class="mr-3" href="https://github.com/spacejewel-hosting/staffmanagement"><i class="fab fa-github"></i> Github</a>
|
||||
<a class="mr-3" href="https://github.com/spacejewel-hosting/staffmanagement/issues"><i class="fas fa-bug"></i> Issue Tracker</a>
|
||||
<a class="mr-3" href="https://code.spacejewel-hosting.com/spacejewelhosting/staffmanager"><i class="fas fa-code-branch"></i> Gitea</a>
|
||||
<a class="mr-3" href="https://code.spacejewel-hosting.com/spacejewelhosting/staffmanager/issues"><i class="fas fa-bug"></i> Issue Tracker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@@ -3,10 +3,10 @@
|
||||
|
||||
<!-- Copyright - DO NOT REMOVE WITHOUT PERMISSION -->
|
||||
<div class="footer-copyright text-center py-3">
|
||||
<a href="https://spacejewel-hosting.com/"> Spacejewel Hosting © 2019-2020 - {{__('messages.footer_copy')}}</a>
|
||||
<a href="{{ config('app.url') }}"> {{ config('app.name') }} © 2019-{{ now()->year }} - {{__('messages.footer_copy')}}</a>
|
||||
</div>
|
||||
<!-- Copyright -->
|
||||
<!-- Built by Miguel Nogueira -->
|
||||
<!-- GNU General Public License (https://www.gnu.org/licenses/gpl-3.0.en.html) Built by Miguel Nogueira -->
|
||||
|
||||
</footer>
|
||||
<!-- Footer -->
|
||||
|
@@ -5,7 +5,7 @@
|
||||
<head>
|
||||
|
||||
<meta charset="utf-8">
|
||||
<meta name="description" content="The Minecraft Staff Member Management Tool">
|
||||
<meta name="description" content="{{ config('app.name') }} Staff Member Management Tool">
|
||||
<meta name="author" content="Miguel Nogueira">
|
||||
<meta name="tags" content="minecraft, minecraft server staff, minecraft staff, minecraft servers">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
@@ -46,7 +46,7 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
I
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
@@ -124,7 +124,8 @@
|
||||
@if (Auth::user()->hasRole('admin'))
|
||||
|
||||
<a href="{{ route('registeredPlayerList') }}" class="small-box-footer">{{__('messages.open')}} <i class="fas fa-arrow-circle-right"></i></a>
|
||||
|
||||
@else
|
||||
<a class="small-box-footer"><i class="fas"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@@ -140,6 +141,12 @@
|
||||
<div class="icon">
|
||||
<i class="fas fa-user-slash"></i>
|
||||
</div>
|
||||
@if (Auth::user()->hasRole('admin'))
|
||||
|
||||
<a href="{{ route('allApplications') }}" class="small-box-footer">{{__('messages.open')}} <i class="fas fa-arrow-circle-right"></i></a>
|
||||
@else
|
||||
<a class="small-box-footer"><i class="fas"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<!-- ./col -->
|
||||
@@ -154,6 +161,12 @@
|
||||
<div class="icon">
|
||||
<i class="fas fa-plus"></i>
|
||||
</div>
|
||||
@if (Auth::user()->hasRole('admin'))
|
||||
|
||||
<a href="{{ route('allApplications') }}" class="small-box-footer">{{__('messages.open')}} <i class="fas fa-arrow-circle-right"></i></a>
|
||||
@else
|
||||
<a class="small-box-footer"><i class="fas"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<!-- ./col -->
|
||||
@@ -168,6 +181,7 @@
|
||||
<div class="icon">
|
||||
<i class="fas fa-vote-yea"></i>
|
||||
</div>
|
||||
<a class="small-box-footer"><i class="fas"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- ./col -->
|
||||
|
@@ -143,7 +143,7 @@
|
||||
|
||||
<div class="row mt-5 mb-5">
|
||||
|
||||
<div id="carouselControls" class="carousel slide" data-ride="carousel">
|
||||
<div id="carouselControls" class="carousel slide w-100" data-ride="carousel">
|
||||
<div class="carousel-inner">
|
||||
<div class="carousel-item active">
|
||||
<img class="d-block w-100" src="/slides/01.png"
|
||||
|
Reference in New Issue
Block a user