Skip to content

Commit 7a81c61

Browse files
committed
Wording changes and fix of major fail last commit
1 parent 86e7085 commit 7a81c61

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

app/Http/Controllers/Admin/StatisticsController.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Illuminate\Http\Request;
66
use Illuminate\Support\Facades\DB;
7-
use JavaScript;
87
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
98
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
109
use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
@@ -13,11 +12,11 @@
1312
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
1413
use Pterodactyl\Http\Controllers\Controller;
1514
use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
16-
use Pterodactyl\Traits\Controllers\JavascriptInjection;
15+
use Pterodactyl\Traits\Controllers\JavascriptStatisticsInjection;
1716

1817
class StatisticsController extends Controller
1918
{
20-
use JavascriptInjection;
19+
use JavascriptStatisticsInjection;
2120

2221
private $allocationRepository;
2322

app/Traits/Controllers/JavascriptStatisticsInjection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use JavaScript;
1212

13-
class JavascriptStatisticsInjection
13+
trait JavascriptStatisticsInjection
1414
{
1515

1616
/**

public/themes/pterodactyl/js/admin/statistics.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let diskChart = new Chart($('#disk_chart'), {
55
labels: ['Free Disk', 'Used Disk'],
66
datasets: [
77
{
8-
label: 'Disk in MBs',
8+
label: 'Disk (in MB)',
99
backgroundColor: ['#51B060', '#ff0000'],
1010
data: [freeDisk, Pterodactyl.totalServerDisk]
1111
}
@@ -20,7 +20,7 @@ let ramChart = new Chart($('#ram_chart'), {
2020
labels: ['Free RAM', 'Used RAM'],
2121
datasets: [
2222
{
23-
label: 'RAM in MBs',
23+
label: 'Memory (in MB)',
2424
backgroundColor: ['#51B060', '#ff0000'],
2525
data: [freeRam, Pterodactyl.totalServerRam]
2626
}

resources/themes/pterodactyl/admin/statistics.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
<div class="info-box bg-blue">
4242
<span class="info-box-icon"><i class="ion ion-ios-barcode-outline"></i></span>
4343
<div class="info-box-content number-info-box-content">
44-
<span class="info-box-text">Total used RAM</span>
44+
<span class="info-box-text">Total used Memory (in MB)</span>
4545
<span class="info-box-number">{{ $totalServerRam }}MB</span>
4646
</div>
4747
</div>
4848
<div class="info-box bg-blue">
4949
<span class="info-box-icon"><i class="ion ion-stats-bars"></i></span>
5050
<div class="info-box-content number-info-box-content">
51-
<span class="info-box-text">Total used disk space</span>
51+
<span class="info-box-text">Total used Disk (in MB)</span>
5252
<span class="info-box-number">{{ $totalServerDisk }}MB</span>
5353
</div>
5454
</div>

0 commit comments

Comments
 (0)