From b165f04b78ed07c0e09bfd714409f761017c8dad Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 30 Mar 2017 16:20:51 -0400
Subject: [PATCH] Fix up file display in sidebar as well as socket.io warnings,
 closes #357

---
 .../pterodactyl/js/frontend/server.socket.js  | 10 +++++--
 .../pterodactyl/layouts/master.blade.php      | 28 ++++++-------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/public/themes/pterodactyl/js/frontend/server.socket.js b/public/themes/pterodactyl/js/frontend/server.socket.js
index 3e97c2a62..4c0e77fa8 100644
--- a/public/themes/pterodactyl/js/frontend/server.socket.js
+++ b/public/themes/pterodactyl/js/frontend/server.socket.js
@@ -38,9 +38,13 @@ var Server = (function ()  {
             },
             newest_on_top: true,
             delay: 2000,
+            offset: {
+                x: 20,
+                y: 60,
+            },
             animate: {
-                enter: 'animated zoomInDown',
-                exit: 'animated zoomOutDown'
+                enter: 'animated bounceInUp',
+                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,
                 }, {
                     type: 'danger',
-                    delay: 0
+                    delay: 0,
                 });
             }
         });
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 3a204523a..8481a5e89 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -127,24 +127,14 @@
                                 </a>
                             </li>
                             @can('list-files', $server)
-                                <li class="treeview
-                                    @if(in_array(Route::currentRouteName(), ['server.files.index', 'server.files.edit', 'server.files.add']))
-                                        active
+                                <li
+                                    @if(starts_with(Route::currentRouteName(), 'server.files'))
+                                        class="active"
                                     @endif
-                                ">
-                                    <a href="#">
-                                        <i class="fa fa-files-o"></i>
-                                        <span>@lang('navigation.server.file_management')</span>
-                                        <span class="pull-right-container">
-                                            <i class="fa fa-angle-left pull-right"></i>
-                                        </span>
+                                >
+                                    <a href="{{ route('server.files.index', $server->uuidShort) }}">
+                                        <i class="fa fa-files-o"></i> <span>@lang('navigation.server.file_management')</span>
                                     </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>
                             @endcan
                             @can('list-subusers', $server)
@@ -154,7 +144,7 @@
                                     @endif
                                 >
                                     <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>
                                 </li>
                             @endcan
@@ -235,8 +225,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>