From 1c5c5ea984ea5df97c4b5d343c5830adb96d85e4 Mon Sep 17 00:00:00 2001 From: topilski Date: Wed, 5 Jun 2019 12:35:18 -0400 Subject: [PATCH] Update variables --- app/templates/user/dashboard.html | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/templates/user/dashboard.html b/app/templates/user/dashboard.html index bc62f17..93ccf50 100644 --- a/app/templates/user/dashboard.html +++ b/app/templates/user/dashboard.html @@ -46,6 +46,8 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} } + + {{super()}} {% endblock %} @@ -536,9 +538,9 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} var service_load_average = $('#service_load_average'); service_load_average.text(service.load_average); var service_cpu = $('#service_cpu'); - service_cpu.text(service.cpu); + service_cpu.text(service.cpu + '%'); var service_gpu = $('#service_gpu'); - service_gpu.text(service.gpu); + service_gpu.text(service.gpu + '%'); var service_bandwidth_in = $('#service_bandwidth_in'); service_bandwidth_in.text((service.bandwidth_in / (1024 * 1024 / 8)).toFixed(4) + ' Mbps'); var service_bandwidth_out = $('#service_bandwidth_out'); @@ -549,17 +551,18 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} const kStatuses = ['INIT', 'CONNECTED', 'ACTIVE']; service_status.text(kStatuses[service.status]); var service_memory_total = $('#service_memory_total'); - service_memory_total.text(service.memory_total); + service_memory_total.text(service.memory_total + ' MB'); var service_memory_free = $('#service_memory_free'); - service_memory_free.text(service.memory_free); + service_memory_free.text(service.memory_free + ' MB'); var service_memory_available = $('#service_memory_available'); - service_memory_available.text(service.memory_available); + service_memory_available.text(service.memory_available + ' MB'); var service_hdd_total = $('#service_hdd_total'); - service_hdd_total.text(service.hdd_total); + service_hdd_total.text(service.hdd_total + ' MB'); var service_hdd_free = $('#service_hdd_free'); - service_hdd_free.text(service.hdd_free); + service_hdd_free.text(service.hdd_free + ' MB'); var service_timestamp = $('#service_timestamp'); - service_timestamp.text(service.timestamp); + var current_datetime = new Date(service.timestamp); + service_timestamp.text(current_datetime.toString()); }); // stream function add_stream_entry(url) { @@ -804,5 +807,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} + + {% endblock %}