From 955d89c0c61481381d741415bdda6fdf03c251a7 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Thu, 16 Mar 2017 19:48:24 -0400 Subject: [PATCH] Move everything over to pterodactyl theme --- resources/lang/en/base.php | 8 + .../themes/pterodactyl/errors/403.blade.php | 1 - .../pterodactyl}/errors/503.blade.php | 2 +- .../pterodactyl}/errors/installing.blade.php | 30 ++- .../pterodactyl}/errors/suspended.blade.php | 28 ++- .../views/admin/databases/index.blade.php | 150 ------------- resources/views/admin/databases/new.blade.php | 103 --------- .../views/admin/locations/index.blade.php | 211 ------------------ resources/views/vendor/.gitkeep | 0 .../notifications/email-plain.blade.php | 22 -- .../vendor/notifications/email.blade.php | 192 ---------------- .../vendor/pagination/bootstrap-4.blade.php | 36 --- .../views/vendor/pagination/default.blade.php | 36 --- .../pagination/simple-bootstrap-4.blade.php | 17 -- .../pagination/simple-default.blade.php | 17 -- 15 files changed, 45 insertions(+), 808 deletions(-) rename resources/{views => themes/pterodactyl}/errors/503.blade.php (94%) rename resources/{views => themes/pterodactyl}/errors/installing.blade.php (63%) rename resources/{views => themes/pterodactyl}/errors/suspended.blade.php (61%) delete mode 100644 resources/views/admin/databases/index.blade.php delete mode 100644 resources/views/admin/databases/new.blade.php delete mode 100644 resources/views/admin/locations/index.blade.php delete mode 100644 resources/views/vendor/.gitkeep delete mode 100644 resources/views/vendor/notifications/email-plain.blade.php delete mode 100644 resources/views/vendor/notifications/email.blade.php delete mode 100644 resources/views/vendor/pagination/bootstrap-4.blade.php delete mode 100644 resources/views/vendor/pagination/default.blade.php delete mode 100644 resources/views/vendor/pagination/simple-bootstrap-4.blade.php delete mode 100644 resources/views/vendor/pagination/simple-default.blade.php diff --git a/resources/lang/en/base.php b/resources/lang/en/base.php index c71f04578..52ad3f144 100644 --- a/resources/lang/en/base.php +++ b/resources/lang/en/base.php @@ -13,6 +13,14 @@ return [ 'header' => 'File Not Found', 'desc' => 'We were unable to locate the requested resource on the server.', ], + 'installing' => [ + 'header' => 'Server Installing', + 'desc' => 'The requested server is still completing the install process. Please check back in a few minutes, you should recieve an email as soon as this process is completed.', + ], + 'suspended' => [ + 'header' => 'Server Suspended', + 'desc' => 'This server has been suspended and cannot be accessed.', + ], ], 'index' => [ 'header' => 'Your Servers', diff --git a/resources/themes/pterodactyl/errors/403.blade.php b/resources/themes/pterodactyl/errors/403.blade.php index 225852a15..43aa58e1e 100644 --- a/resources/themes/pterodactyl/errors/403.blade.php +++ b/resources/themes/pterodactyl/errors/403.blade.php @@ -27,7 +27,6 @@ @endsection @section('content') -
diff --git a/resources/views/errors/503.blade.php b/resources/themes/pterodactyl/errors/503.blade.php similarity index 94% rename from resources/views/errors/503.blade.php rename to resources/themes/pterodactyl/errors/503.blade.php index 4a4150592..7d55e46ad 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/themes/pterodactyl/errors/503.blade.php @@ -40,7 +40,7 @@
-
Be right back.
+
Be right back!
diff --git a/resources/views/errors/installing.blade.php b/resources/themes/pterodactyl/errors/installing.blade.php similarity index 63% rename from resources/views/errors/installing.blade.php rename to resources/themes/pterodactyl/errors/installing.blade.php index 8a8d5c292..dea162251 100644 --- a/resources/views/errors/installing.blade.php +++ b/resources/themes/pterodactyl/errors/installing.blade.php @@ -17,24 +17,30 @@ {{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} {{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} {{-- SOFTWARE. --}} -@extends('layouts.master') +@extends('layouts.error') -@section('title', '503: Server Temporarily Unavaliable') +@section('title') + @lang('base.errors.installing.header') +@endsection + +@section('content-header') +@endsection @section('content') -
-
-
-

HTTP 503: Temporarily Unavaliable

-
-
-

The requested server is still completing the install process. Please check back in a few minutes, you should recieve an email as soon as this process is completed.

-

+
+
+
-
+
+
+
+

@lang('base.errors.installing.desc')

+
+
+ +
-

Take me back or go home.

@endsection diff --git a/resources/views/errors/suspended.blade.php b/resources/themes/pterodactyl/errors/suspended.blade.php similarity index 61% rename from resources/views/errors/suspended.blade.php rename to resources/themes/pterodactyl/errors/suspended.blade.php index f96f13d60..e5cfebb35 100644 --- a/resources/views/errors/suspended.blade.php +++ b/resources/themes/pterodactyl/errors/suspended.blade.php @@ -17,20 +17,28 @@ {{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} {{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} {{-- SOFTWARE. --}} -@extends('layouts.master') +@extends('layouts.error') -@section('title', '503: Server Temporarily Unavaliable') +@section('title') + @lang('base.errors.suspended.header') +@endsection + +@section('content-header') +@endsection @section('content') -
-
-
-

HTTP 403: Access Denied

-
-
-

This server has been suspended and cannot be accessed.

+
+
+
+
+

401

+

@lang('base.errors.suspended.desc')

+
+
+ + +
-

Take me back or go home.

@endsection diff --git a/resources/views/admin/databases/index.blade.php b/resources/views/admin/databases/index.blade.php deleted file mode 100644 index f1c2a4aac..000000000 --- a/resources/views/admin/databases/index.blade.php +++ /dev/null @@ -1,150 +0,0 @@ -{{-- Copyright (c) 2015 - 2017 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.admin') - -@section('title') - Database Management -@endsection - -@section('content') -
- -

Manage Databases

- -
-
-
-
-
- - - - - - - - - - - - - @foreach($databases as $database) - - - - - where('id', $database->db_server)->first(); ?> - - - - - @endforeach - -
ServerDatabaseUsernameConnection
{{ $database->server->name }}{{ $database->database }}{{ $database->username }} ({{ $database->remote }}){{ $host->host }}:{{ $host->port }}
-
- {{ $databases->appends(['tab' => 'tab_databases'])->links() }} -
-
-
-
-
-
-
-
- - - - - - - - - - - - - @foreach($hosts as $database) - - - - - - - - - @endforeach - -
NameConnectionUsernameDatabasesLinked Node
{{ $database->name }}{{ $database->host }}:{{ $database->port }}{{ $database->username }}{{ $database->databases_count }}@if(is_null($database->node))unlinked@else{{ $database->node->name }}@endif
-
- {{ $hosts->appends('tab', 'tab_dbservers')->render() }} -
-
-
-
-
-
- -@endsection diff --git a/resources/views/admin/databases/new.blade.php b/resources/views/admin/databases/new.blade.php deleted file mode 100644 index c9625cd75..000000000 --- a/resources/views/admin/databases/new.blade.php +++ /dev/null @@ -1,103 +0,0 @@ -{{-- Copyright (c) 2015 - 2017 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.admin') - -@section('title') - Add New Database Server -@endsection - -@section('content') -
- -

New Database Server

-
If you are trying to add a new database to an existing server please visit that server's control page and visit the 'Databases' tab. This page is for adding a new database server that individual per-server databases can be deployed to.
-
-
-
- -
- -

Enter a descriptive name for this database server.

-
-
-
- -
- -

A linked node implies that this Database Server is running on that node and it will be auto-selected when adding a database to servers on that node.

-
-
-
-
-
-
- -
- -

Enter the IP address that this database server is listening on.

-
-
-
- -
- -
-
-
-
-
- -
- -

The panel must be able to access this database, you may need to allow access from {{ Request::server('SERVER_ADDR') }} for this user.

-
-
-
- -
- -
-
-
-
-
-
- {!! csrf_field() !!} - -
-
-
-
-
- -@endsection diff --git a/resources/views/admin/locations/index.blade.php b/resources/views/admin/locations/index.blade.php deleted file mode 100644 index 2fbd4b05a..000000000 --- a/resources/views/admin/locations/index.blade.php +++ /dev/null @@ -1,211 +0,0 @@ -{{-- Copyright (c) 2015 - 2017 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.admin') - -@section('title') - Location List -@endsection - -@section('content') -
- -

All Locations

- - - - - - - - - - - - - @foreach ($locations as $location) - - - - - - - - - @endforeach - -
LocationDescriptionNodesServers
{{ $location->short }}{{ $location->long }}{{ $location->nodes_count }}{{ $location->servers_count }}
-
-
{!! $locations->render() !!}
-
-
-
-
- -
-
-
-
- - - -@endsection diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/views/vendor/notifications/email-plain.blade.php b/resources/views/vendor/notifications/email-plain.blade.php deleted file mode 100644 index 7bd992481..000000000 --- a/resources/views/vendor/notifications/email-plain.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;', - 'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;', - - /* Masthead ----------------------- */ - - 'email-masthead' => 'padding: 25px 0; text-align: center;', - 'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;', - - 'email-body' => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;', - 'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;', - 'email-body_cell' => 'padding: 35px;', - - 'email-footer' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;', - 'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;', - - /* Body ------------------------------ */ - - 'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;', - 'body_sub' => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;', - - /* Type ------------------------------ */ - - 'anchor' => 'color: #3869D4;', - 'header-1' => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;', - 'paragraph' => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;', - 'paragraph-sub' => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;', - 'paragraph-center' => 'text-align: center;', - - /* Buttons ------------------------------ */ - - 'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px; - background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px; - text-align: center; text-decoration: none; -webkit-text-size-adjust: none;', - - 'button--green' => 'background-color: #22BC66;', - 'button--red' => 'background-color: #dc4d2f;', - 'button--blue' => 'background-color: #3869D4;', -]; -?> - - - - - - - - -
- - - - - - - - - - - - - - - -
- - {{ Settings::get('company', 'Pterodactyl Panel') }} - -
- - - - -
- -

- @if (! empty($greeting)) - {{ $greeting }} - @else - @if ($level == 'error') - Whoops! - @else - Hello! - @endif - @endif -

- - - @foreach ($introLines as $line) -

- {{ $line }} -

- @endforeach - - - @if (isset($actionText)) - - - - -
- - - - {{ $actionText }} - -
- @endif - - - @foreach ($outroLines as $line) -

- {{ $line }} -

- @endforeach - - -

- Regards,
{{ Settings::get('company') }} -

- - - @if (isset($actionText)) - - - - -
-

- If you’re having trouble clicking the "{{ $actionText }}" button, - copy and paste the URL below into your web browser: -

- -

- - {{ $actionUrl }} - -

-
- @endif -
-
- - - - -
-

- © {{ date('Y') }} - {{ Settings::get('company', 'Pterodactyl Panel') }}. - All rights reserved. -

-
-
-
- - diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php deleted file mode 100644 index 9d80428cc..000000000 --- a/resources/views/vendor/pagination/bootstrap-4.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@if ($paginator->count() > 1) -
    - - @if ($paginator->onFirstPage()) -
  • «
    • - @else -
    • - @endif - - - @foreach ($elements as $element) - - @if (is_string($element)) -
  • {{ $element }}
    • - @endif - - - @if (is_array($element)) - @foreach ($element as $page => $url) - @if ($page == $paginator->currentPage()) -
  • {{ $page }}
    • - @else -
  • {{ $page }}
    • - @endif - @endforeach - @endif - @endforeach - - - @if ($paginator->hasMorePages()) -
    • - @else -
  • »
    • - @endif -
-@endif diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php deleted file mode 100644 index 26e56994f..000000000 --- a/resources/views/vendor/pagination/default.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@if ($paginator->lastPage() > 1) -
    - - @if ($paginator->onFirstPage()) - {{--
  • «
    • --}} - @else -
    • - @endif - - - @foreach ($elements as $element) - - @if (is_string($element)) -
  • {{ $element }}
    • - @endif - - - @if (is_array($element)) - @foreach ($element as $page => $url) - @if ($page == $paginator->currentPage()) -
  • {{ $page }}
    • - @else -
  • {{ $page }}
    • - @endif - @endforeach - @endif - @endforeach - - - @if ($paginator->hasMorePages()) -
    • - @else - {{--
  • »
    • --}} - @endif -
-@endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php deleted file mode 100644 index 4b14efeb5..000000000 --- a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@if ($paginator->count() > 1) -
    - - @if ($paginator->onFirstPage()) -
  • «
    • - @else -
    • - @endif - - - @if ($paginator->hasMorePages()) -
    • - @else -
  • »
    • - @endif -
-@endif diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php deleted file mode 100644 index a45097ee2..000000000 --- a/resources/views/vendor/pagination/simple-default.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@if ($paginator->count() > 1) -
    - - @if ($paginator->onFirstPage()) -
  • «
    • - @else -
    • - @endif - - - @if ($paginator->hasMorePages()) -
    • - @else -
  • »
    • - @endif -
-@endif