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

Final adjustments to Daemon <-> Panel communication change

Browse source
This commit is contained in:
Dane Everitt 2017-09-24 21:12:30 -05:00
parent 8e2b77dc1e
commit 7d1c233c49
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
32 changed files with 528 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/en/command/messages.php
View file

@ -98,9 +98,9 @@ return [
'using_redis' => 'You\'ve selected the Redis driver for one or more options, please provide valid connection information below. In most cases you can use the defaults provided unless you have modified your setup.',
'redis_host' => 'Redis Host',
'redis_password' => 'Redis Password',
'redis_pass_help' => 'By default a Redis server instance has no password as it is running locally and inaccessable to the outside world. If this is the case, simply hit enter without entering a value.',
'redis_port' => 'Redis Port',
'redis_pass_defined' => 'It seems a password is already defined for Redis, would you like to change it?',
'redis_pass_help' => 'By default a Redis server instance has no password as it is running locally and inaccessable to the outside world. If this is the case, simply hit enter without entering a value.',
],
],
];

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

@ -72,7 +72,7 @@
<td class="text-center">
@if($server->user->id === Auth::user()->id)
<span class="label bg-purple">@lang('strings.owner')</span>
@elseif(Auth::user()->isRootAdmin())
@elseif(Auth::user()->root_admin)
<span class="label bg-maroon">@lang('strings.admin')</span>
@else
<span class="label bg-blue">@lang('strings.subuser')</span>

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

@ -192,7 +192,7 @@
{!! Theme::js('js/admin/functions.js') !!}
{!! Theme::js('js/autocomplete.js') !!}
@if(Auth::user()->isRootAdmin())
@if(Auth::user()->root_admin)
<script>
$('#logoutButton').on('click', function (event) {
event.preventDefault();

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

@ -285,7 +285,7 @@
{!! Theme::js('vendor/phraseapp/phraseapp.js') !!}
@endif
@if(Auth::user()->isRootAdmin())
@if(Auth::user()->root_admin)
<script>
$('#logoutButton').on('click', function (event) {
event.preventDefault();