From 51c07bf1f2ec29b7c12ee5b4d8d33f9e154efcfa Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 28 Oct 2016 18:21:12 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=89=20Add=20support=20for=20uploading?= =?UTF-8?q?=20files=20from=20file=20listing!=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #22 --- public/themes/default/css/pterodactyl.css | 22 ++++ resources/views/server/files/index.blade.php | 121 ++++++++++++++++++- resources/views/server/files/list.blade.php | 2 +- 3 files changed, 143 insertions(+), 2 deletions(-) diff --git a/public/themes/default/css/pterodactyl.css b/public/themes/default/css/pterodactyl.css index f5be2844a..607da8d1f 100755 --- a/public/themes/default/css/pterodactyl.css +++ b/public/themes/default/css/pterodactyl.css @@ -285,3 +285,25 @@ li.btn.btn-default.pill:active,li.btn.btn-default.pill:focus,li.btn.btn-default. #consoleThrottled:hover { opacity: 1; } + +.hasFileHover { + border: 2px dashed #0087F7; + border-radius: 5px; + margin: 0; + opacity: 0.5; +} + +.hasFileHover * { + pointer-events: none; +} + +td.has-progress { + padding: 0px !important; + border-top: 0px !important; +} +.progress.progress-table-bottom { + margin: 0 !important; + height:5px !important; + padding:0; + border:0; +} diff --git a/resources/views/server/files/index.blade.php b/resources/views/server/files/index.blade.php index 1889d41ba..c284faf60 100644 --- a/resources/views/server/files/index.blade.php +++ b/resources/views/server/files/index.blade.php @@ -27,6 +27,7 @@ @parent {!! Theme::js('js/vendor/async/async.min.js') !!} {!! Theme::js('js/vendor/lodash/lodash.js') !!} + {!! Theme::js('js/vendor/upload/client.min.js') !!} @endsection @section('content') @@ -43,7 +44,7 @@
-
+
@@ -63,6 +64,124 @@ @endsection diff --git a/resources/views/server/files/list.blade.php b/resources/views/server/files/list.blade.php index a4245d6de..74f539efb 100644 --- a/resources/views/server/files/list.blade.php +++ b/resources/views/server/files/list.blade.php @@ -37,7 +37,7 @@ - + @if (isset($directory['first']) && $directory['first'] === true)