From 7daf6e2e93c2989b278199687bfaeae7d126d0a1 Mon Sep 17 00:00:00 2001
From: AreYouScared <sir3lit@gmail.com>
Date: Fri, 10 Apr 2020 00:54:40 -0400
Subject: [PATCH] Uniformity is Key

Updated logical order to match new server page on build and overview page.
---
 .../views/admin/servers/view/build.blade.php  | 38 +++++++++----------
 .../views/admin/servers/view/index.blade.php  | 24 ++++++------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/resources/views/admin/servers/view/build.blade.php b/resources/views/admin/servers/view/build.blade.php
index bb55d6b18..e4bbd584c 100644
--- a/resources/views/admin/servers/view/build.blade.php
+++ b/resources/views/admin/servers/view/build.blade.php
@@ -29,6 +29,21 @@
                     <h3 class="box-title">Resource Management</h3>
                 </div>
                 <div class="box-body">
+                <div class="form-group">
+                        <label for="cpu" class="control-label">CPU Limit</label>
+                        <div class="input-group">
+                            <input type="text" name="cpu" class="form-control" value="{{ old('cpu', $server->cpu) }}"/>
+                            <span class="input-group-addon">%</span>
+                        </div>
+                        <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>
+                    </div>
+                    <div class="form-group">
+                        <label for="threads" class="control-label">CPU Threads</label>
+                        <div>
+                            <input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
+                        </div>
+                        <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>
+                    </div>
                     <div class="form-group">
                         <label for="memory" class="control-label">Allocated Memory</label>
                         <div class="input-group">
@@ -46,19 +61,12 @@
                         <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 class="form-group">
-                        <label for="cpu" class="control-label">CPU Limit</label>
+                        <label for="cpu" class="control-label">Disk Space Limit</label>
                         <div class="input-group">
-                            <input type="text" name="cpu" class="form-control" value="{{ old('cpu', $server->cpu) }}"/>
-                            <span class="input-group-addon">%</span>
+                            <input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
+                            <span class="input-group-addon">MB</span>
                         </div>
-                        <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>
-                    </div>
-                    <div class="form-group">
-                        <label for="threads" class="control-label">CPU Threads</label>
-                        <div>
-                            <input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
-                        </div>
-                        <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>
+                        <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>
                     </div>
                     <div class="form-group">
                         <label for="io" class="control-label">Block IO Proportion</label>
@@ -67,14 +75,6 @@
                         </div>
                         <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>
                     </div>
-                    <div class="form-group">
-                        <label for="cpu" class="control-label">Disk Space Limit</label>
-                        <div class="input-group">
-                            <input type="text" name="disk" class="form-control" value="{{ old('disk', $server->disk) }}"/>
-                            <span class="input-group-addon">MB</span>
-                        </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.</p>
-                    </div>
                     <div class="form-group">
                         <label for="cpu" class="control-label">OOM Killer</label>
                         <div>
diff --git a/resources/views/admin/servers/view/index.blade.php b/resources/views/admin/servers/view/index.blade.php
index eccecba70..23c8e42e0 100644
--- a/resources/views/admin/servers/view/index.blade.php
+++ b/resources/views/admin/servers/view/index.blade.php
@@ -57,18 +57,6 @@
                                 <td>Name</td>
                                 <td>{{ $server->name }}</td>
                             </tr>
-                            <tr>
-                                <td>Memory</td>
-                                <td><code>{{ $server->memory }}MB</code> / <code data-toggle="tooltip" data-placement="top" title="Swap Space">{{ $server->swap }}MB</code></td>
-                            </tr>
-                            <tr>
-                                <td>Disk Space</td>
-                                <td><code>{{ $server->disk }}MB</code></td>
-                            </tr>
-                            <tr>
-                                <td>Block IO Weight</td>
-                                <td><code>{{ $server->io }}</code></td>
-                            </tr>
                             <tr>
                                 <td>CPU Limit</td>
                                 <td><code>{{ $server->cpu }}%</code></td>
@@ -83,6 +71,18 @@
                                     @endif
                                 </td>
                             </tr>
+                            <tr>
+                                <td>Memory</td>
+                                <td><code>{{ $server->memory }}MB</code> / <code data-toggle="tooltip" data-placement="top" title="Swap Space">{{ $server->swap }}MB</code></td>
+                            </tr>
+                            <tr>
+                                <td>Disk Space</td>
+                                <td><code>{{ $server->disk }}MB</code></td>
+                            </tr>
+                            <tr>
+                                <td>Block IO Weight</td>
+                                <td><code>{{ $server->io }}</code></td>
+                            </tr>
                             <tr>
                                 <td>Default Connection</td>
                                 <td><code>{{ $server->allocation->ip }}:{{ $server->allocation->port }}</code></td>