Skip to content

Commit da003ef

Browse files
committed
Fixes issue with DOCTYPE being discarded on JS injected views
1 parent b165f04 commit da003ef

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

config/javascript.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
|
1515
*/
1616
'bind_js_vars_to_this_view' => [
17-
'layouts.master',
18-
'layouts.admin',
17+
'layouts.scripts',
1918
],
2019

2120
/*

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
2727
<meta name="_token" content="{{ csrf_token() }}">
2828

29-
3029
<link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
3130
<link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
3231
<link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
@@ -36,6 +35,8 @@
3635
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
3736
<meta name="theme-color" content="#367fa9">
3837

38+
@include('layouts.scripts')
39+
3940
@section('scripts')
4041
{!! Theme::css('vendor/select2/select2.min.css') !!}
4142
{!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
@@ -75,13 +76,13 @@
7576
</a>
7677
</li>
7778
<li>
78-
<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>
79+
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="Quick Access"><i class="fa fa-fighter-jet"></i></a>
7980
</li>
8081
<li>
81-
<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>
82+
<li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server"></i></a></li>
8283
</li>
8384
<li>
84-
<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>
85+
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off"></i></a></li>
8586
</li>
8687
</ul>
8788
</div>
@@ -171,8 +172,8 @@
171172
</section>
172173
</div>
173174
<footer class="main-footer">
174-
<div class="pull-right hidden-xs small text-gray">
175-
<strong>v</strong> {{ config('app.version') }}
175+
<div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
176+
<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>
176177
</div>
177178
Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
178179
</footer>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
3636
<meta name="theme-color" content="#367fa9">
3737

38+
@include('layouts.scripts')
39+
3840
@section('scripts')
3941
{!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
4042
{!! Theme::css('vendor/adminlte/admin.min.css') !!}
@@ -73,15 +75,15 @@
7375
</a>
7476
</li>
7577
<li>
76-
<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>
78+
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server"></i></a>
7779
</li>
7880
@if(Auth::user()->isRootAdmin())
7981
<li>
80-
<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>
82+
<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>
8183
</li>
8284
@endif
8385
<li>
84-
<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>
86+
<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>
8587
</li>
8688
</ul>
8789
</div>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{-- Just here as a binder for dynamically rendered content. --}}

0 commit comments

Comments
 (0)