changes to jquery calls and clean up

12 years ago · b2962303e9
4 changed files with 39 additions and 17 deletions
--- a/main/views.py
+++ b/main/views.py
@ -39,7 +39,6 @@ def get_uptime():
    
    except Exception,err: 
 	    data =  str(err)
-	    

    return data

--- 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')
 )
--- a/templates/main.html
+++ b/templates/main.html
@ -11,12 +11,13 @@
    <link href="{% static "css/bootstrap-responsive.min.css" %}" rel="stylesheet">
    <link href="{% static "css/dashboard.css" %}" rel="stylesheet">
    <link href="{% static "css/style.css" %}" rel="stylesheet">
+    <link href="{% static "css/odometer.css" %}" rel="stylesheet">
    {% block style %}{% endblock %}
 </head>
 <body>
 <div class="navbar navbar-fixed-top" style="">
    <div class="navbar-inner">
-	<div class="container">
+	<div class="container" id="refresh-home">
            <a class="brand" href="/">pyDash</a>
            <ul class="btn btn-mini">
                {% if request.user.is_authenticated or user.is_authenticated %}
@ -25,7 +26,7 @@
                        <a href="{% url 'login' %}">{% trans "Sign in" %}</a>
                {% endif %}
            </ul>
-            <div class="nav-collapse" id="refresh-home">
+            <div class="nav-collapse">
                        
 	    </div>
        </div>
@ -67,8 +68,11 @@
            <!-- /widget-header -->
            <div class="widget-content">
                <br>
-              <div style="text-align:center;" id="general">
-             {% include 'general.html' %}
+              <div style="text-align:center;">
+		<b>OS:</b> <span class=""></span>{{ getplatform }}<br>
+              	<b>Uptime:</b> <span class="" id="os-uptime"></span>{{ uptime }} Hours<br>
+              	<b>Hostname:</b> <span class=""></span>{{ gethostname }}<br>
+              	<br><br>
              </div>
            </div>
            <!-- /widget-content -->
@ -259,22 +263,21 @@
 <script src="{% static "js/bootstrap.js" %}"></script>
 <script src="{% static "js/jquery.dataTables.min.js" %}"></script>
 <script src="{% static "js/Chart.min.js" %}"></script>
+<script src="{% static "js/odometer.js" %}"></script>
 <script type="text/javascript">
-function refresh() {
-$.ajax({
-  url: '{% url "main" %}',
-  success: function(data) {
-    var dtr = $("#general", data);
-    $('#general').html(dtr);
-        }
-    });
+
+function get_os_data(url, element) {
+    $.get(url, function(data) {
+            $(element).text(data);
+                }, "json");
 }

-$(function(){
-    refresh();
-    window.setInterval('refresh()', {{ time_refresh }});    
-});
+var dashboard = {};

+dashboard.getOs = function() {
+	get_os_data('/info/uptime/', "#os-uptime");
+	}
+	
 var mem_ctx = $("#memoryChart").get(0).getContext("2d");
        var memChart = new Chart(mem_ctx);
        function memory_usage(){
@ -304,6 +307,7 @@ var load_ctx = $("#loadChart").get(0).getContext("2d");
        $(function() {
            window.setInterval('memory_usage()', {{ time_refresh }});
            window.setInterval('load_average()', {{ time_refresh }});
+            window.setInterval('dashboard.getOs()', {{ time_refresh }});
        });
        
 </script>
--- 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 %