Skip to content

Commit 5a3428f

Browse files
committed
Merge branch 'develop' into feature/add-frontend-server-configuration
2 parents f98eb59 + b1fae66 commit 5a3428f

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ If you're just making a suggestion, be descriptive, and link to any issues that
44

55
You can delete from this line up.
66
---------------------
7+
8+
* Panel or Daemon:
9+
* Version of Panel/Daemon:
10+
* Server's OS:
11+
* Your Computer's OS & Browser:
12+
13+
## Add Details Below:
14+

resources/lang/en/navigation.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
'startup_parameters' => 'Startup Parameters',
2626
'databases' => 'Databases',
2727
'edit_file' => 'Edit File',
28+
'admin' => 'Manage',
2829
],
2930
];

resources/themes/pterodactyl/layouts/master.blade.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@ class="active"
192192
</ul>
193193
</li>
194194
@endif
195+
@if(Auth::user()->root_admin)
196+
<li>
197+
<a href="{{ route('admin.servers.view', $server->id) }}">
198+
<i class="fa fa-cog"></i> <span>@lang('navigation.server.admin')</span>
199+
</a>
200+
</li>
201+
@endif
195202
@endif
196203
</ul>
197204
</section>

0 commit comments

Comments
 (0)