diff --git a/app/templates/user/dashboard.html b/app/templates/user/dashboard.html index e01203b..2ba887b 100644 --- a/app/templates/user/dashboard.html +++ b/app/templates/user/dashboard.html @@ -45,6 +45,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} width: 25%; } + {{super()}} {% endblock %} @@ -287,10 +288,10 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} {{ rev.restarts }} {{ rev.cpu }} {{ (rev.rss / (1024 * 1024)) | round(4, 'floor') }} - {{ rev.input_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4, + {{ (rev.input_streams|sum(attribute='bps') / (1024 * 1024 / 8)) | round(4, 'floor') }} - {{ rev.output_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4, + {{ (rev.output_streams|sum(attribute='bps') / (1024 * 1024 / 8))| round(4, 'floor') }} {{ rev.timestamp - rev.start_time }} @@ -426,11 +427,11 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} {{ vod.restarts }} {{ vod.cpu }} - {{ (rev.rss / (1024 * 1024)) | round(4, 'floor') }} - {{ vod.input_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4, + {{ (vod.rss / (1024 * 1024)) | round(4, 'floor') }} + {{ (vod.input_streams|sum(attribute='bps') / (1024 * 1024 / 8)) | round(4, 'floor')}} - {{ vod.output_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4, + {{ (vod.output_streams|sum(attribute='bps') / (1024 * 1024 / 8)) | round(4, 'floor') }} {{ vod.timestamp - vod.start_time }} @@ -526,12 +527,12 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} for(var i in stream.input_streams) { in_bps += stream.input_streams[i].bps; } - row.eq(7).text(in_bps / (1024 * 1024 / 8)); + row.eq(7).text((in_bps / (1024 * 1024 / 8)).toFixed(4)); var out_bps = 0; for(var i in stream.output_streams) { out_bps += stream.output_streams[i].bps; } - row.eq(8).text(out_bps / (1024 * 1024 / 8)); + row.eq(8).text((out_bps / (1024 * 1024 / 8)).toFixed(4)); row.eq(9).text(stream.timestamp - stream.start_time); row.eq(10).text(stream.timestamp - stream.loop_start_time); }); @@ -815,5 +816,6 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }} + {% endblock %}