Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up file display in sidebar as well as socket.io warnings, closes #357

Browse source
This commit is contained in:
Dane Everitt 2017-03-30 16:20:51 -04:00
parent 95c739a3f3
commit b165f04b78
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/themes/pterodactyl/js/frontend/server.socket.js
View file

@ -38,9 +38,13 @@ var Server = (function () {
}, },
newest_on_top: true, newest_on_top: true,
delay: 2000, delay: 2000,
offset: {
x: 20,
y: 60,
},
animate: { animate: {
enter: 'animated zoomInDown', enter: 'animated bounceInUp',
exit: 'animated zoomOutDown' exit: 'animated bounceOutDown'
} }
}); });
@ -56,7 +60,7 @@ var Server = (function () {
message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err, message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
}, { }, {
type: 'danger', type: 'danger',
delay: 0 delay: 0,
}); });
} }
}); });

28
resources/themes/pterodactyl/layouts/master.blade.php
View file

@ -127,24 +127,14 @@
</a> </a>
</li> </li>
@can('list-files', $server) @can('list-files', $server)
<li class="treeview <li
@if(in_array(Route::currentRouteName(), ['server.files.index', 'server.files.edit', 'server.files.add'])) @if(starts_with(Route::currentRouteName(), 'server.files'))
active class="active"
@endif @endif
"> >
<a href="#"> <a href="{{ route('server.files.index', $server->uuidShort) }}">
<i class="fa fa-files-o"></i> <i class="fa fa-files-o"></i> <span>@lang('navigation.server.file_management')</span>
<span>@lang('navigation.server.file_management')</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
<ul class="treeview-menu">
<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>
@can('create-files', $server)
<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>
@endcan
</ul>
</li> </li>
@endcan @endcan
@can('list-subusers', $server) @can('list-subusers', $server)
@ -154,7 +144,7 @@
@endif @endif
> >
<a href="{{ route('server.subusers', $server->uuidShort)}}"> <a href="{{ route('server.subusers', $server->uuidShort)}}">
<i class="fa fa-users"></i> <span>Subusers</span> <i class="fa fa-users"></i> <span>@lang('navigation.server.subusers')</span>
</a> </a>
</li> </li>
@endcan @endcan
@ -235,8 +225,8 @@
</section> </section>
</div> </div>
<footer class="main-footer"> <footer class="main-footer">
<div class="pull-right hidden-xs small text-gray"> <div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
<strong>v</strong> {{ config('app.version') }} <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> </div>
Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>. Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
</footer> </footer>