StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove suspended & installing fields, replace with single status field

Browse source
This commit is contained in:
Dane Everitt 2021-01-17 15:51:56 -08:00
parent 4c29be2e54
commit a75a347d65
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 115 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/views/admin/servers/index.blade.php
View file

@ -57,9 +57,9 @@
<code>{{ $server->allocation->alias }}:{{ $server->allocation->port }}</code>
</td>
<td class="text-center">
@if($server->suspended)
@if($server->isSuspended())
<span class="label bg-maroon">Suspended</span>
@elseif(! $server->installed)
@elseif(! $server->isInstalled())
<span class="label label-warning">Installing</span>
@else
<span class="label label-success">Active</span>

2
resources/views/admin/servers/partials/navigation.blade.php
View file

@ -8,7 +8,7 @@
<ul class="nav nav-tabs">
<li class="{{ $router->currentRouteNamed('admin.servers.view') ? 'active' : '' }}">
<a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
@if($server->installed === 1)
@if($server->isInstalled())
<li class="{{ $router->currentRouteNamed('admin.servers.view.details') ? 'active' : '' }}">
<a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a>
</li>

8
resources/views/admin/servers/view/index.blade.php
View file

@ -133,7 +133,7 @@
<div class="box box-primary">
<div class="box-body" style="padding-bottom: 0px;">
<div class="row">
@if($server->suspended)
@if($server->isSuspended())
<div class="col-sm-12">
<div class="small-box bg-yellow">
<div class="inner">
@ -142,11 +142,11 @@
</div>
</div>
@endif
@if($server->installed !== 1)
@if(!$server->isInstalled())
<div class="col-sm-12">
<div class="small-box {{ (! $server->installed) ? 'bg-blue' : 'bg-maroon' }}">
<div class="small-box {{ (! $server->isInstalled()) ? 'bg-blue' : 'bg-maroon' }}">
<div class="inner">
<h3 class="no-margin">{{ (! $server->installed) ? 'Installing' : 'Install Failed' }}</h3>
<h3 class="no-margin">{{ (! $server->isInstalled()) ? 'Installing' : 'Install Failed' }}</h3>
</div>
</div>
</div>

4
resources/views/admin/servers/view/manage.blade.php
View file

@ -31,7 +31,7 @@
<p>This will reinstall the server with the assigned service scripts. <strong>Danger!</strong> This could overwrite server data.</p>
</div>
<div class="box-footer">
@if($server->installed === 1)
@if($server->isInstalled())
<form action="{{ route('admin.servers.view.manage.reinstall', $server->id) }}" method="POST">
{!! csrf_field() !!}
<button type="submit" class="btn btn-danger">Reinstall Server</button>
@ -59,7 +59,7 @@
</div>
</div>
@if(! $server->suspended)
@if(! $server->isSuspended())
<div class="col-sm-4">
<div class="box box-warning">
<div class="box-header with-border">