maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

re-add total-disspace dashboard-display on customer dashboard

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-01-12 16:52:14 +01:00
parent e3f02879cf
commit d4a6ab146d
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customer_index.php
View File

@@ -115,10 +115,14 @@ if ($page == 'overview') {
if ($usages) { if ($usages) {
$userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024; $userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024;
$userinfo['mailspace_used'] = $usages['mail'] * 1024;
$userinfo['dbspace_used'] = $usages['mysql'] * 1024;
$userinfo['total_bytes_used'] = ($usages['webspace'] + $usages['mail'] + $usages['mysql']) * 1024; $userinfo['total_bytes_used'] = ($usages['webspace'] + $usages['mail'] + $usages['mysql']) * 1024;
} else { } else {
$userinfo['diskspace_bytes_used'] = 0; $userinfo['diskspace_bytes_used'] = 0;
$userinfo['total_bytes_used'] = 0; $userinfo['total_bytes_used'] = 0;
$userinfo['mailspace_used'] = 0;
$userinfo['dbspace_used'] = 0;
} }
UI::twig()->addGlobal('userinfo', $userinfo); UI::twig()->addGlobal('userinfo', $userinfo);

4
templates/Froxlor/user/dashboard-item.html.twig
View File

@@ -1,7 +1,7 @@
{% macro ditem(lngstr, available, used, assigned = null, formatbytes = false) %} {% macro ditem(lngstr, available, used, assigned = null, formatbytes = false, byte_usage = null) %}
<div class="col border-end border-bottom p-3"> <div class="col border-end border-bottom p-3">
<div class="row mb-1"> <div class="row mb-1">
<div class="col text-truncate">{{ lng(lngstr) }}</div> <div class="col text-truncate">{{ lng(lngstr) }}{% if byte_usage %} <small>({{ byte_usage|formatBytes }})</small>{% endif %}</div>
<div class="col-auto"> <div class="col-auto">
<small>{% if formatbytes %}{{ used|formatBytes }}{% else %}{{ used }}{% endif %}/{% if available < 0 %}{{ lng('panel.unlimited') }}{% else %}{% if formatbytes %}{{ available|formatBytes }}{% else %}{{ available }}{% endif %}{% endif %}</small> <small>{% if formatbytes %}{{ used|formatBytes }}{% else %}{{ used }}{% endif %}/{% if available < 0 %}{{ lng('panel.unlimited') }}{% else %}{% if formatbytes %}{{ available|formatBytes }}{% else %}{{ available }}{% endif %}{% endif %}</small>
</div> </div>

5
templates/Froxlor/user/index.html.twig
View File

@@ -33,12 +33,13 @@
{% else %} {% else %}
{# customer-resources #} {# customer-resources #}
<div class="row row-cols-1 row-cols-sm-2 row-cols-xl-4 g-0"> <div class="row row-cols-1 row-cols-sm-2 row-cols-xl-4 g-0">
{{ dashboard.ditem('customer.total_diskspace', userinfo.diskspace_bytes, userinfo.total_bytes_used, null, true) }}
{{ dashboard.ditem('customer.diskspace', userinfo.diskspace_bytes, userinfo.diskspace_bytes_used, null, true) }} {{ dashboard.ditem('customer.diskspace', userinfo.diskspace_bytes, userinfo.diskspace_bytes_used, null, true) }}
{{ dashboard.ditem('customer.traffic', userinfo.traffic_bytes, userinfo.traffic_bytes_used, null, true) }} {{ dashboard.ditem('customer.traffic', userinfo.traffic_bytes, userinfo.traffic_bytes_used, null, true) }}
{{ dashboard.ditem('customer.subdomains', userinfo.subdomains, userinfo.subdomains_used) }} {{ dashboard.ditem('customer.subdomains', userinfo.subdomains, userinfo.subdomains_used) }}
{{ dashboard.ditem('customer.mysqls', userinfo.mysqls, userinfo.mysqls_used) }} {{ dashboard.ditem('customer.mysqls', userinfo.mysqls, userinfo.mysqls_used, null, false, userinfo.dbspace_used) }}
{{ dashboard.ditem('customer.emails', userinfo.emails, userinfo.emails_used) }} {{ dashboard.ditem('customer.emails', userinfo.emails, userinfo.emails_used) }}
{{ dashboard.ditem('customer.accounts', userinfo.email_accounts, userinfo.email_accounts_used) }} {{ dashboard.ditem('customer.accounts', userinfo.email_accounts, userinfo.email_accounts_used, null, false, userinfo.mailspace_used) }}
{{ dashboard.ditem('customer.forwarders', userinfo.email_forwarders, userinfo.email_forwarders_used) }} {{ dashboard.ditem('customer.forwarders', userinfo.email_forwarders, userinfo.email_forwarders_used) }}
{{ dashboard.ditem('customer.ftps', userinfo.ftps, userinfo.ftps_used) }} {{ dashboard.ditem('customer.ftps', userinfo.ftps, userinfo.ftps_used) }}
</div> </div>