Package: dico / 2.2-8

django_1.5.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
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 <http://www.gnu.org/licenses/>.
 
 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 %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
@@ -9,7 +9,7 @@
 <meta name="description" content="GNU Dico WebSearch Interface" />
 <meta name="robots" content="{{ page.robots }}" />
 <link rel="stylesheet" type="text/css" href="{% media_prefix %}/dicoweb.css" />
-<link rel="search" type="application/opensearchdescription+xml" title="GNU Dico WebSearch" href="{% url opensearch %}" />
+<link rel="search" type="application/opensearchdescription+xml" title="GNU Dico WebSearch" href="{% url 'opensearch' %}" />
 <script type="text/javascript" src="{% media_prefix %}/dicoweb.js"></script>
 </head>
 
@@ -19,7 +19,7 @@
   <tr>
     <td>
       <div id="logo">
-	<h1><a href="{% url views.index %}" accesskey="1">GNU Dico</a></h1>
+	<h1><a href="{% url 'views.index' %}" accesskey="1">GNU Dico</a></h1>
 	<img src="{% media_prefix %}/gnu-head-sm.jpg" width="129" height="122" alt="GNU" />
       </div>
     </td>