diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2018-08-20 18:43:12 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2018-08-20 18:48:27 +0300 |
| commit | 1de27e268432d16c056707e655f38c66c72eec9c (patch) | |
| tree | 7233f6fef0a77b49cb2a9e725325e8dd1a5d695d /dicoweb/templates | |
| parent | db539eeb9979b96b65fad84a9fae6f6946bea867 (diff) | |
| download | dico-1de27e268432d16c056707e655f38c66c72eec9c.tar.gz dico-1de27e268432d16c056707e655f38c66c72eec9c.tar.bz2 | |
dicoweb: Fix Python 3 compatibility
Remove the phased-out "wit" submodule. Use wikitrans instead.
* .gitmodules: Remove the wit submodule
* app/python/wit: Delete
* app/python/mediawiki.py: Use wikitrans.
* app/python/mediawiki2.py: Use wikitrans.
* dicoweb/INSTALL: Update.
* dicoweb/dicoclient/dicoclient.py: Use wikitrans.
Fix python 3 compatibility.
* dicoweb/dicoclient/__init__.py: Fix python 3 compatibility.
* dicoweb/requirements.txt: Rewrite.
* dicoweb/templates/base.html: Likewise.
* dicoweb/templates/index.html: Likewise.
* dicoweb/views.py: Likewise.
* dicoweb/wsgi.virtualenv.py: Remove
* dicoweb/settings-sample.py: Remove deprecated statements.
Diffstat (limited to 'dicoweb/templates')
| -rw-r--r-- | dicoweb/templates/base.html | 4 | ||||
| -rw-r--r-- | dicoweb/templates/index.html | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dicoweb/templates/base.html b/dicoweb/templates/base.html index cd83eb5..680c0b7 100644 --- a/dicoweb/templates/base.html +++ b/dicoweb/templates/base.html @@ -1,4 +1,4 @@ -{% load media %}{% load url from future %} +{% load media %} <!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"> @@ -17,7 +17,7 @@ <body> <div id="wrap"> <div id="logo"> - <h1><a href="{% url 'views.index' %}" accesskey="1">GNU Dico</a></h1> + <h1><a href="{% url 'index' %}" accesskey="1">GNU Dico</a></h1> <img src="{% media_prefix %}gnu-head-sm.jpg" width="129" height="122" alt="GNU" /> </div> <div id="main"> diff --git a/dicoweb/templates/index.html b/dicoweb/templates/index.html index 7f35e3f..5ebb46a 100644 --- a/dicoweb/templates/index.html +++ b/dicoweb/templates/index.html @@ -1,7 +1,6 @@ {% extends 'base.html' %} {% load i18n %} {% load dictlookup %} -{% load firstof from future %} {% block search %} |