From da003efb031ea45e7bd8547785097368a3a55b68 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 30 Mar 2017 16:23:25 -0400
Subject: [PATCH] Fixes issue with DOCTYPE being discarded on JS injected views

---
 config/javascript.php                               |  3 +--
 .../themes/pterodactyl/layouts/admin.blade.php      | 13 +++++++------
 .../themes/pterodactyl/layouts/master.blade.php     |  8 +++++---
 .../themes/pterodactyl/layouts/scripts.blade.php    |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 resources/themes/pterodactyl/layouts/scripts.blade.php

diff --git a/config/javascript.php b/config/javascript.php
index 1c2ef82dc..1aeb222e0 100644
--- a/config/javascript.php
+++ b/config/javascript.php
@@ -14,8 +14,7 @@ return [
     |
     */
     'bind_js_vars_to_this_view' => [
-        'layouts.master',
-        'layouts.admin',
+        'layouts.scripts',
     ],
 
     /*
diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php
index f3a7920b8..910b50bcf 100644
--- a/resources/themes/pterodactyl/layouts/admin.blade.php
+++ b/resources/themes/pterodactyl/layouts/admin.blade.php
@@ -26,7 +26,6 @@
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <meta name="_token" content="{{ csrf_token() }}">
 
-
         <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
         <link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
         <link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
@@ -36,6 +35,8 @@
         <meta name="msapplication-config" content="/favicons/browserconfig.xml">
         <meta name="theme-color" content="#367fa9">
 
+        @include('layouts.scripts')
+
         @section('scripts')
             {!! Theme::css('vendor/select2/select2.min.css') !!}
             {!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
@@ -75,13 +76,13 @@
                                 </a>
                             </li>
                             <li>
-                                <a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="Quick Access"><i class="fa fa-fighter-jet" style="margin-top:4px;padding-bottom:2px;"></i></a>
+                                <a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="Quick Access"><i class="fa fa-fighter-jet"></i></a>
                             </li>
                             <li>
-                                <li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
+                                <li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server"></i></a></li>
                             </li>
                             <li>
-                                <li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
+                                <li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off"></i></a></li>
                             </li>
                         </ul>
                     </div>
@@ -171,8 +172,8 @@
                 </section>
             </div>
             <footer class="main-footer">
-                <div class="pull-right hidden-xs small text-gray">
-                    <strong>v</strong> {{ config('app.version') }}
+                <div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
+                    <strong>v</strong> {{ config('app.version') }} &nbsp;&nbsp; <small class="muted muted-hover"><a href="https://patreon.com/pterry" target="_blank"><i class="fa fa-credit-card"></i></a></small>
                 </div>
                 Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
             </footer>
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 8481a5e89..ac074bb30 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -35,6 +35,8 @@
         <meta name="msapplication-config" content="/favicons/browserconfig.xml">
         <meta name="theme-color" content="#367fa9">
 
+        @include('layouts.scripts')
+
         @section('scripts')
             {!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
             {!! Theme::css('vendor/adminlte/admin.min.css') !!}
@@ -73,15 +75,15 @@
                                 </a>
                             </li>
                             <li>
-                                <a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server" style="margin-top:4px;padding-bottom:2px;"></i></a>
+                                <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())
                                 <li>
-                                    <li><a href="{{ route('admin.index') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.admin_cp') }}"><i class="fa fa-gears" style="margin-top:4px;padding-bottom:2px;"></i></a></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>
                             @endif
                             <li>
-                                <li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.logout') }}"><i class="fa fa-power-off" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
+                                <li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.logout') }}"><i class="fa fa-power-off"></i></a></li>
                             </li>
                         </ul>
                     </div>
diff --git a/resources/themes/pterodactyl/layouts/scripts.blade.php b/resources/themes/pterodactyl/layouts/scripts.blade.php
new file mode 100644
index 000000000..3393bf5fe
--- /dev/null
+++ b/resources/themes/pterodactyl/layouts/scripts.blade.php
@@ -0,0 +1 @@
+{{-- Just here as a binder for dynamically rendered content. --}}