Index: /README =================================================================== --- /README (revision 6182) +++ /README (revision 6183) @@ -4,8 +4,8 @@ = Directory/File layout = -django = general django layout -django/exodus = django/exodus -media = static media files -templates = template files +sampleserver = general django layout +exodus = exodus module +exodus/static = exodus static files +exodus/templates = exodus template files @@ -16,16 +16,14 @@ it as SVNROOT -$ mv $SVNROOT/django/settings.py.tmpl $SVNROOT/django/settings.py -Point the DATABASE_NAME to a empty filename of choice. -change MEDIA_ROOT to $SVNROOT/media -Let template dirs point to: $SVNROOT/templates +$ mv $SVNROOT/sampleserver/settings.py.tmpl $SVNROOT/sampleserver/settings.py +$ Alter DJANGOROOT to match $SVNROOT To create the database: $ cd $SVNROOT -$ ./django-conf/manage.py --pythonpath=`pwd` syncdb +$ ./sampleserver/manage.py --pythonpath=`pwd` syncdb To run the developmentserver do $ cd $SVNROOT -$ ./django-conf/manage.py --pythonpath=`pwd` runserver <8000> +$ ./sampleserver/manage.py --pythonpath=`pwd` runserver <8000> Index: /exodus/static/exodus.css =================================================================== --- /exodus/static/exodus.css (revision 6183) +++ /exodus/static/exodus.css (revision 6183) @@ -0,0 +1,184 @@ +BODY { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 12px; + color : Black; + } + +A { + color : #4471AA; + text-decoration : None; + } + +A.list { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 13px; + background-color : #CAFFFF; + } + +TD { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 12px; + color : Black; + } + +TD.disclaimer { + text-align : center; + } + +TD.title { + font-family : Courier New, Courier, monospace; + font-weight : Bold; + font-size : 24px; + background-color : Black; + line-height : 31 px; + color : White; + text-align : right; + width : 644px; + } + +TD.list { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 13px; + background-color : #CAFFFF; + } + +TD.menu { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + line-height : 20px; + font-size : 16px; + color : White; + background-color : #CA2424; + width : 130px; + } + +TD.menu2 { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 16px; + color : White; + background-image : url("/exodus/static/topmenu.png"); + background-position : bottom; + width : 644px; + height : 25px; + } + +TD.menu2table { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 16px; + color : White; + background-position : bottom; + width : 644px; + height : 25px; + } + +TD.menu2l { + background-image : url("/exodus/static/topmenu_left.png"); + background-position : top; + width : 8px; + height : 25px; + } + +TD.menu2r { + background-image : url("/exodus/static/topmenu_right.png"); + background-position : top; + width : 8px; + height : 25px; + } + +TD.main { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 12px; + background-image : url("/exodus/static/background.png"); + background-position : 0; + width : 644px; + padding-top : 10px; + line-height: 16px; + } + +TD.mainl { + width : 8px; + } + +TD.mainr { + width : 8px; + background-color : #D3E0F1; + } + +TD.right { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 12px; + background-position : 0; + width : 660px; + } + +TD.title { + font-family : Courier New, Courier, monospace; + font-weight : Bold; + background-color : black; + line-height : 31px; + color : White; + text-align : right; + width : 644px; + } + +TD.titlel { + background-color : Black; + line-height : 31px; + width : 8px; + } + +TD.titler { + background-color : Black; + line-height : 31px; + width : 8px; + } + +P.menu { + padding-left : 10px; + } + +P.title { + font-size : 16px; + font-weight : bold; + } + +P.blue { + font-size : 14px; + font-weight : Bold; + color : Black; + background-color : #EECC99; + padding-left : 10px; + padding-right : 10px; + padding-bottom : 2px; + } + +A.menu { + text-decoration : none; + color : White; + background-color : #CA2424; + border-bottom-style : none; + border-bottom-width : 1px; + } + +A.title { + color : white; + background-color: black; + text-decoration : none; + border-bottom-style : none; + border-bottom-width : 1px; + border-bottom-color : #CA2424; + } + +A.menu:HOVER { + color : white; + background-color : #CA2424; + border-bottom-style : solid; + border-bottom-width : 1px; + border-bottom-color : black; + } + +A.disclaimer { + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 9px; + color : #444444; + text-decoration : none; + } Index: /exodus/templates/404.html =================================================================== --- /exodus/templates/404.html (revision 6183) +++ /exodus/templates/404.html (revision 6183) @@ -0,0 +1,12 @@ +{% extends "admin/base-site.html" %} +{% load i18n %} + +{% block title %}{% trans 'Page not found' %}{% endblock %} + +{% block content %} + +

{% trans 'Page not found' %}

+ +

{% trans "We're sorry, but the requested page could not be found." %}

+ +{% endblock %} Index: /exodus/templates/500.html =================================================================== --- /exodus/templates/500.html (revision 6183) +++ /exodus/templates/500.html (revision 6183) @@ -0,0 +1,12 @@ +{% extends "admin/base-site.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% trans "Home" %} › {% trans "Server error" %}
{% endblock %} + +{% block title %}{% trans 'Server error (500)' %}{% endblock %} + +{% block content %} +

{% trans 'Server Error (500)' %}

+

{% trans "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." %}

+ +{% endblock %} Index: /exodus/templates/README =================================================================== --- /exodus/templates/README (revision 6183) +++ /exodus/templates/README (revision 6183) @@ -0,0 +1,7 @@ +This README contains information about the file standard in this template directory + +.html HTML files +.txt TEXT files + +For the exodus txt configuration files contain underscores _, where a dot . is used +for the actual filename . Index: /exodus/templates/addinterlink.html =================================================================== --- /exodus/templates/addinterlink.html (revision 6183) +++ /exodus/templates/addinterlink.html (revision 6183) @@ -0,0 +1,21 @@ +{% extends "exodus-template.html" %} + +{% block content %} + +

add an interlink

+ +
+
+ {{ form1.status }} + {% if form1.status.errors %} *** {{ form1.status.errors|join:", " }}{% endif %} +
+
+ {{ form1.iface }} +
+
+ {{ form2.iface }} +
+ +
+ +{% endblock %} Index: /exodus/templates/addlocation.html =================================================================== --- /exodus/templates/addlocation.html (revision 6183) +++ /exodus/templates/addlocation.html (revision 6183) @@ -0,0 +1,24 @@ +{% extends "exodus-template.html" %} + +{% block content %} +

Create a location

+ + +
+

+ {{ form.description }} + {% if form.description.errors %}*** {{ form.description.errors|join:", " }}{% endif %} +

+

+ {{ form.coordinateX }} + {% if form.coordinateX.errors %}*** {{ form.coordinateX.errors|join:", " }}{% endif %} +

+

+ {{ form.coordinateY }} + {% if form.coordinateY.errors %}*** {{ form.coordinateY.errors|join:", " }}{% endif %} +

+ + +
+ +{% endblock %} Index: /exodus/templates/addnic.html =================================================================== --- /exodus/templates/addnic.html (revision 6183) +++ /exodus/templates/addnic.html (revision 6183) @@ -0,0 +1,34 @@ +{% extends "exodus-template.html" %} + +{% block content %} +

Create a NIC

+ +
+
+ {{ form.node }} + {% if form.node.errors %} *** {{ form.node.errors|join:", " }}{% endif %} +
+
+ {{ form.iface}} + {% if form.iface.errors %} *** {{ form.iface.errors|join:", " }}{% endif %} +
+
+ {{ form.type}} + {% if form.type.errors %} *** {{ form.type.errors|join:", " }}{% endif %} +
+
+ {{ form.antenna }} + {% if form.iface.errors %} *** {{ form.iface.errors|join:", " }}{% endif %} +
+
+ {{ form.polar }} + {% if form.polar.errors %} *** {{ form.polar.errors|join:", " }}{% endif %} +
+
+ {{ form.status }} + {% if form.status.errors %} *** {{ form.status.errors|join:", " }}{% endif %} +
+ +
+ +{% endblock %} Index: /exodus/templates/addnode.html =================================================================== --- /exodus/templates/addnode.html (revision 6183) +++ /exodus/templates/addnode.html (revision 6183) @@ -0,0 +1,26 @@ +{% extends "exodus-template.html" %} + +{% block content %} + +

Create a Node

+ +
+
+ {{ form.name }} + {% if form.name.errors %} *** {{ form.name.errors|join:", " }}{% endif %} +
+
+ {{ form.location}} + {% if form.location.errors %} *** {{ form.location.errors|join:", " }}{% endif %} +
+
+ {{ form.status }} + {% if form.status.errors %} *** {{ form.status.errors|join:", " }}{% endif %} +
+
+ {% if form.masterip.errors %} *** MasterIP {{ form.masterip.errors|join:", " }} {% endif %} +
+ +
+ +{% endblock %} Index: /exodus/templates/addomni.html =================================================================== --- /exodus/templates/addomni.html (revision 6183) +++ /exodus/templates/addomni.html (revision 6183) @@ -0,0 +1,8 @@ +{% extends "exodus-template.html" %} + +{% block content %} +

Add an Omni

+ + Under construction + +{% endblock %} Index: /exodus/templates/bottom.html =================================================================== --- /exodus/templates/bottom.html (revision 6183) +++ /exodus/templates/bottom.html (revision 6183) @@ -0,0 +1,17 @@ + +   + + + + + + + + disclaimer © 2006 +  | top + + + + + + Index: /exodus/templates/exodus-template.html =================================================================== --- /exodus/templates/exodus-template.html (revision 6183) +++ /exodus/templates/exodus-template.html (revision 6183) @@ -0,0 +1,65 @@ + + + + +WirelessLeiden Exodus + + + + + + + + + + + + +
+ logo
+ foto
+   Exodus
+   Node List
+   Add Location
+   Add Node
+   Add NIC
+   Add Interlink
+   Add Omni
+ 		+ + + + + + + + + + + + + + + + + + +
  + WirelessLeiden.NL +  
  + + + + +
Exodus
+ 		 
  +
+ {% block content %} {% endblock %} + 		 
+
+ disclaimer © 2006 +  | top +
+ + + Index: /exodus/templates/head.html =================================================================== --- /exodus/templates/head.html (revision 6183) +++ /exodus/templates/head.html (revision 6183) @@ -0,0 +1,39 @@ + + +HTML test with a menu on the left side + + + + + + + +
+ logo
+ foto
+   Exodus
+ 		+ + + + + + + + + + + + + + +
  + WirelessLeiden.NL +  
  + + + + +
Exodus
+ 		 
  +
Index: /exodus/templates/index.html =================================================================== --- /exodus/templates/index.html (revision 6183) +++ /exodus/templates/index.html (revision 6183) @@ -0,0 +1,16 @@ +{% extends "exodus-template.html" %} + +{% block content %} + +

WirelessLeiden Exodus

+This is the WirelessLeiden Exodus site. Exodus is the next generation configuration +management database for WireslessLeiden. Development is still ongoing since not all +features of Genesis, our current management system, are available in genesis. +More documentation is being written.
+
+ +This site is under construction and not fully operational.
+ +For questions or remarks: roland@wirelessleiden.nl + +{% endblock %} Index: /exodus/templates/node-detail.html =================================================================== --- /exodus/templates/node-detail.html (revision 6183) +++ /exodus/templates/node-detail.html (revision 6183) @@ -0,0 +1,69 @@ +{% extends "exodus-template.html" %} + +{% block content %} +

{{ object.name }}

+ +
+ +Location: {{ object.location.description }}
+X: {{ object.location.coordinateX }}
+Y: {{ object.location.coordinateY }}
+ +Master ip: {{ object.masterip }} + +
+ +

Interfaces

+ +{% for nic in object.nic_set.all %} +

+

iface: {{ nic.iface }}

+status: {{ nic.status }}
+type: {{ nic.type }}
+description: {{ nic.shortdesc }}
+ +{% if nic.ssid %} +SSID: {{ nic.ssid }}
+Channel: {{ nic.channel }}
+Antenna: {{ nic.antenna }}
+Polar: {{ nic.polar }}
+Mode: {{ nic.mode }}
+{% endif %} + +{% for link in nic.link_set.all %} +
    +
  • Description: {{ link.shortdesc }}
    • +
  • IP: {{ link.ip }}/{{ link.linkpool.netmask }}
    • + +
  • LinkPool id: {{ link.linkpool.id }}
    • +
  • Type: {{ link.linkpool.type }} +
      +{% for linknic in link.linkpool.link_set.all %} + {% ifequal linknic.iface.id nic.id %} +
    • {{ linknic.iface.node }}
      • + {% else %} +
    • {{ linknic.iface.node }}
      • + {% endifequal %} +{% endfor %} +
    + +{% if link.linkpool.dhcpstart %} +
  • DHCP {{ link.linkpool.dhcpstart }}-{{ link.linkpool.dhcpstop }}
    • + {% for dhcp in link.linkpool.dhcpstatic_set.all %} +
      +
    • Hostname: {{ dhcp.hostname }}
      • +
    • MacAddress: {{ dhcp.macaddress }}
      • +
    + {% endfor %} +{% endif %} + + + +
+ +{% endfor %} + +

+{% endfor %} + +{% endblock %} Index: /exodus/templates/rc-local.txt =================================================================== --- /exodus/templates/rc-local.txt (revision 6183) +++ /exodus/templates/rc-local.txt (revision 6183) @@ -0,0 +1,20 @@ +# The file is WirelessLeiden specific. Please make all changes in exodus +# +# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} +# by {{ object.host }} +# +# Node: {{ object.name }} +# File: rc.local + +{% for nic in object %} +{% if nic.ssid %} +/usr/sbin/wicontrol -i {{ nic.iface }} -s {{ nic.shortdesc }} # Nickname +/usr/sbin/wicontrol -i {{ nic.iface }} -P 0 # PowerSave +/usr/sbin/wicontrol -i {{ nic.iface }} -Z # Zero SNR cache +/usr/sbin/wicontrol -i {{ nic.iface }} -p {{ nic.wifimode }} # {{ nic.wifidesc }} +/usr/sbin/wicontrol -i {{ nic.iface }} -c 1 # broadcasting essid on +/usr/sbin/wicontrol -i {{ nic.iface }} -n {{ nic.ssid }} # network name +/usr/sbin/wicontrol -i {{ nic.iface }} -q {{ nic.ssid }} # ESSID +/usr/sbin/wicontrol -i {{ nic.iface }} -f {{ nic.channel }} # Channel +{% endif %} +{% endfor %} Index: /exodus/templates/rc-node-local.txt =================================================================== --- /exodus/templates/rc-node-local.txt (revision 6183) +++ /exodus/templates/rc-node-local.txt (revision 6183) @@ -0,0 +1,20 @@ +# The file is WirelessLeiden specific. Please make all changes in exodus +# +# Generated on {{ object.date.day }}-{{ object.date.month }}-{{ object.date.year }} +# by {{ object.host }} +# +# Node: {{ object.name }} +# File: rc.local + +{% for nic in object %} +{% if nic.ssid %} +/usr/sbin/wicontrol -i {{ nic.iface }} -s {{ nic.shortdesc }} # Nickname +/usr/sbin/wicontrol -i {{ nic.iface }} -P 0 # PowerSave +/usr/sbin/wicontrol -i {{ nic.iface }} -Z # Zero SNR cache +/usr/sbin/wicontrol -i {{ nic.iface }} -p {{ nic.wifimode }} # {{ nic.wifidesc }} +/usr/sbin/wicontrol -i {{ nic.iface }} -c 1 # broadcasting essid on +/usr/sbin/wicontrol -i {{ nic.iface }} -n {{ nic.ssid }} # network name +/usr/sbin/wicontrol -i {{ nic.iface }} -q {{ nic.ssid }} # ESSID +/usr/sbin/wicontrol -i {{ nic.iface }} -f {{ nic.channel }} # Channel +{% endif %} +{% endfor %} Index: /exodus/templates/test.html =================================================================== --- /exodus/templates/test.html (revision 6183) +++ /exodus/templates/test.html (revision 6183) @@ -0,0 +1,1 @@ +HEY check if this works Index: /exodus/urls.py =================================================================== --- /exodus/urls.py (revision 6182) +++ /exodus/urls.py (revision 6183) @@ -3,4 +3,6 @@ from django.conf.urls.defaults import * from exodus.models import * +from os import path as os_path +from django.conf import settings node_dict = { @@ -11,5 +13,5 @@ # views - (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'exodus/index.html'}) , + (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'index.html'}) , (r'^nodelist/$', 'django.views.generic.list_detail.object_list', node_dict), (r'^(?P\d+)/node/$', 'django.views.generic.list_detail.object_detail', node_dict), @@ -30,4 +32,4 @@ (r'^static/(.*)$', 'django.views.static.serve', {'document_root': - '/Users/rick/svn/wleiden/code/exodus/static'}), + settings.DJANGOROOT + '/exodus/static'}), ) Index: /exodus/views.py =================================================================== --- /exodus/views.py (revision 6182) +++ /exodus/views.py (revision 6183) @@ -35,5 +35,5 @@ form = forms.FormWrapper(manipulator, new_data, errors) - return render_to_response('exodus/addlocation.html', {'form': form, 'new_data': new_data}) + return render_to_response('addlocation.html', {'form': form, 'new_data': new_data}) def addnode(request): @@ -58,5 +58,5 @@ form = forms.FormWrapper(manipulator, new_data, errors) - return render_to_response('exodus/addnode.html', {'form': form }) + return render_to_response('addnode.html', {'form': form }) def addnic(request): @@ -96,5 +96,5 @@ form = forms.FormWrapper(manipulator, new_data, errors) - return render_to_response('exodus/addnic.html', {'form': form }) + return render_to_response('addnic.html', {'form': form }) def addinterlink(request): @@ -133,5 +133,5 @@ form1 = forms.FormWrapper(link1_manipulator, new_data, errors) form2 = forms.FormWrapper(link2_manipulator, new_data, errors) - return render_to_response('exodus/addinterlink.html',{'form1':form1, 'form2':form2}) + return render_to_response('addinterlink.html',{'form1':form1, 'form2':form2}) def addomni(request): @@ -153,5 +153,5 @@ form1 = forms.FormWrapper(link_manipulator, new_data, errors) form2 = forms.FormWrapper(linkpool_manipulator, new_data, errors) - return render_to_response('exodus/addomni.html',{'form1':form1, 'form2':form2}) + return render_to_response('addomni.html',{'form1':form1, 'form2':form2}) Index: /sampleserver/manage.py =================================================================== --- /sampleserver/manage.py (revision 6183) +++ /sampleserver/manage.py (revision 6183) @@ -0,0 +1,11 @@ +#!/usr/bin/env python +from django.core.management import execute_manager +try: + import settings # Assumed to be in the same directory. +except ImportError: + import sys + sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + sys.exit(1) + +if __name__ == "__main__": + execute_manager(settings) Index: /sampleserver/settings.py.tmpl =================================================================== --- /sampleserver/settings.py.tmpl (revision 6183) +++ /sampleserver/settings.py.tmpl (revision 6183) @@ -0,0 +1,64 @@ +# Django settings for exodus project. + +#Set to +DJANGOROOT = '/Users/rick/svn/wleiden/code/exodus' + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + ('Administrator', 'admin@myinstall.net'), +) + +MANAGERS = ADMINS + +DATABASE_ENGINE = 'sqlite3' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. +DATABASE_NAME = DJANGOROOT + '/sqllite.db' # Or path to database file if using sqlite3. +DATABASE_USER = 'roland' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. +DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. + +# Local time zone for this installation. All choices can be found here: +# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE +TIME_ZONE = 'Europe/Amsterdam' + +# Language code for this installation. All choices can be found here: +# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes +# http://blogs.law.harvard.edu/tech/stories/storyReader$15 +LANGUAGE_CODE = 'en-us' + +SITE_ID = 1 + +# Make this unique, and don't share it with anybody. +SECRET_KEY = 'l+plhHJKNIkiasdfh12lsk0Lkf,.=+-asdjdknmnaladfasdmnm,90934jknmnsdaf09' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.load_template_source', + 'django.template.loaders.app_directories.load_template_source', +# 'django.template.loaders.eggs.load_template_source', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.doc.XViewMiddleware', +) + +ROOT_URLCONF = 'sampleserver.urls' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates". + # Always use forward slashes, even on Windows. +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.admin', + 'exodus', +) Index: /sampleserver/urls.py =================================================================== --- /sampleserver/urls.py (revision 6183) +++ /sampleserver/urls.py (revision 6183) @@ -0,0 +1,8 @@ +# (c) Roland van Laar +from django.conf.urls.defaults import * + +urlpatterns = patterns('', + (r'^exodus/', include('exodus.urls')), + (r'^admin/', include('django.contrib.admin.urls')), + +)