From a2473103721a65f066e877da2454f57edd4636b5 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 16 Dec 2019 21:14:27 -0800
Subject: [PATCH] Fix nav for servers

---
 .../servers/partials/navigation.blade.php     | 37 +++++++++++++++++++
 .../views/admin/servers/view/build.blade.php  | 19 +---------
 .../admin/servers/view/database.blade.php     | 19 +---------
 .../views/admin/servers/view/delete.blade.php | 19 +---------
 .../admin/servers/view/details.blade.php      | 19 +---------
 .../views/admin/servers/view/index.blade.php  | 19 +---------
 .../views/admin/servers/view/manage.blade.php | 19 +---------
 .../admin/servers/view/startup.blade.php      | 19 +---------
 8 files changed, 44 insertions(+), 126 deletions(-)
 create mode 100644 resources/views/admin/servers/partials/navigation.blade.php

diff --git a/resources/views/admin/servers/partials/navigation.blade.php b/resources/views/admin/servers/partials/navigation.blade.php
new file mode 100644
index 000000000..32316e611
--- /dev/null
+++ b/resources/views/admin/servers/partials/navigation.blade.php
@@ -0,0 +1,37 @@
+@php
+    /** @var \Pterodactyl\Models\Server $server */
+    $router = app('router');
+@endphp
+<div class="row">
+    <div class="col-xs-12">
+        <div class="nav-tabs-custom nav-tabs-floating">
+            <ul class="nav nav-tabs">
+                <li class="{{ $router->currentRouteNamed('admin.servers.view') ? 'active' : '' }}">
+                    <a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
+                @if($server->installed === 1)
+                    <li class="{{ $router->currentRouteNamed('admin.servers.view.details') ? 'active' : '' }}">
+                        <a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a>
+                    </li>
+                    <li class="{{ $router->currentRouteNamed('admin.servers.view.build') ? 'active' : '' }}">
+                        <a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a>
+                    </li>
+                    <li class="{{ $router->currentRouteNamed('admin.servers.view.startup') ? 'active' : '' }}">
+                        <a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a>
+                    </li>
+                    <li class="{{ $router->currentRouteNamed('admin.servers.view.database') ? 'active' : '' }}">
+                        <a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a>
+                    </li>
+                @endif
+                <li class="{{ $router->currentRouteNamed('admin.servers.view.manage') ? 'active' : '' }}">
+                    <a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a>
+                </li>
+                <li class="tab-danger {{ $router->currentRouteNamed('admin.servers.view.delete') ? 'active' : '' }}">
+                    <a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a>
+                </li>
+                <li class="tab-success">
+                    <a href="/server/{{ $server->uuidShort }}" target="_blank"><i class="fa fa-external-link"></i></a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/admin/servers/view/build.blade.php b/resources/views/admin/servers/view/build.blade.php
index dde0617d2..b28f324ba 100644
--- a/resources/views/admin/servers/view/build.blade.php
+++ b/resources/views/admin/servers/view/build.blade.php
@@ -20,24 +20,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li class="active"><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <div class="row">
     <form action="{{ route('admin.servers.view.build', $server->id) }}" method="POST">
         <div class="col-sm-5">
diff --git a/resources/views/admin/servers/view/database.blade.php b/resources/views/admin/servers/view/database.blade.php
index 962eafd0c..7798487c2 100644
--- a/resources/views/admin/servers/view/database.blade.php
+++ b/resources/views/admin/servers/view/database.blade.php
@@ -20,24 +20,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li class="active"><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <div class="row">
     <div class="col-sm-7">
         <div class="alert alert-info">
diff --git a/resources/views/admin/servers/view/delete.blade.php b/resources/views/admin/servers/view/delete.blade.php
index ec33ef037..bec32b954 100644
--- a/resources/views/admin/servers/view/delete.blade.php
+++ b/resources/views/admin/servers/view/delete.blade.php
@@ -20,24 +20,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger active"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <div class="row">
     <div class="col-md-6">
         <div class="box">
diff --git a/resources/views/admin/servers/view/details.blade.php b/resources/views/admin/servers/view/details.blade.php
index 21075377b..9d5cc3125 100644
--- a/resources/views/admin/servers/view/details.blade.php
+++ b/resources/views/admin/servers/view/details.blade.php
@@ -20,24 +20,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li class="active"><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <div class="row">
     <div class="col-xs-12">
         <div class="box box-primary">
diff --git a/resources/views/admin/servers/view/index.blade.php b/resources/views/admin/servers/view/index.blade.php
index 417a9e0b7..3d75d4f4d 100644
--- a/resources/views/admin/servers/view/index.blade.php
+++ b/resources/views/admin/servers/view/index.blade.php
@@ -19,24 +19,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li class="active"><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <div class="row">
     <div class="col-sm-8">
         <div class="row">
diff --git a/resources/views/admin/servers/view/manage.blade.php b/resources/views/admin/servers/view/manage.blade.php
index 57319b4e2..6980ad4c5 100644
--- a/resources/views/admin/servers/view/manage.blade.php
+++ b/resources/views/admin/servers/view/manage.blade.php
@@ -20,24 +20,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li class="active"><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <div class="row">
     <div class="col-sm-4">
         <div class="box box-primary">
diff --git a/resources/views/admin/servers/view/startup.blade.php b/resources/views/admin/servers/view/startup.blade.php
index afbce8b95..0e339fa2a 100644
--- a/resources/views/admin/servers/view/startup.blade.php
+++ b/resources/views/admin/servers/view/startup.blade.php
@@ -20,24 +20,7 @@
 @endsection
 
 @section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.servers.view', $server->id) }}">About</a></li>
-                @if($server->installed === 1)
-                    <li><a href="{{ route('admin.servers.view.details', $server->id) }}">Details</a></li>
-                    <li><a href="{{ route('admin.servers.view.build', $server->id) }}">Build Configuration</a></li>
-                    <li class="active"><a href="{{ route('admin.servers.view.startup', $server->id) }}">Startup</a></li>
-                    <li><a href="{{ route('admin.servers.view.database', $server->id) }}">Database</a></li>
-                    <li><a href="{{ route('admin.servers.view.manage', $server->id) }}">Manage</a></li>
-                @endif
-                <li class="tab-danger"><a href="{{ route('admin.servers.view.delete', $server->id) }}">Delete</a></li>
-                <li class="tab-success"><a href="{{ route('server.index', $server->uuidShort) }}"><i class="fa fa-external-link"></i></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
+@include('admin.servers.partials.navigation')
 <form action="{{ route('admin.servers.view.startup', $server->id) }}" method="POST">
     <div class="row">
         <div class="col-xs-12">