Skip to content

Commit 7daf6e2

Browse files
notAreYouScarednotAreYouScared
committed
Uniformity is Key
Updated logical order to match new server page on build and overview page.
1 parent 411ed41 commit 7daf6e2

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,21 @@
2929
<h3 class="box-title">Resource Management</h3>
3030
</div>
3131
<div class="box-body">
32+
<div class="form-group">
33+
<label for="cpu" class="control-label">CPU Limit</label>
34+
<div class="input-group">
35+
<input type="text" name="cpu" class="form-control" value="{{ old('cpu', $server->cpu) }}"/>
36+
<span class="input-group-addon">%</span>
37+
</div>
38+
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
39+
</div>
40+
<div class="form-group">
41+
<label for="threads" class="control-label">CPU Threads</label>
42+
<div>
43+
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
44+
</div>
45+
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
46+
</div>
3247
<div class="form-group">
3348
<label for="memory" class="control-label">Allocated Memory</label>
3449
<div class="input-group">
@@ -46,19 +61,12 @@
4661
<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>
4762
</div>
4863
<div class="form-group">
49-
<label for="cpu" class="control-label">CPU Limit</label>
64+
<label for="cpu" class="control-label">Disk Space Limit</label>
5065
<div class="input-group">
51-
<input type="text" name="cpu" class="form-control" value="{{ old('cpu', $server->cpu) }}"/>
52-
<span class="input-group-addon">%</span>
53-
</div>
54-
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
55-
</div>
56-
<div class="form-group">
57-
<label for="threads" class="control-label">CPU Threads</label>
58-
<div>
59-
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
66+
<input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
67+
<span class="input-group-addon">MB</span>
6068
</div>
61-
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
69+
<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.</p>
6270
</div>
6371
<div class="form-group">
6472
<label for="io" class="control-label">Block IO Proportion</label>
@@ -67,14 +75,6 @@
6775
</div>
6876
<p class="text-muted small"><strong>Advanced</strong>: The IO performance of this server relative to other <em>running</em> containers on the system. Value should be between <code>10</code> and <code>1000</code>.</code></p>
6977
</div>
70-
<div class="form-group">
71-
<label for="cpu" class="control-label">Disk Space Limit</label>
72-
<div class="input-group">
73-
<input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
74-
<span class="input-group-addon">MB</span>
75-
</div>
76-
<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.</p>
77-
</div>
7878
<div class="form-group">
7979
<label for="cpu" class="control-label">OOM Killer</label>
8080
<div>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@
5757
<td>Name</td>
5858
<td>{{ $server->name }}</td>
5959
</tr>
60-
<tr>
61-
<td>Memory</td>
62-
<td><code>{{ $server->memory }}MB</code> / <code data-toggle="tooltip" data-placement="top" title="Swap Space">{{ $server->swap }}MB</code></td>
63-
</tr>
64-
<tr>
65-
<td>Disk Space</td>
66-
<td><code>{{ $server->disk }}MB</code></td>
67-
</tr>
68-
<tr>
69-
<td>Block IO Weight</td>
70-
<td><code>{{ $server->io }}</code></td>
71-
</tr>
7260
<tr>
7361
<td>CPU Limit</td>
7462
<td><code>{{ $server->cpu }}%</code></td>
@@ -83,6 +71,18 @@
8371
@endif
8472
</td>
8573
</tr>
74+
<tr>
75+
<td>Memory</td>
76+
<td><code>{{ $server->memory }}MB</code> / <code data-toggle="tooltip" data-placement="top" title="Swap Space">{{ $server->swap }}MB</code></td>
77+
</tr>
78+
<tr>
79+
<td>Disk Space</td>
80+
<td><code>{{ $server->disk }}MB</code></td>
81+
</tr>
82+
<tr>
83+
<td>Block IO Weight</td>
84+
<td><code>{{ $server->io }}</code></td>
85+
</tr>
8686
<tr>
8787
<td>Default Connection</td>
8888
<td><code>{{ $server->allocation->ip }}:{{ $server->allocation->port }}</code></td>

0 commit comments

Comments
 (0)