From 4f2dd519c685e5204e5e3932556082872ea44d48 Mon Sep 17 00:00:00 2001
From: Bent <ET-Bent@users.noreply.github.com>
Date: Mon, 3 Jul 2017 08:46:53 +0200
Subject: [PATCH 1/3] Fix terminal scrolling and terminalNotify

The original statement seems to be a bit too precise regarding the height. Any tiny lag or one pixel movement leads to the console not being scrolled to the bottom anymore. Same applies for manually scrolling down which does not hide the `terminalNotify` properly.

A bit larger "buffer" fixes this.
---
 public/themes/pterodactyl/js/frontend/console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/themes/pterodactyl/js/frontend/console.js b/public/themes/pterodactyl/js/frontend/console.js
index 96639b156..88ceb1196 100644
--- a/public/themes/pterodactyl/js/frontend/console.js
+++ b/public/themes/pterodactyl/js/frontend/console.js
@@ -116,7 +116,7 @@ $(document).ready(function () {
 });
 
 $terminal.on('scroll', function () {
-    if ($(this).scrollTop() + $(this).innerHeight() < $(this)[0].scrollHeight) {
+    if ($(this).scrollTop() + $(this).innerHeight() + 50 < $(this)[0].scrollHeight) {
         $scrollNotify.removeClass('hidden');
     } else {
         $scrollNotify.addClass('hidden');

From 99eead0695a0dfe61750466b3136083815584f18 Mon Sep 17 00:00:00 2001
From: Joost Kwakkel <joost@kaashosting.nl>
Date: Sat, 8 Jul 2017 18:08:19 +0200
Subject: [PATCH 2/3] Most inputs now remember their old values on a failed
 creation

---
 .../pterodactyl/admin/nodes/new.blade.php     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/resources/themes/pterodactyl/admin/nodes/new.blade.php b/resources/themes/pterodactyl/admin/nodes/new.blade.php
index 98765bee0..36fb115a0 100644
--- a/resources/themes/pterodactyl/admin/nodes/new.blade.php
+++ b/resources/themes/pterodactyl/admin/nodes/new.blade.php
@@ -43,14 +43,18 @@
                 <div class="box-body">
                     <div class="form-group">
                         <label for="pName" class="form-label">Name</label>
-                        <input type="text" name="name" id="pName" class="form-control" />
+                        <input type="text" name="name" id="pName" class="form-control" value="{{ old('name') }}"/>
                         <p class="text-muted small">Character limits: <code>a-zA-Z0-9_.-</code> and <code>[Space]</code> (min 1, max 100 characters).</p>
                     </div>
                     <div class="form-group">
                         <label for="pLocationId" class="form-label">Location</label>
                         <select name="location_id" id="pLocationId">
                             @foreach($locations as $location)
-                                <option value="{{ $location->id }}">{{ $location->short }}</option>
+                                @if($location->id == old('location_id'))
+                                    <option value="{{ $location->id }}" selected>{{ $location->short }}</option>
+                                @else
+                                    <option value="{{ $location->id }}">{{ $location->short }}</option>
+                                @endif
                             @endforeach
                         </select>
                     </div>
@@ -58,6 +62,7 @@
                         <label class="form-label">Node Visibility</label>
                         <div>
                             <div class="radio radio-success radio-inline">
+
                                 <input type="radio" id="pPublicTrue" value="1" name="public" checked>
                                 <label for="pPublicTrue"> Public </label>
                             </div>
@@ -70,7 +75,7 @@
                     </div>
                     <div class="form-group">
                         <label for="pFQDN" class="form-label">FQDN</label>
-                        <input type="text" name="fqdn" id="pFQDN" class="form-control" />
+                        <input type="text" name="fqdn" id="pFQDN" class="form-control" value="{{ old('fqdn') }}"/>
                         <p class="text-muted small">Please enter domain name (e.g <code>node.example.com</code>) to be used for connecting to the daemon. An IP address may be used <em>only</em> if you are not using SSL for this node.</p>
                     </div>
                     <div class="form-group">
@@ -119,14 +124,14 @@
                         <div class="form-group col-md-6">
                             <label for="pMemory" class="form-label">Total Memory</label>
                             <div class="input-group">
-                                <input type="text" name="memory" data-multiplicator="true" class="form-control" id="pMemory"/>
+                                <input type="text" name="memory" data-multiplicator="true" class="form-control" id="pMemory" value="{{ old('memory') }}"/>
                                 <span class="input-group-addon">MB</span>
                             </div>
                         </div>
                         <div class="form-group col-md-6">
                             <label for="pMemoryOverallocate" class="form-label">Memory Over-Allocation</label>
                             <div class="input-group">
-                                <input type="text" name="memory_overallocate" class="form-control" id="pMemoryOverallocate"/>
+                                <input type="text" name="memory_overallocate" class="form-control" id="pMemoryOverallocate" value="{{ old('memory_overallocate') }}"/>
                                 <span class="input-group-addon">%</span>
                             </div>
                         </div>
@@ -138,14 +143,14 @@
                         <div class="form-group col-md-6">
                             <label for="pDisk" class="form-label">Total Disk Space</label>
                             <div class="input-group">
-                                <input type="text" name="disk" data-multiplicator="true" class="form-control" id="pDisk"/>
+                                <input type="text" name="disk" data-multiplicator="true" class="form-control" id="pDisk" value="{{ old('disk') }}"/>
                                 <span class="input-group-addon">MB</span>
                             </div>
                         </div>
                         <div class="form-group col-md-6">
                             <label for="pDiskOverallocate" class="form-label">Disk Over-Allocation</label>
                             <div class="input-group">
-                                <input type="text" name="disk_overallocate" class="form-control" id="pDiskOverallocate"/>
+                                <input type="text" name="disk_overallocate" class="form-control" id="pDiskOverallocate" value="{{ old('disk_overallocate') }}"/>
                                 <span class="input-group-addon">%</span>
                             </div>
                         </div>

From a1376db4fdb893edac323fd7bfc9624f655831f7 Mon Sep 17 00:00:00 2001
From: Joost Kwakkel <joost@kaashosting.nl>
Date: Sat, 8 Jul 2017 18:14:54 +0200
Subject: [PATCH 3/3] Redirect user to node allocation view after creation,
 closes #535

---
 app/Http/Controllers/Admin/NodesController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/NodesController.php b/app/Http/Controllers/Admin/NodesController.php
index ca4836ea4..ce02febac 100644
--- a/app/Http/Controllers/Admin/NodesController.php
+++ b/app/Http/Controllers/Admin/NodesController.php
@@ -94,9 +94,9 @@ class NodesController extends Controller
                     'daemonBase', 'daemonSFTP', 'daemonListen',
                 ])
             ));
-            Alert::success('Successfully created new node that can be configured automatically on your remote machine by visiting the configuration tab. <strong>Before you can add any servers you need to first assign some IP addresses and ports.</strong>')->flash();
+            Alert::success('Successfully created new node that can be configured automatically on your remote machine by visiting the configuration tab. <strong>Before you can add any servers you need to first assign some IP addresses and ports by adding an allocation.</strong>')->flash();
 
-            return redirect()->route('admin.nodes.view', $node->id);
+            return redirect()->route('admin.nodes.view.allocation', $node->id);
         } catch (DisplayValidationException $e) {
             return redirect()->route('admin.nodes.new')->withErrors(json_decode($e->getMessage()))->withInput();
         } catch (DisplayException $e) {