merge

1 files changed, 22 insertions, 0 deletions

diff --git a/module/web/urls.py b/module/web/urls.py
new file mode 100644
index 000000000..1392b827a
--- /dev/null
+++ b/module/web/urls.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from django.conf.urls.defaults import *
+from django.contrib import admin
+from django.conf import settings
+
+
+admin.autodiscover()
+
+urlpatterns = patterns('',
+                       # Example:
+
+                       # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
+                       # to INSTALLED_APPS to enable admin documentation:
+                       # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+                       (r'^admin/', include(admin.site.urls)), # django 1.0 not working
+                       (r'^json/', include('ajax.urls')),
+                        (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/media/img/favicon.ico'}),
+                        (r'^media/(?P<path>.*)$', 'django.views.static.serve',
+                         {'document_root': settings.MEDIA_ROOT}),
+                       (r'^', include('pyload.urls')),
+                       )