diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-13 11:23:51 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-13 11:23:51 +0100 |
commit | d9403e673086e8bc5a68d65deec3751ed2f261e7 (patch) | |
tree | 14b9098482b5e2636db0ffbae230ec88b2059e4b | |
parent | 946e9655eb363e1de6446d173ee89e176429c36f (diff) | |
parent | 2cb48fb94cbd43226b279f45d87840130ee44236 (diff) | |
download | Chimère-d9403e673086e8bc5a68d65deec3751ed2f261e7.tar.bz2 Chimère-d9403e673086e8bc5a68d65deec3751ed2f261e7.zip |
Merge branch 'master' into carte-ouverte
-rw-r--r-- | chimere/main/views.py | 1 | ||||
-rw-r--r-- | docs/en/INSTALL.t2t | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py index c7a9f87..cb4f595 100644 --- a/chimere/main/views.py +++ b/chimere/main/views.py @@ -201,7 +201,6 @@ def welcome(request, display=None): news += list(Marker.objects.filter(q).all()) news.sort(key=lambda x:x.date, reverse=True) response_dct['news_lst'] = news - n = news[0] return loader.render_to_string('welcome.html', response_dct) def submited(request, area_name="", action=""): diff --git a/docs/en/INSTALL.t2t b/docs/en/INSTALL.t2t index 831b406..2d6bb4b 100644 --- a/docs/en/INSTALL.t2t +++ b/docs/en/INSTALL.t2t @@ -31,7 +31,7 @@ Optionaly (but recommanded): - [tinymce http://tinymce.moxiecode.com/] -The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, python-beautifulsoup, tinymce, apache2, libapache2-mod-python, libgeos-3.2.0, proj, gdal-bin, python-psycopg2, python-imaging, postgresql-8.4 and postgresql-8.4-postgis packages for Debian Squeeze). If these packages do not exist in your distribution's repository, please refer to the applications' websites. +The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, python-beautifulsoup, tinymce, apache2, libapache2-mod-python, libgeos-3.2.0, proj, gdal-bin, python-psycopg2, python-imaging, gettext, postgresql-8.4 and postgresql-8.4-postgis packages for Debian Squeeze). If these packages do not exist in your distribution's repository, please refer to the applications' websites. +++ Database configuration +++ |