From b2962303e919364753495f683bc0488702894939 Mon Sep 17 00:00:00 2001 From: Florian N Date: Sun, 2 Feb 2014 20:41:43 -0500 Subject: [PATCH] changes to jquery calls and clean up --- main/views.py | 1 - pydash/urls.py | 1 + templates/main.html | 36 ++++++++++++++++++++---------------- usage/views.py | 18 ++++++++++++++++++ 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/main/views.py b/main/views.py index 28a2b91..b4d76e9 100755 --- a/main/views.py +++ b/main/views.py @@ -39,7 +39,6 @@ def get_uptime(): except Exception,err: data = str(err) - return data diff --git a/pydash/urls.py b/pydash/urls.py index cd5f510..638c9a8 100644 --- a/pydash/urls.py +++ b/pydash/urls.py @@ -14,6 +14,7 @@ urlpatterns = patterns('', url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'), url(r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'), url(r'^main/$', 'main.views.getall', name='main'), + url(r'^info/uptime/$', 'usage.views.uptime', name='uptime'), url(r'^info/memory/$', 'usage.views.memusage', name='memusage'), url(r'^info/loadaverage/$', 'usage.views.loadaverage', name='loadaverage') ) diff --git a/templates/main.html b/templates/main.html index 544f4f0..c5b65cc 100644 --- a/templates/main.html +++ b/templates/main.html @@ -11,12 +11,13 @@ + {% block style %}{% endblock %}
-
+
pyDash
    {% if request.user.is_authenticated or user.is_authenticated %} @@ -25,7 +26,7 @@ {% trans "Sign in" %} {% endif %}
- @@ -67,8 +68,11 @@

-
- {% include 'general.html' %} +
+ OS: {{ getplatform }}
+ Uptime: {{ uptime }} Hours
+ Hostname: {{ gethostname }}
+

@@ -259,22 +263,21 @@ + diff --git a/usage/views.py b/usage/views.py index 79b033b..98ece6a 100755 --- a/usage/views.py +++ b/usage/views.py @@ -8,6 +8,24 @@ from pydash.settings import TIME_JS_REFRESH time_refresh = TIME_JS_REFRESH +def uptime(request): + """ + Return uptime + """ + if not request.user.is_authenticated(): + return HttpResponseRedirect('/login') + + try: + up_time = get_uptime() + except Exception: + up_time = None + + data = simplejson.dumps(up_time) + response = HttpResponse() + response['Content-Type'] = "text/javascript" + response.write(data) + return response + def cpuusage(request): """ Return CPU Usage in %