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

Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language

Browse source
This commit is contained in:
stanjg 2018-06-01 15:58:09 +02:00
commit 3bb9e5e8a8
199 changed files with 2390 additions and 1179 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/themes/pterodactyl/base/account.blade.php
View file

@ -64,7 +64,7 @@
<div class="box box-primary">
<form action="{{ route('account') }}" method="POST">
<div class="box-header with-border">
<h3 class="box-title">@lang('base.account.update_identitity')</h3>
<h3 class="box-title">@lang('base.account.update_identity')</h3>
</div>
<div class="box-body">
<div class="row">
@ -106,7 +106,7 @@
<div class="box-footer with-border">
{!! csrf_field() !!}
<input type="hidden" name="do_action" value="identity" />
<button type="submit" class="btn btn-sm btn-primary">@lang('base.account.update_identitity')</button>
<button type="submit" class="btn btn-sm btn-primary">@lang('base.account.update_identity')</button>
</div>
</form>
</div>

2
resources/themes/pterodactyl/base/api/index.blade.php
View file

@ -113,7 +113,7 @@
swal({
type: 'error',
title: 'Whoops!',
text: 'An error occured while attempting to revoke this key.'
text: 'An error occurred while attempting to revoke this key.'
});
});
});

12
resources/themes/pterodactyl/base/index.blade.php
View file

@ -64,9 +64,15 @@
<span class="label bg-blue">@lang('strings.subuser')</span>
@endif
</td>
<td class="text-center" data-action="status">
<span class="label label-default"><i class="fa fa-refresh fa-fw fa-spin"></i></span>
</td>
@if($server->node->maintenance_mode)
<td class="text-center">
<span class="label label-warning">@lang('strings.under_maintenance')</span>
</td>
@else
<td class="text-center" data-action="status">
<span class="label label-default"><i class="fa fa-refresh fa-fw fa-spin"></i></span>
</td>
@endif
</tr>
@if (! empty($server->description))
<tr class="server-description">