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

Merge branch 'develop' into feature/PTDL-472

Browse source
This commit is contained in:
Dane Everitt 2017-06-25 15:36:39 -05:00
commit b7b046c044
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 672 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/en/base.php
View file

@ -15,7 +15,7 @@ return [
],
'installing' => [
'header' => 'Server Installing',
'desc' => 'The requested server is still completing the install process. Please check back in a few minutes, you should recieve an email as soon as this process is completed.',
'desc' => 'The requested server is still completing the install process. Please check back in a few minutes, you should receive an email as soon as this process is completed.',
],
'suspended' => [
'header' => 'Server Suspended',

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

@ -62,13 +62,13 @@
<p>This will reinstall the server with the assigned pack and service scripts. <strong>Danger!</strong> This could overwrite server data.</p>
</div>
<div class="box-footer">
@if($server->installed)
@if($server->installed === 1)
<form action="{{ route('admin.servers.view.manage.reinstall', $server->id) }}" method="POST">
{!! csrf_field() !!}
<button type="submit" class="btn btn-danger">Reinstall Server</button>
</form>
@else
<button class="btn btn-danger disabled">Reinstall Server</button>
<button class="btn btn-danger disabled">Server Must Install Properly to Reinstall</button>
@endif
</div>
</div>

13
resources/themes/pterodactyl/layouts/admin.blade.php
View file

@ -79,7 +79,7 @@
<li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server"></i></a></li>
</li>
<li>
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off"></i></a></li>
<li><a href="{{ route('auth.logout') }}" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off"></i></a></li>
</li>
</ul>
</div>
@ -191,6 +191,17 @@
{!! Theme::js('vendor/select2/select2.full.min.js') !!}
{!! Theme::js('js/admin/functions.js') !!}
{!! Theme::js('js/autocomplete.js') !!}
@if(Auth::user()->isRootAdmin())
<script>
$('#logoutButton').on('click', function (event) {
event.preventDefault();
if (confirm('Are you sure you want to logout?')) {
window.location = $(this).attr('href');
}
});
</script>
@endif
@show
</body>
</html>

13
resources/themes/pterodactyl/layouts/master.blade.php
View file

@ -83,7 +83,7 @@
</li>
@endif
<li>
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.logout') }}"><i class="fa fa-power-off"></i></a></li>
<li><a href="{{ route('auth.logout') }}" id="logoutButton" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.logout') }}"><i class="fa fa-power-off"></i></a></li>
</li>
</ul>
</div>
@ -283,6 +283,17 @@
@if(config('pterodactyl.lang.in_context'))
{!! Theme::js('vendor/phraseapp/phraseapp.js') !!}
@endif
@if(Auth::user()->isRootAdmin())
<script>
$('#logoutButton').on('click', function (event) {
event.preventDefault();
if (confirm('Are you sure you want to logout?')) {
window.location = $(this).attr('href');
}
});
</script>
@endif
@show
</body>
</html>

20
resources/themes/pterodactyl/server/settings/startup.blade.php
View file

@ -59,31 +59,31 @@
<div class="col-xs-12 col-md-4 col-sm-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ $v->variable->name }}</h3>
<h3 class="box-title">{{ $v->name }}</h3>
</div>
<div class="box-body">
<input
@if($v->user_can_edit)
name="env_{{ $v->variable->id }}"
@if($v->user_editable)
name="env_{{ $v->id }}"
@else
readonly
@endif
class="form-control" type="text" value="{{ old('env_' . $v->id, $v->variable_value) }}" />
<p class="small text-muted">{{ $v->variable->description }}</p>
class="form-control" type="text" value="{{ old('env_' . $v->id, $v->server_set_value) }}" />
<p class="small text-muted">{{ $v->description }}</p>
<p class="no-margin">
@if($v->required && $v->user_can_edit)
@if($v->required && $v->user_editable )
<span class="label label-danger">@lang('strings.required')</span>
@elseif(! $v->required && $v->user_can_edit)
@elseif(! $v->required && $v->user_editable)
<span class="label label-default">@lang('strings.optional')</span>
@endif
@if(! $v->user_can_edit)
@if(! $v->user_editable)
<span class="label label-warning">@lang('strings.read_only')</span>
@endif
</p>
</div>
<div class="box-footer">
<p class="no-margin text-muted small"><strong>@lang('server.config.startup.startup_var'):</strong> <code>{{ $v->variable->env_variable }}</code></p>
<p class="no-margin text-muted small"><strong>@lang('server.config.startup.startup_regex'):</strong> <code>{{ $v->variable->rules }}</code></p>
<p class="no-margin text-muted small"><strong>@lang('server.config.startup.startup_var'):</strong> <code>{{ $v->env_variable }}</code></p>
<p class="no-margin text-muted small"><strong>@lang('server.config.startup.startup_regex'):</strong> <code>{{ $v->rules }}</code></p>
</div>
</div>
</div>