Skip to content

Commit b165f04

Browse files
committed
Fix up file display in sidebar as well as socket.io warnings, closes pterodactyl#357
1 parent 95c739a commit b165f04

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

public/themes/pterodactyl/js/frontend/server.socket.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,13 @@ var Server = (function () {
3838
},
3939
newest_on_top: true,
4040
delay: 2000,
41+
offset: {
42+
x: 20,
43+
y: 60,
44+
},
4145
animate: {
42-
enter: 'animated zoomInDown',
43-
exit: 'animated zoomOutDown'
46+
enter: 'animated bounceInUp',
47+
exit: 'animated bounceOutDown'
4448
}
4549
});
4650

@@ -56,7 +60,7 @@ var Server = (function () {
5660
message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
5761
}, {
5862
type: 'danger',
59-
delay: 0
63+
delay: 0,
6064
});
6165
}
6266
});

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

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,14 @@
127127
</a>
128128
</li>
129129
@can('list-files', $server)
130-
<li class="treeview
131-
@if(in_array(Route::currentRouteName(), ['server.files.index', 'server.files.edit', 'server.files.add']))
132-
active
130+
<li
131+
@if(starts_with(Route::currentRouteName(), 'server.files'))
132+
class="active"
133133
@endif
134-
">
135-
<a href="#">
136-
<i class="fa fa-files-o"></i>
137-
<span>@lang('navigation.server.file_management')</span>
138-
<span class="pull-right-container">
139-
<i class="fa fa-angle-left pull-right"></i>
140-
</span>
134+
>
135+
<a href="{{ route('server.files.index', $server->uuidShort) }}">
136+
<i class="fa fa-files-o"></i> <span>@lang('navigation.server.file_management')</span>
141137
</a>
142-
<ul class="treeview-menu">
143-
<li class="{{ (Route::currentRouteName() !== 'server.files.index' && Route::currentRouteName() !== 'server.files.edit') ?: 'active' }}"><a href="{{ route('server.files.index', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.file_browser')</a></li>
144-
@can('create-files', $server)
145-
<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>
146-
@endcan
147-
</ul>
148138
</li>
149139
@endcan
150140
@can('list-subusers', $server)
@@ -154,7 +144,7 @@ class="active"
154144
@endif
155145
>
156146
<a href="{{ route('server.subusers', $server->uuidShort)}}">
157-
<i class="fa fa-users"></i> <span>Subusers</span>
147+
<i class="fa fa-users"></i> <span>@lang('navigation.server.subusers')</span>
158148
</a>
159149
</li>
160150
@endcan
@@ -235,8 +225,8 @@ class="active"
235225
</section>
236226
</div>
237227
<footer class="main-footer">
238-
<div class="pull-right hidden-xs small text-gray">
239-
<strong>v</strong> {{ config('app.version') }}
228+
<div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
229+
<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>
240230
</div>
241231
Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
242232
</footer>

0 commit comments

Comments
 (0)