From 34d5e81b7a195a73d102652cb3f49bcbace78724 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 16 Mar 2017 20:29:48 -0400
Subject: [PATCH] Fix new server page display

---
 public/themes/pterodactyl/js/admin/new-server.js         | 9 ++-------
 resources/themes/pterodactyl/admin/servers/new.blade.php | 9 +++------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/public/themes/pterodactyl/js/admin/new-server.js b/public/themes/pterodactyl/js/admin/new-server.js
index 3e82cb1ad..f3de55bee 100644
--- a/public/themes/pterodactyl/js/admin/new-server.js
+++ b/public/themes/pterodactyl/js/admin/new-server.js
@@ -162,11 +162,6 @@ $('#pOptionId').on('change', function (event) {
         $('#pStartup').val(_.get(objectChain, 'startup'));
     }
 
-    if (!_.get(objectChain, 'executable', false)) {
-        $('#pStartupExecutable').html(_.get(parentChain, 'executable', 'ERROR: Exec Not Defined!'));
-    } else {
-        $('#pStartupExecutable').html(_.get(objectChain, 'executable'));
-    }
     $('#pPackId').html('').select2({
         data: [{ id: 0, text: 'No Service Pack' }].concat(
             $.map(_.get(objectChain, 'packs', []), function (item, i) {
@@ -186,8 +181,8 @@ $('#pOptionId').on('change', function (event) {
                 <label for="var_ref_' + item.id + '" class="control-label">' + isRequired + item.name + '</label> \
                 <input type="text" id="var_ref_' + item.id + '" autocomplete="off" name="env_' + item.env_variable + '" class="form-control" value="' + item.default_value + '" /> \
                 <p class="text-muted small">' + item.description + '<br /> \
-                <strong>Access in Startup:</strong> <code>@{{' + item.env_variable + '}}</code><br /> \
-                <strong>Validation Regex:</strong> <code>' + item.regex + '</code></small></p> \
+                <strong>Access in Startup:</strong> <code>{{' + item.env_variable + '}}</code><br /> \
+                <strong>Validation Rules:</strong> <code>' + item.rules + '</code></small></p> \
             </div> \
         ';
         $('#appendVariablesTo').append(dataAppend);
diff --git a/resources/themes/pterodactyl/admin/servers/new.blade.php b/resources/themes/pterodactyl/admin/servers/new.blade.php
index fbb0868d6..55c6c6cad 100644
--- a/resources/themes/pterodactyl/admin/servers/new.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/new.blade.php
@@ -147,14 +147,14 @@
                     <div class="form-group col-sm-4">
                         <label for="pCPU">CPU Limit</label>
                         <div class="input-group">
-                            <input type="text" class="form-control" value="{{ old('cpu') }}" name="cpu" id="pCPU" />
+                            <input type="text" class="form-control" value="{{ old('cpu', 0) }}" name="cpu" id="pCPU" />
                             <span class="input-group-addon">%</span>
                         </div>
                     </div>
                     <div class="form-group col-sm-4">
                         <label for="pIO">Block IO Weight</label>
                         <div class="input-group">
-                            <input type="text" class="form-control" value="{{ old('io') }}" value="500" name="io" id="pIO" />
+                            <input type="text" class="form-control" value="{{ old('io', 500) }}" name="io" id="pIO" />
                             <span class="input-group-addon">I/O</span>
                         </div>
                     </div>
@@ -229,10 +229,7 @@
                 <div class="box-body row">
                     <div class="form-group col-xs-12">
                         <label for="pStartup">Startup Command</label>
-                        <div class="input-group">
-                            <span class="input-group-addon bg-gray" id="pStartupExecutable"></span>
-                            <input type="text" id="pStartup" value="{{ old('startup') }}" class="form-control" name="startup" />
-                        </div>
+                        <input type="text" id="pStartup" value="{{ old('startup') }}" class="form-control" name="startup" />
                         <p class="small text-muted no-margin">The following data replacers are avaliable for the startup command: <code>@{{SERVER_MEMORY}}</code>, <code>@{{SERVER_IP}}</code>, and <code>@{{SERVER_PORT}}</code>. They will be replaced with the allocated memory, server ip, and server port respectively.</p>
                     </div>
                 </div>