Changeset 04dab8e

Timestamp:

05/26/11 01:17:37 (2 years ago)

Author:

Tomas Edwardsson <tommi@…>

Branches:

master

Children:

05b0395

Parents:

9caef77

git-author:

Tomas Edwardsson <tommi@…> (05/26/11 01:17:37)

git-committer:

Tomas Edwardsson <tommi@…> (05/26/11 01:17:37)

Message:

Added the addhost wizard and preliminary jquery code.

Location:

adagios

Files:

• configurator/views.py (modified) (2 diffs)
• media/css/style.css (modified) (1 diff)
• templates/configurator/addhost.html (modified) (1 diff)
• urls.py (modified) (1 diff)

adagios/configurator/views.py

@@ -3 +3 @@
 from django.http import HttpResponse, HttpResponseServerError
 from django.utils import simplejson
+
+# For API methods
+import json
+import xml.marshal.generic
 
 from doit import *
@@ -118 +122 @@
                 data = ''
                 if ext == 'xml':
-                        import xml.marshal.generic
                         data = xml.marshal.generic.dumps(c['host'])
+                        mime_type = 'text/xml'
                 elif ext == 'html':
                         return render_to_response('configurator/api/host.html', c)
                 elif ext == 'json':
-                        import json
+                        
                         data = json.dumps(c['host'])
+                        mime_type = 'application/json'
                 else:
                         return HttpResponseServerError("fle")
-                return HttpResponse(data, mimetype='application/javascript')
+                return HttpResponse(data, mimetype=mime_type)
 
         return NotImplementedError
 
-def api_dnslookup(request, host_name=None):
+def api_gethostbyname(request, host_name=None):
         import socket
         
-        raise NotImplementedError
+        host = ''
+        try:
+                host = socket.gethostbyname(host_name)
+        except:
+                pass
+        
+        return HttpResponse(json.dumps({'host': host}), mimetype='application/json') 
 
 

adagios/media/css/style.css

@@ -40 +40 @@
         height: 62px;
         }
+
+#addhost .label {
+        font-weight: bold;
+        width: 180px;
+        float: left;
+}

adagios/templates/configurator/addhost.html

@@ -5 +5 @@
 
 {% block sidebar %} {% endblock %}
-{% block content %}
+
+{% block javascript %}
+
+$(document).ready(function() {
+  $('#hostname').focus();
+});
 
 {% endblock %}
+
+
+{% block content %}
+<div id="addhost">
+<form action="#" method="POST">
+<span class="label">Hostname</span> <input id="hostname" type="text" name="hostname" /><br/>
+<span class="label">Description</span> <input id="description" type="text" name="description" /><br/>
+<span class="label">IP Address</span> <input id="ipaddress" type="text" name="ipaddress" /><br/>
+</form>
+</div>
+
+<script type="text/javascript">                                         
+$('#hostname').blur(function() {
+        if ($('#ipaddress').val() == "") {
+                $.getJSON("/adagios/api/gethostbyname/" + $('#hostname').val(), function(json) {
+                $('#ipaddress').val(json.host);
+                });
+        }
+});
+
+                                 
+    </script>                                                                
+{% endblock %}

adagios/urls.py

@@ -10 +10 @@
     (r'^$', 'configurator.views.home'),
     (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
-    (r'^adagios/api/host/(?P<host_name>.*)\.(?P<ext>.+)$', 'configurator.views.api_host'), 
+    (r'^adagios/api/host/(?P<host_name>.*)\.(?P<ext>.+)$', 'configurator.views.api_host'),
+    (r'^adagios/api/gethostbyname/(?P<host_name>.*)$', 'configurator.views.api_gethostbyname'), 
     (r'^adagios/$', 'configurator.views.index'),
     (r'^adagios/addhost$', 'configurator.views.addhost'),