Description: Support Django 1.5 Origin: http://git.gnu.org.ua/cgit/dico.git/commit/?id=11de8715829bd3744de9542dd77a6d658ba519d8 Bug-Debian: http://bugs.debian.org/730488 --- a/dicoweb/urls.py +++ b/dicoweb/urls.py @@ -15,7 +15,7 @@ # along with GNU Dico. If not, see . from django.conf import settings -from django.conf.urls.defaults import * +from django.conf.urls import patterns import views urlpatterns = patterns ( --- a/dicoweb/settings-sample.py +++ b/dicoweb/settings-sample.py @@ -54,7 +54,7 @@ MEDIA_ROOT = os.path.join (SITE_ROOT, 'static') # URL that handles the media served from MEDIA_ROOT. -MEDIA_URL = 'static' +MEDIA_URL = '/static/' # Make this unique, and don't share it with anybody. SECRET_KEY = 'SET THIS TO A RANDOM STRING' --- a/dicoweb/templates/base.html +++ b/dicoweb/templates/base.html @@ -1,4 +1,4 @@ -{% load media %} +{% load media %}{% load url from future %} @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@