From 4c40fb05779c91d0f3456b976af15df8072e1661 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 15 Feb 2022 09:00:38 +0100 Subject: [PATCH] Changed About page --- maloja/web/jinja/about.jinja | 41 +++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/maloja/web/jinja/about.jinja b/maloja/web/jinja/about.jinja index 589dec1..0959be7 100644 --- a/maloja/web/jinja/about.jinja +++ b/maloja/web/jinja/about.jinja @@ -12,18 +12,24 @@

Maloja


- Version {{ pkginfo.VERSION }} + Version {{ pkginfo.VERSION }}
+ {# {% if adminmode %} + Python {{ platform.sys.version }}
+ {{ platform.system() }} {{ platform.release() }} ({{ platform.machine() }})
+
+ {% set pid = psutil.os.getpid() %} + {% set proc = psutil.Process(pid) %} + CPU: + {{ proc.cpu_percent() | int }}% Maloja, + {{ (psutil.getloadavg()[2]/psutil.os.cpu_count() * 100) | int }}% System +
+ RAM: + {{ (proc.memory_info().rss / (1024*1024)) | int }}MB Maloja ({{ proc.memory_percent() | int }}%), + {{ (psutil.virtual_memory().used / (1024*1024)) | int }}MB System ({{ psutil.virtual_memory().percent | int }}%) + {% endif %} #}

- - - - - - - - - +

@@ -31,4 +37,19 @@ + +Get your own Maloja server: +

+ + + + + + + + + +

+Maloja is released under the GNU General Public License v3.0. + {% endblock %}