From 95f574ec674b7d4c85c62182ff8291025600a15e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 20 Jan 2017 23:48:12 -0500
Subject: [PATCH] Sidebar and API View tweaks

---
 resources/lang/en/base.php                    |   6 +-
 .../themes/pterodactyl/base/api/new.blade.php | 124 +++++++++---------
 .../pterodactyl/layouts/master.blade.php      |   8 +-
 3 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/resources/lang/en/base.php b/resources/lang/en/base.php
index fc1d3e8c..392a23d1 100644
--- a/resources/lang/en/base.php
+++ b/resources/lang/en/base.php
@@ -24,7 +24,7 @@ return [
             'header' => 'API Access',
             'header_sub' => 'Manage your API access keys.',
             'list' => 'API Keys',
-            'create_new' => 'Create new API key',
+            'create_new' => 'Create New API key',
         ],
         'new' => [
             'header' => 'New API Key',
@@ -32,7 +32,7 @@ return [
             'form_title' => 'Details',
             'descriptive_memo' => [
                 'title' => 'Descriptive Memo',
-                'description' => 'Enter a breif description of what this API key will be used for.'
+                'description' => 'Enter a brief description of what this API key will be used for.'
             ],
             'allowed_ips' => [
                 'title' => 'Allowed IPs',
@@ -103,7 +103,7 @@ return [
                 ],
                 'view' => [
                     'title' => 'Show Single Server',
-                    'description' => 'Allows viewing details about a specific server including the daemon_token as current process information.',
+                    'description' => 'Allows viewing details about a specific server including the daemon_token as well as current process information.',
                 ],
                 'list' => [
                     'title' => 'List Servers',
diff --git a/resources/themes/pterodactyl/base/api/new.blade.php b/resources/themes/pterodactyl/base/api/new.blade.php
index 9afe90bd..8030d671 100644
--- a/resources/themes/pterodactyl/base/api/new.blade.php
+++ b/resources/themes/pterodactyl/base/api/new.blade.php
@@ -89,14 +89,14 @@
                     <div class="box-title">@lang('base.api.new.base.title')</div>
                 </div>
                 <div class="box-body">
-                    <div class="checkbox highlight">
+                    <div class="checkbox">
                         <label>
                             <input name="permissions[]" type="checkbox" value="user:*">
                             <span class="label label-default">GET</span>
                             <strong>@lang('base.api.new.base.information.title')</strong>
-                            <p class="help-block"><small>
+                            <p class="text-muted small">
                                 @lang('base.api.new.base.information.description')
-                            </small><p>
+                            </p>
                         </label>
                     </div>
                 </div>
@@ -107,54 +107,54 @@
                         <div class="box-title">@lang('base.api.new.user_management.title')</div>
                     </div>
                     <div class="box-body">
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:users.list">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.user_management.list.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.user_management.list.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:users.create">
                                 <span class="label label-default">POST</span>
                                 <strong>@lang('base.api.new.user_management.create.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.user_management.create.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:users.view">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.user_management.view.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.user_management.view.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:users.update">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.user_management.update.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.user_management.update.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:users.delete">
                                 <span class="label label-danger">DELETE</span>
                                 <strong>@lang('base.api.new.user_management.delete.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.user_management.delete.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                     </div>
@@ -164,54 +164,54 @@
                         <div class="box-title">@lang('base.api.new.node_management.title')</div>
                     </div>
                     <div class="box-body">
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:nodes.list">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.node_management.list.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.node_management.list.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:nodes.create">
                                 <span class="label label-default">POST</span>
                                 <strong>@lang('base.api.new.node_management.create.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.node_management.create.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:nodes.view">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.node_management.view.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.node_management.view.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:nodes.allocations">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.node_management.allocations.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.node_management.allocations.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:nodes.delete">
                                 <span class="label label-danger">DELETE</span>
                                 <strong>@lang('base.api.new.node_management.delete.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.node_management.delete.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                     </div>
@@ -229,9 +229,9 @@
                             <input name="permissions[]" type="checkbox" value="user:server">
                             <span class="label label-default">GET</span>
                             <strong>@lang('base.api.new.server_management.server.title')</strong>
-                            <p class="help-block"><small>
+                            <p class="text-muted small">
                                 @lang('base.api.new.server_management.server.description')
-                            </small><p>
+                            </p>
                         </label>
                     </div>
                     <div class="checkbox">
@@ -239,9 +239,9 @@
                             <input name="permissions[]" type="checkbox" value="user:server.power">
                             <span class="label label-default">GET</span>
                             <strong>@lang('base.api.new.server_management.power.title')</strong>
-                            <p class="help-block"><small>
+                            <p class="text-muted small">
                                 @lang('base.api.new.server_management.power.description')
-                            </small><p>
+                            </p>
                         </label>
                     </div>
                     @if(Auth::user()->isRootAdmin())
@@ -250,10 +250,10 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.view">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.server_management.view.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     <span class="label label-danger">@lang('strings.danger')</span>
                                     @lang('base.api.new.server_management.view.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -261,9 +261,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.list">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.server_management.list.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.list.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -271,9 +271,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.create">
                                 <span class="label label-default">POST</span>
                                 <strong>@lang('base.api.new.server_management.create.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.create.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -281,9 +281,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.config">
                                 <span class="label label-default">PATCH</span>
                                 <strong>@lang('base.api.new.server_management.config.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.config.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -291,9 +291,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.build">
                                 <span class="label label-default">PATCH</span>
                                 <strong>@lang('base.api.new.server_management.build.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.build.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -301,9 +301,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.suspend">
                                 <span class="label label-default">POST</span>
                                 <strong>@lang('base.api.new.server_management.suspend.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.suspend.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -311,9 +311,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.unsuspend">
                                 <span class="label label-default">POST</span>
                                 <strong>@lang('base.api.new.server_management.unsuspend.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.unsuspend.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                         <div class="checkbox">
@@ -321,9 +321,9 @@
                                 <input name="adminPermissions[]" type="checkbox" value="admin:servers.delete">
                                 <span class="label label-danger">DELETE</span>
                                 <strong>@lang('base.api.new.server_management.delete.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     @lang('base.api.new.server_management.delete.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                     @endif
@@ -335,26 +335,26 @@
                         <div class="box-title">@lang('base.api.new.service_management.title')</div>
                     </div>
                     <div class="box-body">
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:services.list">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.service_management.list.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     <span class="label label-danger">@lang('strings.danger')</span>
                                     @lang('base.api.new.service_management.list.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:services.view">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.service_management.view.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     <span class="label label-danger">@lang('strings.danger')</span>
                                     @lang('base.api.new.service_management.view.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                     </div>
@@ -364,15 +364,15 @@
                         <div class="box-title">@lang('base.api.new.location_management.title')</div>
                     </div>
                     <div class="box-body">
-                        <div class="checkbox highlight">
+                        <div class="checkbox">
                             <label>
                                 <input name="adminPermissions[]" type="checkbox" value="admin:locations.list">
                                 <span class="label label-default">GET</span>
                                 <strong>@lang('base.api.new.location_management.list.title')</strong>
-                                <p class="help-block"><small>
+                                <p class="text-muted small">
                                     <span class="label label-danger">@lang('strings.danger')</span>
                                     @lang('base.api.new.location_management.list.description')
-                                </small><p>
+                                </p>
                             </label>
                         </div>
                     </div>
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 8399d0bc..260a1a6a 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -123,7 +123,7 @@
                                 <i class="fa fa-lock"></i> <span>@lang('navigation.account.security_controls')</span>
                             </a>
                         </li>
-                        <li class="{{ Route::currentRouteName() !== 'account.api' ?: 'active' }}">
+                        <li class="{{ (Route::currentRouteName() !== 'account.api' && Route::currentRouteName() !== 'account.api.new') ?: 'active' }}">
                             <a href="{{ route('account.api')}}">
                                 <i class="fa fa-code"></i> <span>@lang('navigation.account.api_access')</span>
                             </a>
@@ -157,7 +157,11 @@
                                     <li class="{{ Route::currentRouteName() !== 'server.files.add' ?: 'active' }}"><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.create_file')</a></li>
                                 </ul>
                             </li>
-                            <li>
+                            <li
+                                @if(in_array(Route::currentRouteName(), ['server.subusers', 'server.subusers.new', 'server.subusers.view']))
+                                    class="active"
+                                @endif
+                            >
                                 <a href="{{ route('server.subusers', $server->uuidShort)}}">
                                     <i class="fa fa-users"></i> <span>Subusers</span>
                                 </a>