diff --git a/pyweb/__init__.py b/pyweb/__init__.py index 06095bc..b32b552 100644 --- a/pyweb/__init__.py +++ b/pyweb/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ * Copyright (C) 2009, Michael "Svedrin" Ziegler * @@ -22,7 +23,6 @@ def update_paths( **kwargs ): pf = get_script_prefix(); settings.MEDIA_URL = "%sstatic" % pf; settings.ADMIN_MEDIA_PREFIX = "%smedia" % pf; - settings.LOGIN_URL = reverse( "django.contrib.auth.views.login" ); signals.request_started.disconnect( update_paths ); signals.request_started.connect( update_paths ); diff --git a/pyweb/deferred_resolver.py b/pyweb/deferred_resolver.py new file mode 100644 index 0000000..fc62bad --- /dev/null +++ b/pyweb/deferred_resolver.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- + +""" + * Copyright (C) 2009, Michael "Svedrin" Ziegler + * + * Mumble-Django is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This package is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. +""" + +class ViewResolver( object ): + def __init__( self, string, *args, **kwargs ): + self._string = string; + self._args = args; + self._kwargs = kwargs; + + def __str__( self ): + from django.core.urlresolvers import reverse + return reverse( self._string, *self._args, **self._kwargs ); + + def __add__( self, other ): + return str( self ) + other; diff --git a/pyweb/settings.py b/pyweb/settings.py index 84bd6a3..5fddeef 100644 --- a/pyweb/settings.py +++ b/pyweb/settings.py @@ -29,10 +29,6 @@ MUMBLE_DJANGO_ROOT = None; ## #MUMBLE_DJANGO_ROOT = '/home/mistagee/mumble-django'; ## #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django'; ## ## ## -## Root URL (the path in the VirtualHost: ## -MUMBLE_DJANGO_URL = '/'; ## -#MUMBLE_DJANGO_URL = '/mumble-django/'; ## -## ## ## For a basic installation, this is all you need to edit in ## ## this file, the rest will be handled automatically! ## ## ## @@ -120,13 +116,14 @@ USE_I18N = True MEDIA_ROOT = join( MUMBLE_DJANGO_ROOT, 'htdocs' ) # URL that handles the media served from MEDIA_ROOT. -MEDIA_URL = MUMBLE_DJANGO_URL+'static/' +MEDIA_URL = '/static/' # URL to the login view -LOGIN_URL = MUMBLE_DJANGO_URL+'accounts/login/' +from deferred_resolver import ViewResolver +LOGIN_URL = ViewResolver( "django.contrib.auth.views.login" ) # URL prefix for admin media -- CSS, JavaScript and images. -ADMIN_MEDIA_PREFIX = MUMBLE_DJANGO_URL+'media/' +ADMIN_MEDIA_PREFIX = '/media/' # Make this unique, and don't share it with anybody. SECRET_KEY = 'u-mp185msk#z4%s(do2^5405)y5d!9adbn92)apu_p^qvqh10v'