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

ui(admin): change MB suffixes to MiB

Browse source 
Closes #4542
This commit is contained in:
Matthew Penner 2022-11-21 13:10:00 -07:00
parent c1584d9a5b
commit 2f4a60c961
No known key found for this signature in database
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/admin/nodes/index.blade.php
View file

@ -53,8 +53,8 @@
<td class="text-center text-muted left-icon" data-action="ping" data-secret="{{ $node->getDecryptedKey() }}" data-location="{{ $node->scheme }}://{{ $node->fqdn }}:{{ $node->daemonListen }}/api/system"><i class="fa fa-fw fa-refresh fa-spin"></i></td> <td class="text-center text-muted left-icon" data-action="ping" data-secret="{{ $node->getDecryptedKey() }}" data-location="{{ $node->scheme }}://{{ $node->fqdn }}:{{ $node->daemonListen }}/api/system"><i class="fa fa-fw fa-refresh fa-spin"></i></td>
<td>{!! $node->maintenance_mode ? '<span class="label label-warning"><i class="fa fa-wrench"></i></span> ' : '' !!}<a href="{{ route('admin.nodes.view', $node->id) }}">{{ $node->name }}</a></td> <td>{!! $node->maintenance_mode ? '<span class="label label-warning"><i class="fa fa-wrench"></i></span> ' : '' !!}<a href="{{ route('admin.nodes.view', $node->id) }}">{{ $node->name }}</a></td>
<td>{{ $node->location->short }}</td> <td>{{ $node->location->short }}</td>
<td>{{ $node->memory }} MB</td> <td>{{ $node->memory }} MiB</td>
<td>{{ $node->disk }} MB</td> <td>{{ $node->disk }} MiB</td>
<td class="text-center">{{ $node->servers_count }}</td> <td class="text-center">{{ $node->servers_count }}</td>
<td class="text-center" style="color:{{ ($node->scheme === 'https') ? '#50af51' : '#d9534f' }}"><i class="fa fa-{{ ($node->scheme === 'https') ? 'lock' : 'unlock' }}"></i></td> <td class="text-center" style="color:{{ ($node->scheme === 'https') ? '#50af51' : '#d9534f' }}"><i class="fa fa-{{ ($node->scheme === 'https') ? 'lock' : 'unlock' }}"></i></td>
<td class="text-center"><i class="fa fa-{{ ($node->public) ? 'eye' : 'eye-slash' }}"></i></td> <td class="text-center"><i class="fa fa-{{ ($node->public) ? 'eye' : 'eye-slash' }}"></i></td>

4
resources/views/admin/nodes/new.blade.php
View file

@ -110,7 +110,7 @@
<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" value="{{ old('memory') }}"/> <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">MiB</span>
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
@ -129,7 +129,7 @@
<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" value="{{ old('disk') }}"/> <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">MiB</span>
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">

4
resources/views/admin/nodes/view/index.blade.php
View file

@ -107,7 +107,7 @@
<span class="info-box-icon"><i class="ion ion-ios-folder-outline"></i></span> <span class="info-box-icon"><i class="ion ion-ios-folder-outline"></i></span>
<div class="info-box-content" style="padding: 15px 10px 0;"> <div class="info-box-content" style="padding: 15px 10px 0;">
<span class="info-box-text">Disk Space Allocated</span> <span class="info-box-text">Disk Space Allocated</span>
<span class="info-box-number">{{ $stats['disk']['value'] }} / {{ $stats['disk']['max'] }} MB</span> <span class="info-box-number">{{ $stats['disk']['value'] }} / {{ $stats['disk']['max'] }} MiB</span>
<div class="progress"> <div class="progress">
<div class="progress-bar" style="width: {{ $stats['disk']['percent'] }}%"></div> <div class="progress-bar" style="width: {{ $stats['disk']['percent'] }}%"></div>
</div> </div>
@ -119,7 +119,7 @@
<span class="info-box-icon"><i class="ion ion-ios-barcode-outline"></i></span> <span class="info-box-icon"><i class="ion ion-ios-barcode-outline"></i></span>
<div class="info-box-content" style="padding: 15px 10px 0;"> <div class="info-box-content" style="padding: 15px 10px 0;">
<span class="info-box-text">Memory Allocated</span> <span class="info-box-text">Memory Allocated</span>
<span class="info-box-number">{{ $stats['memory']['value'] }} / {{ $stats['memory']['max'] }} MB</span> <span class="info-box-number">{{ $stats['memory']['value'] }} / {{ $stats['memory']['max'] }} MiB</span>
<div class="progress"> <div class="progress">
<div class="progress-bar" style="width: {{ $stats['memory']['percent'] }}%"></div> <div class="progress-bar" style="width: {{ $stats['memory']['percent'] }}%"></div>
</div> </div>

6
resources/views/admin/nodes/view/settings.blade.php
View file

