From 69633a5ed94cb0326cc70dae560239c6f51ee89a Mon Sep 17 00:00:00 2001 From: Alexandr Topilski Date: Thu, 6 Jun 2019 09:40:27 +0300 Subject: [PATCH] Update dashboard.html --- app/templates/user/dashboard.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/templates/user/dashboard.html b/app/templates/user/dashboard.html index 75e8681..bb69cf6 100644 --- a/app/templates/user/dashboard.html +++ b/app/templates/user/dashboard.html @@ -44,10 +44,6 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} th.stream_actions { width: 25%; } - - - - {{super()}} {% endblock %} @@ -401,7 +397,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} {% trans %}Status{% endtrans %} {% trans %}Restarts{% endtrans %} {% trans %}CPU{% endtrans %} - {% trans %}RSS{% endtrans %} + {% trans %}RSS (MB){% endtrans %} {% trans %}In BPS{% endtrans %} {% trans %}Out BPS{% endtrans %} {% trans %}In work time{% endtrans %} @@ -516,7 +512,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} row.eq(3).text(kStatuses[stream.status]); row.eq(4).text(stream.restarts); row.eq(5).text(stream.cpu); - row.eq(6).text(stream.rss); + row.eq(6).text(stream.rss / (1024 * 1024).toFixed(4)); var in_bps = 0; for(var i in stream.input_streams) { in_bps += stream.input_streams[i].bps;