Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/PTDL-472

Browse source
This commit is contained in:
Dane Everitt 2017-07-08 14:08:02 -05:00
commit bd78e3544d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Admin/NodesController.php
View file

@ -94,9 +94,9 @@ class NodesController extends Controller
'daemonBase', 'daemonSFTP', 'daemonListen', '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) { } catch (DisplayValidationException $e) {
return redirect()->route('admin.nodes.new')->withErrors(json_decode($e->getMessage()))->withInput(); return redirect()->route('admin.nodes.new')->withErrors(json_decode($e->getMessage()))->withInput();
} catch (DisplayException $e) { } catch (DisplayException $e) {

2
public/themes/pterodactyl/js/frontend/console.js
View file

@ -116,7 +116,7 @@ $(document).ready(function () {
}); });
$terminal.on('scroll', 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'); $scrollNotify.removeClass('hidden');
} else { } else {
$scrollNotify.addClass('hidden'); $scrollNotify.addClass('hidden');

19
resources/themes/pterodactyl/admin/nodes/new.blade.php
View file

@ -43,14 +43,18 @@
<div class="box-body"> <div class="box-body">
<div class="form-group"> <div class="form-group">
<label for="pName" class="form-label">Name</label> <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> <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>
<div class="form-group"> <div class="form-group">
<label for="pLocationId" class="form-label">Location</label> <label for="pLocationId" class="form-label">Location</label>
<select name="location_id" id="pLocationId"> <select name="location_id" id="pLocationId">
@foreach($locations as $location) @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 @endforeach
</select> </select>
</div> </div>
@ -58,6 +62,7 @@
<label class="form-label">Node Visibility</label> <label class="form-label">Node Visibility</label>
<div> <div>
<div class="radio radio-success radio-inline"> <div class="radio radio-success radio-inline">
<input type="radio" id="pPublicTrue" value="1" name="public" checked> <input type="radio" id="pPublicTrue" value="1" name="public" checked>
<label for="pPublicTrue"> Public </label> <label for="pPublicTrue"> Public </label>
</div> </div>
@ -70,7 +75,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="pFQDN" class="form-label">FQDN</label> <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> <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>
<div class="form-group"> <div class="form-group">
@ -119,14 +124,14 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pMemory" class="form-label">Total Memory</label> <label for="pMemory" class="form-label">Total Memory</label>
<div class="input-group"> <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> <span class="input-group-addon">MB</span>
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pMemoryOverallocate" class="form-label">Memory Over-Allocation</label> <label for="pMemoryOverallocate" class="form-label">Memory Over-Allocation</label>
<div class="input-group"> <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> <span class="input-group-addon">%</span>
</div> </div>
</div> </div>
@ -138,14 +143,14 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pDisk" class="form-label">Total Disk Space</label> <label for="pDisk" class="form-label">Total Disk Space</label>
<div class="input-group"> <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> <span class="input-group-addon">MB</span>
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pDiskOverallocate" class="form-label">Disk Over-Allocation</label> <label for="pDiskOverallocate" class="form-label">Disk Over-Allocation</label>
<div class="input-group"> <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> <span class="input-group-addon">%</span>
</div> </div>
</div> </div>