From 95d09b338ac7aed2b387bf143a5cfd1c4b29f612 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 15 Dec 2009 17:48:30 +0100 Subject: new Django webinterface(in development), small fixes --- module/web/urls.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 module/web/urls.py (limited to 'module/web/urls.py') diff --git a/module/web/urls.py b/module/web/urls.py new file mode 100644 index 000000000..3e573aa95 --- /dev/null +++ b/module/web/urls.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from django.conf.urls.defaults import * +from django.contrib import admin +from django.conf import settings + +from os.path import join + +admin.autodiscover() + +urlpatterns = patterns('', + # Example: + # (r'^pyload/', include('pyload.foo.urls')), + + # 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')), + + # Uncomment the next line to enable the admin: + (r'^admin/', include(admin.site.urls)), + #(r'^json/', include(ajax.urls)), + (r'^media/(?P.*)$', 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT}), + (r'^login/$', 'django.contrib.auth.views.login', {'template_name': join(settings.TEMPLATE,'login.html')}), + (r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': join(settings.TEMPLATE,'logout.html')}), + (r'^home/$', 'pyload.views.home'), + (r'^downloads/$', 'pyload.views.downloads'), + (r'^queue/$', 'pyload.views.queue'), + (r'^logs/$', 'pyload.views.logs'), + (r'^$', 'pyload.views.home'), + ) -- cgit v1.2.3 From fe85f003f3adfb568c8b1a650035128c183a739d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 16 Dec 2009 17:09:14 +0100 Subject: some Webinterface Json Code --- module/web/urls.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'module/web/urls.py') diff --git a/module/web/urls.py b/module/web/urls.py index 3e573aa95..4f47fc281 100644 --- a/module/web/urls.py +++ b/module/web/urls.py @@ -9,22 +9,15 @@ admin.autodiscover() urlpatterns = patterns('', # Example: - # (r'^pyload/', include('pyload.foo.urls')), # 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')), - # Uncomment the next line to enable the admin: (r'^admin/', include(admin.site.urls)), - #(r'^json/', include(ajax.urls)), + (r'^json/', include('ajax.urls')), + (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/media/img/favicon.ico'}), (r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), - (r'^login/$', 'django.contrib.auth.views.login', {'template_name': join(settings.TEMPLATE,'login.html')}), - (r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': join(settings.TEMPLATE,'logout.html')}), - (r'^home/$', 'pyload.views.home'), - (r'^downloads/$', 'pyload.views.downloads'), - (r'^queue/$', 'pyload.views.queue'), - (r'^logs/$', 'pyload.views.logs'), - (r'^$', 'pyload.views.home'), + (r'^', include('pyload.urls')), ) -- cgit v1.2.3 From ce746b8d0ee022b8926538ceed6ec19d4e3ee8e8 Mon Sep 17 00:00:00 2001 From: Wugy Date: Wed, 16 Dec 2009 22:03:32 +0100 Subject: add some class's --- module/web/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/web/urls.py') diff --git a/module/web/urls.py b/module/web/urls.py index 4f47fc281..6bec8dfba 100644 --- a/module/web/urls.py +++ b/module/web/urls.py @@ -14,7 +14,7 @@ urlpatterns = patterns('', # to INSTALLED_APPS to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^admin/', include(admin.site.urls)), + # (r'^admin/', include(admin.site.urls)), (r'^json/', include('ajax.urls')), (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/media/img/favicon.ico'}), (r'^media/(?P.*)$', 'django.views.static.serve', -- cgit v1.2.3 From 3db583f5f10a72e53ecd8d282ec5db1e3f4cd4dd Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 16 Dec 2009 22:49:20 +0100 Subject: Webinterface authsystem --- module/web/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/web/urls.py') diff --git a/module/web/urls.py b/module/web/urls.py index 6bec8dfba..3d3295efd 100644 --- a/module/web/urls.py +++ b/module/web/urls.py @@ -14,7 +14,7 @@ urlpatterns = patterns('', # to INSTALLED_APPS to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - # (r'^admin/', include(admin.site.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.*)$', 'django.views.static.serve', -- cgit v1.2.3 From 76d7aa1a4586db944353f613a52a790e0d97316b Mon Sep 17 00:00:00 2001 From: Wugy Date: Thu, 17 Dec 2009 22:25:30 +0100 Subject: I have now django 1.1.1 ^^ --- module/web/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/web/urls.py') diff --git a/module/web/urls.py b/module/web/urls.py index 3d3295efd..2145a8dd4 100644 --- a/module/web/urls.py +++ b/module/web/urls.py @@ -14,7 +14,7 @@ urlpatterns = patterns('', # 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'^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.*)$', 'django.views.static.serve', -- cgit v1.2.3 From 1d7dc2ca5db0119e01547cd7b01fb77720450d1c Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 19 Dec 2009 00:26:38 +0100 Subject: cleaned --- module/web/urls.py | 1 - 1 file changed, 1 deletion(-) (limited to 'module/web/urls.py') diff --git a/module/web/urls.py b/module/web/urls.py index 2145a8dd4..1392b827a 100644 --- a/module/web/urls.py +++ b/module/web/urls.py @@ -3,7 +3,6 @@ from django.conf.urls.defaults import * from django.contrib import admin from django.conf import settings -from os.path import join admin.autodiscover() -- cgit v1.2.3