diff options
| author | root <root@lalalizard.com> | 2012-11-26 12:05:10 -0500 |
|---|---|---|
| committer | root <root@lalalizard.com> | 2012-11-26 12:05:10 -0500 |
| commit | ddc5b25b4a47ef8175aced9c06fc1767d004e826 (patch) | |
| tree | fb411a446acb541724239568c9a835ee411fe6c6 /scannerjammer | |
| parent | 1b14bc06f91ef1d4835f34cc2f1c9703e61498a5 (diff) | |
Old changes before moving
Diffstat (limited to 'scannerjammer')
| -rw-r--r-- | scannerjammer/settings.py | 3 | ||||
| -rw-r--r-- | scannerjammer/urls.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scannerjammer/settings.py b/scannerjammer/settings.py index 7052c2b..16e9bb4 100644 --- a/scannerjammer/settings.py +++ b/scannerjammer/settings.py @@ -163,5 +163,6 @@ AUTH_PROFILE_MODULE = 'backend.SJUserProfile' from datetime import datetime START_TIME = datetime.now() -SERVER_HOST = 'http://localhost' +#SERVER_HOST = 'http://localhost' +SERVER_HOST = 'http://lalalizard.com' SERVER_PORT = 8000 diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py index faab874..ce6d674 100644 --- a/scannerjammer/urls.py +++ b/scannerjammer/urls.py @@ -1,4 +1,5 @@ from django.conf.urls import patterns, include, url +from django.contrib.staticfiles.urls import staticfiles_urlpatterns # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -19,7 +20,10 @@ urlpatterns = patterns('', url(r'^api/', include('backend.urls')), # Frontend - url(r'^backgrounds/', 'frontend.views.bg', name='bg'), + url(r'^backgrounds/$', 'frontend.views.bg', name='bg'), + url(r'^top/$', 'frontend.views.topvideos', name='topvideos'), #url(r'.*', 'backend.views.redirect'), ) + +urlpatterns += staticfiles_urlpatterns() |