From 4dfc7a0053979ea87e8488fe2537c88419a24ba8 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 10 Nov 2017 21:41:39 -0600
Subject: [PATCH] Cleanup pagination CSS and UI

---
 app/Repositories/Eloquent/NodeRepository.php  |  2 +-
 public/themes/pterodactyl/css/pterodactyl.css |  4 +++
 .../admin/nodes/view/allocation.blade.php     |  8 +++--
 .../vendor/pagination/bootstrap-4.blade.php   | 36 -------------------
 .../vendor/pagination/default.blade.php       |  2 +-
 .../pagination/simple-bootstrap-4.blade.php   | 17 ---------
 .../pagination/simple-default.blade.php       | 17 ---------
 7 files changed, 11 insertions(+), 75 deletions(-)
 delete mode 100644 resources/themes/pterodactyl/vendor/pagination/bootstrap-4.blade.php
 delete mode 100644 resources/themes/pterodactyl/vendor/pagination/simple-bootstrap-4.blade.php
 delete mode 100644 resources/themes/pterodactyl/vendor/pagination/simple-default.blade.php

diff --git a/app/Repositories/Eloquent/NodeRepository.php b/app/Repositories/Eloquent/NodeRepository.php
index 9a7067266..2cd26c151 100644
--- a/app/Repositories/Eloquent/NodeRepository.php
+++ b/app/Repositories/Eloquent/NodeRepository.php
@@ -105,7 +105,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
         $instance->setRelation(
             'allocations',
             $instance->allocations()->orderBy('ip', 'asc')->orderBy('port', 'asc')
-                ->with('server')->paginate(50)
+                ->with('server')->paginate(2)
         );
 
         return $instance;
diff --git a/public/themes/pterodactyl/css/pterodactyl.css b/public/themes/pterodactyl/css/pterodactyl.css
index 0cc55b214..a0b9da1e8 100644
--- a/public/themes/pterodactyl/css/pterodactyl.css
+++ b/public/themes/pterodactyl/css/pterodactyl.css
@@ -420,3 +420,7 @@ label.control-label > span.field-optional:before {
     content: "optional";
     color: #bbbbbb;
 }
+
+.pagination > li > a, .pagination > li > span {
+    padding: 3px 10px !important;
+}
diff --git a/resources/themes/pterodactyl/admin/nodes/view/allocation.blade.php b/resources/themes/pterodactyl/admin/nodes/view/allocation.blade.php
index 0c7262c3d..50a6a84e5 100644
--- a/resources/themes/pterodactyl/admin/nodes/view/allocation.blade.php
+++ b/resources/themes/pterodactyl/admin/nodes/view/allocation.blade.php
@@ -72,9 +72,11 @@
                     @endforeach
                 </table>
             </div>
-            <div class="box-footer text-center">
-                {{ $node->allocations->render() }}
-            </div>
+            @if($node->allocations->hasPages())
+                <div class="box-footer text-center">
+                    {{ $node->allocations->render() }}
+                </div>
+            @endif
         </div>
     </div>
     <div class="col-sm-4">
diff --git a/resources/themes/pterodactyl/vendor/pagination/bootstrap-4.blade.php b/resources/themes/pterodactyl/vendor/pagination/bootstrap-4.blade.php
deleted file mode 100644
index 9d80428cc..000000000
--- a/resources/themes/pterodactyl/vendor/pagination/bootstrap-4.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-@if ($paginator->count() > 1)
-    <ul class="pagination">
-        <!-- Previous Page Link -->
-        @if ($paginator->onFirstPage())
-            <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
-        @else
-            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
-        @endif
-
-        <!-- Pagination Elements -->
-        @foreach ($elements as $element)
-            <!-- "Three Dots" Separator -->
-            @if (is_string($element))
-                <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li>
-            @endif
-
-            <!-- Array Of Links -->
-            @if (is_array($element))
-                @foreach ($element as $page => $url)
-                    @if ($page == $paginator->currentPage())
-                        <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
-                    @else
-                        <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
-                    @endif
-                @endforeach
-            @endif
-        @endforeach
-
-        <!-- Next Page Link -->
-        @if ($paginator->hasMorePages())
-            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
-        @else
-            <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
-        @endif
-    </ul>
-@endif
diff --git a/resources/themes/pterodactyl/vendor/pagination/default.blade.php b/resources/themes/pterodactyl/vendor/pagination/default.blade.php
index 26e56994f..1ecfac985 100644
--- a/resources/themes/pterodactyl/vendor/pagination/default.blade.php
+++ b/resources/themes/pterodactyl/vendor/pagination/default.blade.php
@@ -1,5 +1,5 @@
 @if ($paginator->lastPage() > 1)
-    <ul class="pagination">
+    <ul class="pagination pull-right no-margin">
         <!-- Previous Page Link -->
         @if ($paginator->onFirstPage())
             {{-- <li class="disabled"><span>&laquo;</span></li> --}}
diff --git a/resources/themes/pterodactyl/vendor/pagination/simple-bootstrap-4.blade.php b/resources/themes/pterodactyl/vendor/pagination/simple-bootstrap-4.blade.php
deleted file mode 100644
index 4b14efeb5..000000000
--- a/resources/themes/pterodactyl/vendor/pagination/simple-bootstrap-4.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-@if ($paginator->count() > 1)
-    <ul class="pagination">
-        <!-- Previous Page Link -->
-        @if ($paginator->onFirstPage())
-            <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
-        @else
-            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
-        @endif
-
-        <!-- Next Page Link -->
-        @if ($paginator->hasMorePages())
-            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
-        @else
-            <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
-        @endif
-    </ul>
-@endif
diff --git a/resources/themes/pterodactyl/vendor/pagination/simple-default.blade.php b/resources/themes/pterodactyl/vendor/pagination/simple-default.blade.php
deleted file mode 100644
index a45097ee2..000000000
--- a/resources/themes/pterodactyl/vendor/pagination/simple-default.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-@if ($paginator->count() > 1)
-    <ul class="pagination">
-        <!-- Previous Page Link -->
-        @if ($paginator->onFirstPage())
-            <li class="disabled"><span>&laquo;</span></li>
-        @else
-            <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
-        @endif
-
-        <!-- Next Page Link -->
-        @if ($paginator->hasMorePages())
-            <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
-        @else
-            <li class="disabled"><span>&raquo;</span></li>
-        @endif
-    </ul>
-@endif