Index: conf/exodus/urls.py =================================================================== --- django/exodus/urls.py (revision 6178) +++ conf/exodus/urls.py (revision 6179) @@ -2,5 +2,5 @@ from django.conf.urls.defaults import * -from django_exodus.exodus_01.models import * +from conf.exodus.models import * node_dict = { @@ -11,20 +11,23 @@ # views - (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'exodus_01/index.html'}) , + (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'exodus/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), # config urls - (r'^(?P\d+)/dhcp.conf/$', 'django_exodus.exodus_01.views.conf_dhcp_conf'), - (r'^(?P\d+)/named.conf/$', 'django_exodus.exodus_01.views.conf_named_conf'), - (r'^(?P\d+)/rc.node.local/$', 'django_exodus.exodus_01.views.conf_rc_node_local'), - (r'^(?P\d+)/resolv.conf/$', 'django_exodus.exodus_01.views.conf_resolv_conf'), + (r'^(?P\d+)/dhcp.conf/$', 'conf.exodus.views.conf_dhcp_conf'), + (r'^(?P\d+)/named.conf/$', 'conf.exodus.views.conf_named_conf'), + (r'^(?P\d+)/rc.node.local/$', 'conf.exodus.views.conf_rc_node_local'), + (r'^(?P\d+)/resolv.conf/$', 'conf.exodus.views.conf_resolv_conf'), # add urls - (r'^addlocation/$', 'django_exodus.exodus_01.views.addlocation'), - (r'^addnode/$', 'django_exodus.exodus_01.views.addnode'), - (r'^addnic/$', 'django_exodus.exodus_01.views.addnic'), - (r'^addinterlink/$', 'django_exodus.exodus_01.views.addinterlink'), - (r'^addomni/$', 'django_exodus.exodus_01.views.addomni') + (r'^addlocation/$', 'conf.exodus.views.addlocation'), + (r'^addnode/$', 'conf.exodus.views.addnode'), + (r'^addnic/$', 'conf.exodus.views.addnic'), + (r'^addinterlink/$', 'conf.exodus.views.addinterlink'), + (r'^addomni/$', 'conf.exodus.views.addomni'), + + (r'^static/(.*)$', 'django.views.static.serve', {'document_root': + '/Users/rick/svn/wleiden/code/exodus/static'}), ) Index: conf/exodus/views.py =================================================================== --- django/exodus/views.py (revision 6178) +++ conf/exodus/views.py (revision 6179) @@ -8,6 +8,6 @@ from socket import gethostname -from django_exodus.exodus_01.models import NIC, Node, Location, Link, LinkPool -from django_exodus.exodus_01.wllogic import freemasterip, newssidname +from conf.exodus.models import NIC, Node, Location, Link, LinkPool +from conf.exodus.wllogic import freemasterip, newssidname def addlocation(request): @@ -29,5 +29,5 @@ new_place = manipulator.save(new_data) - return HttpResponseRedirect("/exodus_01/") + return HttpResponseRedirect("/exodus/") else: @@ -35,5 +35,5 @@ form = forms.FormWrapper(manipulator, new_data, errors) - return render_to_response('exodus_01/addlocation.html', {'form': form, 'new_data': new_data}) + return render_to_response('exodus/addlocation.html', {'form': form, 'new_data': new_data}) def addnode(request): @@ -52,5 +52,5 @@ new_place = manipulator.save(new_data) - return HttpResponseRedirect("/exodus_01/") + return HttpResponseRedirect("/exodus/") else: @@ -58,5 +58,5 @@ form = forms.FormWrapper(manipulator, new_data, errors) - return render_to_response('exodus_01/addnode.html', {'form': form }) + return render_to_response('exodus/addnode.html', {'form': form }) def addnic(request): @@ -90,5 +90,5 @@ new_place = manipulator.save(new_data) - return HttpResponseRedirect("/exodus_01/") + return HttpResponseRedirect("/exodus/") else: @@ -96,5 +96,5 @@ form = forms.FormWrapper(manipulator, new_data, errors) - return render_to_response('exodus_01/addnic.html', {'form': form }) + return render_to_response('exodus/addnic.html', {'form': form }) def addinterlink(request): @@ -126,5 +126,5 @@ link1_manipulator.do_html2python(new_data) - return HttpResponseRedirect("/exodus_01/") + return HttpResponseRedirect("/exodus/") else: @@ -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_01/addinterlink.html',{'form1':form1, 'form2':form2}) + return render_to_response('exodus/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_01/addomni.html',{'form1':form1, 'form2':form2}) + return render_to_response('exodus/addomni.html',{'form1':form1, 'form2':form2}) @@ -173,5 +173,5 @@ nic.wifimode = 1 nic.wifidesc = 'managed mode' - t = loader.get_template('exodus_01/rc_local.txt') + t = loader.get_template('exodus/rc_local.txt') c = Context({'object': object, }) @@ -185,5 +185,5 @@ object.host = gethostname() - t = loader.get_template('exodus_01/rc_node_local.txt') + t = loader.get_template('exodus/rc_node_local.txt') c = Context({'object': object, }) @@ -198,5 +198,5 @@ object.host = gethostname() - t = loader.get_template('exodus_01/rc_node_local.txt') + t = loader.get_template('exodus/rc_node_local.txt') c = Context({'object': object, }) @@ -223,5 +223,5 @@ print "boek" - t = loader.get_template('exodus_01/rc_node_local.txt') + t = loader.get_template('exodus/rc_node_local.txt') c = Context({'object': object, }) Index: conf/exodus/wllogic.py =================================================================== --- django/exodus/wllogic.py (revision 6178) +++ conf/exodus/wllogic.py (revision 6179) @@ -1,5 +1,5 @@ # (c) Roland van Laar -from django_exodus.exodus_01.models import Node, Network +from conf.exodus.models import Node, Network def newssidname(node,desc): Index: conf/urls.py =================================================================== --- django/urls.py (revision 6178) +++ conf/urls.py (revision 6179) @@ -3,7 +3,5 @@ urlpatterns = patterns('', - (r'^exodus/', include('django.exodus.urls')), - (r'^site_media/(.*)$', 'django.views.static.serve', {'document_root': - '/Users/roland/WL/exodus/django_media'}), + (r'^exodus/', include('conf.exodus.urls')), (r'^admin/', include('django.contrib.admin.urls')),