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

Merge branch 'develop' into feature/customized-theme

Browse source
This commit is contained in:
Jakob Schrettenbrunner 2017-09-05 01:47:43 +02:00
commit 2ac1e08f47
16 changed files with 524 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/exceptions.php
View file

@ -55,6 +55,7 @@ return [
'invalid_archive_exception' => 'The pack archive provided appears to be missing a required archive.tar.gz or import.json file in the base directory.',
],
'subusers' => [
'editing_self' => 'Editing your own subuser account is not permitted.',
'user_is_owner' => 'You cannot add the server owner as a subuser for this server.',
'subuser_exists' => 'A user with that email address is already assigned as a subuser for this server.',
],

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

@ -44,6 +44,8 @@ return [
'list' => 'Accounts with Access',
'add' => 'Add New Subuser',
'update' => 'Update Subuser',
'user_assigned' => 'Successfully assigned a new subuser to this server.',
'user_updated' => 'Successfully updated permissions.',
'edit' => [
'header' => 'Edit Subuser',
'header_sub' => 'Modify user\'s access to server.',

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

@ -77,7 +77,7 @@
{{--<li>--}}
{{--<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server"></i></a>--}}
{{--</li>--}}
@if(Auth::user()->isRootAdmin())
@if(Auth::user()->root_admin)
<li>
<li><a href="{{ route('admin.index') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.admin_cp') }}"><i class="fa fa-gears"></i></a></li>
</li>

2
resources/themes/pterodactyl/server/users/new.blade.php
View file

@ -44,7 +44,7 @@
<label class="control-label">@lang('server.users.new.email')</label>
<div>
{!! csrf_field() !!}
<input type="email" class="form-control" name="email" />
<input type="email" class="form-control" name="email" value="{{ old('email') }}" />
<p class="text-muted small">@lang('server.users.new.email_help')</p>
</div>
</div>

1
resources/themes/pterodactyl/server/users/view.blade.php
View file

@ -55,6 +55,7 @@
<a id="selectAllCheckboxes" class="btn btn-sm btn-default">@lang('strings.select_all')</a>
<a id="unselectAllCheckboxes" class="btn btn-sm btn-default">@lang('strings.select_none')</a>
</div>
{!! method_field('PATCH') !!}
<input type="submit" name="submit" value="@lang('server.users.update')" class="pull-right btn btn-sm btn-primary" />
</div>
@endcan