Merge branch 'develop' into feature/add-frontend-server-configuration

This commit is contained in:
Dane Everitt 2017-10-20 19:12:08 -05:00
commit 5a3428f0a0
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 16 additions and 0 deletions

View file

@ -4,3 +4,11 @@ If you're just making a suggestion, be descriptive, and link to any issues that
You can delete from this line up.
---------------------
* Panel or Daemon:
* Version of Panel/Daemon:
* Server's OS:
* Your Computer's OS & Browser:
## Add Details Below:

View file

@ -25,5 +25,6 @@ return [
'startup_parameters' => 'Startup Parameters',
'databases' => 'Databases',
'edit_file' => 'Edit File',
'admin' => 'Manage',
],
];

View file

@ -192,6 +192,13 @@
</ul>
</li>
@endif
@if(Auth::user()->root_admin)
<li>
<a href="{{ route('admin.servers.view', $server->id) }}">
<i class="fa fa-cog"></i> <span>@lang('navigation.server.admin')</span>
</a>
</li>
@endif
@endif
</ul>
</section>