@ -132,7 +132,7 @@
<label for="memory" class="control-label">Total Memory</label> <label for="memory" class="control-label">Total Memory</label>
<div class="input-group"> <div class="input-group">
<input type="text" name="memory" class="form-control" data-multiplicator="true" value="{{ old('memory', $node->memory) }}"/> <input type="text" name="memory" class="form-control" data-multiplicator="true" value="{{ old('memory', $node->memory) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
</div> </div>
<div class="form-group col-xs-6"> <div class="form-group col-xs-6">
@ -151,7 +151,7 @@
<label for="disk" class="control-label">Disk Space</label> <label for="disk" class="control-label">Disk Space</label>
<div class="input-group"> <div class="input-group">
<input type="text" name="disk" class="form-control" data-multiplicator="true" value="{{ old('disk', $node->disk) }}"/> <input type="text" name="disk" class="form-control" data-multiplicator="true" value="{{ old('disk', $node->disk) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
</div> </div>
<div class="form-group col-xs-6"> <div class="form-group col-xs-6">
@ -177,7 +177,7 @@
<label for="disk_overallocate" class="control-label">Maximum Web Upload Filesize</label> <label for="disk_overallocate" class="control-label">Maximum Web Upload Filesize</label>
<div class="input-group"> <div class="input-group">
<input type="text" name="upload_size" class="form-control" value="{{ old('upload_size', $node->upload_size) }}"/> <input type="text" name="upload_size" class="form-control" value="{{ old('upload_size', $node->upload_size) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted"><small>Enter the maximum size of files that can be uploaded through the web-based file manager.</small></p> <p class="text-muted"><small>Enter the maximum size of files that can be uploaded through the web-based file manager.</small></p>
</div> </div>

6
resources/views/admin/servers/new.blade.php
View file

@ -170,7 +170,7 @@
<div class="input-group"> <div class="input-group">
<input type="text" id="pMemory" name="memory" class="form-control" value="{{ old('memory') }}" /> <input type="text" id="pMemory" name="memory" class="form-control" value="{{ old('memory') }}" />
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memory in a container.</p> <p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memory in a container.</p>
@ -181,7 +181,7 @@
<div class="input-group"> <div class="input-group">
<input type="text" id="pSwap" name="swap" class="form-control" value="{{ old('swap', 0) }}" /> <input type="text" id="pSwap" name="swap" class="form-control" value="{{ old('swap', 0) }}" />
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted small">Setting this to <code>0</code> will disable swap space on this server. Setting to <code>-1</code> will allow unlimited swap.</p> <p class="text-muted small">Setting this to <code>0</code> will disable swap space on this server. Setting to <code>-1</code> will allow unlimited swap.</p>
@ -194,7 +194,7 @@
<div class="input-group"> <div class="input-group">
<input type="text" id="pDisk" name="disk" class="form-control" value="{{ old('disk') }}" /> <input type="text" id="pDisk" name="disk" class="form-control" value="{{ old('disk') }}" />
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to <code>0</code> to allow unlimited disk usage.</p> <p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to <code>0</code> to allow unlimited disk usage.</p>

6
resources/views/admin/servers/view/build.blade.php
View file

@ -43,7 +43,7 @@
<label for="memory" class="control-label">Allocated Memory</label> <label for="memory" class="control-label">Allocated Memory</label>
<div class="input-group"> <div class="input-group">
<input type="text" name="memory" data-multiplicator="true" class="form-control" value="{{ old('memory', $server->memory) }}"/> <input type="text" name="memory" data-multiplicator="true" class="form-control" value="{{ old('memory', $server->memory) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memory in a container.</p> <p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memory in a container.</p>
</div> </div>
@ -51,7 +51,7 @@
<label for="swap" class="control-label">Allocated Swap</label> <label for="swap" class="control-label">Allocated Swap</label>
<div class="input-group"> <div class="input-group">
<input type="text" name="swap" data-multiplicator="true" class="form-control" value="{{ old('swap', $server->swap) }}"/> <input type="text" name="swap" data-multiplicator="true" class="form-control" value="{{ old('swap', $server->swap) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted small">Setting this to <code>0</code> will disable swap space on this server. Setting to <code>-1</code> will allow unlimited swap.</p> <p class="text-muted small">Setting this to <code>0</code> will disable swap space on this server. Setting to <code>-1</code> will allow unlimited swap.</p>
</div> </div>
@ -59,7 +59,7 @@
<label for="cpu" class="control-label">Disk Space Limit</label> <label for="cpu" class="control-label">Disk Space Limit</label>
<div class="input-group"> <div class="input-group">
<input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/> <input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MiB</span>
</div> </div>
<p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to <code>0</code> to allow unlimited disk usage.</p> <p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to <code>0</code> to allow unlimited disk usage.</p>
</div> </div>

4
resources/views/admin/servers/view/index.blade.php
View file

@ -78,7 +78,7 @@
@if($server->memory === 0) @if($server->memory === 0)
<code>Unlimited</code> <code>Unlimited</code>
@else @else
<code>{{ $server->memory }}MB</code> <code>{{ $server->memory }}MiB</code>
@endif @endif
/ /
@if($server->swap === 0) @if($server->swap === 0)
@ -86,7 +86,7 @@
@elseif($server->swap === -1) @elseif($server->swap === -1)
<code data-toggle="tooltip" data-placement="top" title="Swap Space">Unlimited</code> <code data-toggle="tooltip" data-placement="top" title="Swap Space">Unlimited</code>
@else @else
<code data-toggle="tooltip" data-placement="top" title="Swap Space"> {{ $server->swap }}MB</code> <code data-toggle="tooltip" data-placement="top" title="Swap Space"> {{ $server->swap }}MiB</code>
@endif @endif
</td> </td>
</tr> </tr>