summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stapp/urls.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/stapp/urls.py b/stapp/urls.py
index f9e9bb9..3748bae 100644
--- a/stapp/urls.py
+++ b/stapp/urls.py
@@ -1,4 +1,3 @@
-
from django.conf.urls.defaults import *
from django.conf import settings
@@ -7,19 +6,10 @@ from django.contrib import admin
from video.views import *
admin.autodiscover()
-from settings import URL_ROOT
-
-if URL_ROOT.startswith('/'):
- URL_BASE = r'^%s/video/'%URL_ROOT[1:]
- ADMIN_BASE = r'^%s/admin/'%URL_ROOT[1:]
-else:
- URL_BASE = r'^video/'
- ADMIN_BASE = r'^admin/'
-
urlpatterns = patterns('',
- url(URL_BASE, include('video.urls')),
- url(ADMIN_BASE, include(admin.site.urls)),
+ url(r'^video/', include('video.urls')),
+ url(r'^admin/', include(admin.site.urls)),
)
if settings.DEBUG: