Changeset 6183

Timestamp:

Aug 12, 2008, 9:18:51 PM (17 years ago)

Author:

RIck van der Zwet

Message:

Move of static/templates into the package itself

Files:

• README (modified) (2 diffs)
• exodus/static (moved) (moved from static )
• exodus/templates (moved) (moved from templates )
• exodus/templates/README (copied) (copied from templates/exodus/README ) (1 prop)
• exodus/templates/addinterlink.html (copied) (copied from templates/exodus/addinterlink.html ) (1 prop)
• exodus/templates/addlocation.html (copied) (copied from templates/exodus/addlocation.html ) (1 prop)
• exodus/templates/addnic.html (copied) (copied from templates/exodus/addnic.html ) (1 prop)
• exodus/templates/addnode.html (copied) (copied from templates/exodus/addnode.html ) (1 prop)
• exodus/templates/addomni.html (copied) (copied from templates/exodus/addomni.html ) (1 prop)
• exodus/templates/bottom.html (copied) (copied from templates/exodus/bottom.html ) (1 prop)
• exodus/templates/exodus (deleted)
• exodus/templates/head.html (copied) (copied from templates/exodus/head.html ) (1 prop)
• exodus/templates/index.html (copied) (copied from templates/exodus/index.html ) (1 prop)
• exodus/templates/node-detail.html (copied) (copied from templates/exodus/node-detail.html )
• exodus/templates/rc-local.txt (copied) (copied from templates/exodus/rc-local.txt )
• exodus/templates/rc-node-local.txt (copied) (copied from templates/exodus/rc-node-local.txt )
• exodus/templates/test.html (copied) (copied from templates/exodus/test.html ) (1 prop)
• exodus/urls.py (modified) (3 diffs)
• exodus/views.py (modified) (5 diffs)
• sampleserver (moved) (moved from django-conf )
• sampleserver/settings.py.tmpl (modified) (2 diffs)

README

@@ -4 +4 @@
 
 = 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 @@
 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>
 
 

exodus/urls.py

@@ -3 +3 @@
 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 +13 @@
 
         # 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<object_id>\d+)/node/$', 'django.views.generic.list_detail.object_detail', node_dict),
@@ -30 +32 @@
 
         (r'^static/(.*)$', 'django.views.static.serve', {'document_root': 
-         '/Users/rick/svn/wleiden/code/exodus/static'}),
+         settings.DJANGOROOT + '/exodus/static'}),
 )

exodus/views.py

@@ -35 +35 @@
 
     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 +58 @@
 
         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 +96 @@
 
         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 +133 @@
         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 +153 @@
         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})
 
     

sampleserver/settings.py.tmpl

@@ -31 +31 @@
 SITE_ID = 1
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = DJANGOROOT + '/media'
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'l+plhHJKNIkiasdfh12lsk0Lkf,.=+-asdjdknmnaladfasdmnm,90934jknmnsdaf09'
@@ -61 +48 @@
 )
 
-ROOT_URLCONF = 'conf.urls'
+ROOT_URLCONF = 'sampleserver.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates".
     # Always use forward slashes, even on Windows.
-
-   DJANGOROOT + "/templates"
 )