Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 17:12:30 +01:00
Code Issues Releases Wiki Activity

Wording changes and fix of major fail last commit

Browse Source
This commit is contained in:
stanjg 2018-05-26 21:02:47 +02:00
parent 86e7085396
commit 7a81c61ad8
No known key found for this signature in database
GPG Key ID: 27D9DF9D28935303
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Admin/StatisticsController.php
View File

@ -4,7 +4,6 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use JavaScript;
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface; use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface; use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\EggRepositoryInterface; use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
@ -13,11 +12,11 @@ use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface; use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService; use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
use Pterodactyl\Traits\Controllers\JavascriptInjection; use Pterodactyl\Traits\Controllers\JavascriptStatisticsInjection;
class StatisticsController extends Controller class StatisticsController extends Controller
{ {
use JavascriptInjection; use JavascriptStatisticsInjection;
private $allocationRepository; private $allocationRepository;

2
app/Traits/Controllers/JavascriptStatisticsInjection.php
View File

@ -10,7 +10,7 @@ namespace Pterodactyl\Traits\Controllers;
use JavaScript; use JavaScript;
class JavascriptStatisticsInjection trait JavascriptStatisticsInjection
{ {
/** /**

4
public/themes/pterodactyl/js/admin/statistics.js
View File

@ -5,7 +5,7 @@ let diskChart = new Chart($('#disk_chart'), {
labels: ['Free Disk', 'Used Disk'], labels: ['Free Disk', 'Used Disk'],
datasets: [ datasets: [
{ {
label: 'Disk in MBs', label: 'Disk (in MB)',
backgroundColor: ['#51B060', '#ff0000'], backgroundColor: ['#51B060', '#ff0000'],
data: [freeDisk, Pterodactyl.totalServerDisk] data: [freeDisk, Pterodactyl.totalServerDisk]
} }
@ -20,7 +20,7 @@ let ramChart = new Chart($('#ram_chart'), {
labels: ['Free RAM', 'Used RAM'], labels: ['Free RAM', 'Used RAM'],
datasets: [ datasets: [
{ {
label: 'RAM in MBs', label: 'Memory (in MB)',
backgroundColor: ['#51B060', '#ff0000'], backgroundColor: ['#51B060', '#ff0000'],
data: [freeRam, Pterodactyl.totalServerRam] data: [freeRam, Pterodactyl.totalServerRam]
} }

4
resources/themes/pterodactyl/admin/statistics.blade.php
View File

@ -41,14 +41,14 @@
<div class="info-box bg-blue"> <div class="info-box bg-blue">
<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 number-info-box-content"> <div class="info-box-content number-info-box-content">
<span class="info-box-text">Total used RAM</span> <span class="info-box-text">Total used Memory (in MB)</span>
<span class="info-box-number">{{ $totalServerRam }}MB</span> <span class="info-box-number">{{ $totalServerRam }}MB</span>
</div> </div>
</div> </div>
<div class="info-box bg-blue"> <div class="info-box bg-blue">
<span class="info-box-icon"><i class="ion ion-stats-bars"></i></span> <span class="info-box-icon"><i class="ion ion-stats-bars"></i></span>
<div class="info-box-content number-info-box-content"> <div class="info-box-content number-info-box-content">
<span class="info-box-text">Total used disk space</span> <span class="info-box-text">Total used Disk (in MB)</span>
<span class="info-box-number">{{ $totalServerDisk }}MB</span> <span class="info-box-number">{{ $totalServerDisk }}MB</span>
</div> </div>
</div> </div>