Skip to content

Commit 2f4a60c

Browse files
matthewpimatthewpi
committed
ui(admin): change MB suffixes to MiB
Closes pterodactyl#4542
1 parent c1584d9 commit 2f4a60c

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎resources/views/admin/nodes/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<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>
5454
<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>
5555
<td>{{ $node->location->short }}</td>
56-
<td>{{ $node->memory }} MB</td>
57-
<td>{{ $node->disk }} MB</td>
56+
<td>{{ $node->memory }} MiB</td>
57+
<td>{{ $node->disk }} MiB</td>
5858
<td class="text-center">{{ $node->servers_count }}</td>
5959
<td class="text-center" style="color:{{ ($node->scheme === 'https') ? '#50af51' : '#d9534f' }}"><i class="fa fa-{{ ($node->scheme === 'https') ? 'lock' : 'unlock' }}"></i></td>
6060
<td class="text-center"><i class="fa fa-{{ ($node->public) ? 'eye' : 'eye-slash' }}"></i></td>

‎resources/views/admin/nodes/new.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<label for="pMemory" class="form-label">Total Memory</label>
111111
<div class="input-group">
112112
<input type="text" name="memory" data-multiplicator="true" class="form-control" id="pMemory" value="{{ old('memory') }}"/>
113-
<span class="input-group-addon">MB</span>
113+
<span class="input-group-addon">MiB</span>
114114
</div>
115115
</div>
116116
<div class="form-group col-md-6">
@@ -129,7 +129,7 @@
129129
<label for="pDisk" class="form-label">Total Disk Space</label>
130130
<div class="input-group">
131131
<input type="text" name="disk" data-multiplicator="true" class="form-control" id="pDisk" value="{{ old('disk') }}"/>
132-
<span class="input-group-addon">MB</span>
132+
<span class="input-group-addon">MiB</span>
133133
</div>
134134
</div>
135135
<div class="form-group col-md-6">

‎resources/views/admin/nodes/view/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<span class="info-box-icon"><i class="ion ion-ios-folder-outline"></i></span>
108108
<div class="info-box-content" style="padding: 15px 10px 0;">
109109
<span class="info-box-text">Disk Space Allocated</span>
110-
<span class="info-box-number">{{ $stats['disk']['value'] }} / {{ $stats['disk']['max'] }} MB</span>
110+
<span class="info-box-number">{{ $stats['disk']['value'] }} / {{ $stats['disk']['max'] }} MiB</span>
111111
<div class="progress">
112112
<div class="progress-bar" style="width: {{ $stats['disk']['percent'] }}%"></div>
113113
</div>
@@ -119,7 +119,7 @@
119119
<span class="info-box-icon"><i class="ion ion-ios-barcode-outline"></i></span>
120120
<div class="info-box-content" style="padding: 15px 10px 0;">
121121
<span class="info-box-text">Memory Allocated</span>
122-
<span class="info-box-number">{{ $stats['memory']['value'] }} / {{ $stats['memory']['max'] }} MB</span>
122+
<span class="info-box-number">{{ $stats['memory']['value'] }} / {{ $stats['memory']['max'] }} MiB</span>
123123
<div class="progress">
124124
<div class="progress-bar" style="width: {{ $stats['memory']['percent'] }}%"></div>
125125
</div>

‎resources/views/admin/nodes/view/settings.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<label for="memory" class="control-label">Total Memory</label>
133133
<div class="input-group">
134134
<input type="text" name="memory" class="form-control" data-multiplicator="true" value="{{ old('memory', $node->memory) }}"/>
135-
<span class="input-group-addon">MB</span>
135+
<span class="input-group-addon">MiB</span>
136136
</div>
137137
</div>
138138
<div class="form-group col-xs-6">
@@ -151,7 +151,7 @@
151151
<label for="disk" class="control-label">Disk Space</label>
152152
<div class="input-group">
153153
<input type="text" name="disk" class="form-control" data-multiplicator="true" value="{{ old('disk', $node->disk) }}"/>
154-
<span class="input-group-addon">MB</span>
154+
<span class="input-group-addon">MiB</span>
155155
</div>
156156
</div>
157157
<div class="form-group col-xs-6">
@@ -177,7 +177,7 @@
177177
<label for="disk_overallocate" class="control-label">Maximum Web Upload Filesize</label>
178178
<div class="input-group">
179179
<input type="text" name="upload_size" class="form-control" value="{{ old('upload_size', $node->upload_size) }}"/>
180-
<span class="input-group-addon">MB</span>
180+
<span class="input-group-addon">MiB</span>
181181
</div>
182182
<p class="text-muted"><small>Enter the maximum size of files that can be uploaded through the web-based file manager.</small></p>
183183
</div>

‎resources/views/admin/servers/new.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170

171171
<div class="input-group">
172172
<input type="text" id="pMemory" name="memory" class="form-control" value="{{ old('memory') }}" />
173-
<span class="input-group-addon">MB</span>
173+
<span class="input-group-addon">MiB</span>
174174
</div>
175175

176176
<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 @@
181181

182182
<div class="input-group">
183183
<input type="text" id="pSwap" name="swap" class="form-control" value="{{ old('swap', 0) }}" />
184-
<span class="input-group-addon">MB</span>
184+
<span class="input-group-addon">MiB</span>
185185
</div>
186186

187187
<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 @@
194194

195195
<div class="input-group">
196196
<input type="text" id="pDisk" name="disk" class="form-control" value="{{ old('disk') }}" />
197-
<span class="input-group-addon">MB</span>
197+
<span class="input-group-addon">MiB</span>
198198
</div>
199199

200200
<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>

‎resources/views/admin/servers/view/build.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@
4343
<label for="memory" class="control-label">Allocated Memory</label>
4444
<div class="input-group">
4545
<input type="text" name="memory" data-multiplicator="true" class="form-control" value="{{ old('memory', $server->memory) }}"/>
46-
<span class="input-group-addon">MB</span>
46+
<span class="input-group-addon">MiB</span>
4747
</div>
4848
<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>
4949
</div>
5050
<div class="form-group">
5151
<label for="swap" class="control-label">Allocated Swap</label>
5252
<div class="input-group">
5353
<input type="text" name="swap" data-multiplicator="true" class="form-control" value="{{ old('swap', $server->swap) }}"/>
54-
<span class="input-group-addon">MB</span>
54+
<span class="input-group-addon">MiB</span>
5555
</div>
5656
<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>
5757
</div>
5858
<div class="form-group">
5959
<label for="cpu" class="control-label">Disk Space Limit</label>
6060
<div class="input-group">
6161
<input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
62-
<span class="input-group-addon">MB</span>
62+
<span class="input-group-addon">MiB</span>
6363
</div>
6464
<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>
6565
</div>

‎resources/views/admin/servers/view/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@
7878
@if($server->memory === 0)
7979
<code>Unlimited</code>
8080
@else
81-
<code>{{ $server->memory }}MB</code>
81+
<code>{{ $server->memory }}MiB</code>
8282
@endif
8383
/
8484
@if($server->swap === 0)
8585
<code data-toggle="tooltip" data-placement="top" title="Swap Space">Not Set</code>
8686
@elseif($server->swap === -1)
8787
<code data-toggle="tooltip" data-placement="top" title="Swap Space">Unlimited</code>
8888
@else
89-
<code data-toggle="tooltip" data-placement="top" title="Swap Space"> {{ $server->swap }}MB</code>
89+
<code data-toggle="tooltip" data-placement="top" title="Swap Space"> {{ $server->swap }}MiB</code>
9090
@endif
9191
</td>
9292
</tr>

0 commit comments

Comments
 (0)