diff options
| author | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2008-11-23 22:37:53 +0000 |
|---|---|---|
| committer | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2008-11-23 22:37:53 +0000 |
| commit | 4f3c2faf2844c23167c6b79cc6536b7257356d7b (patch) | |
| tree | 91787bb07bbd3a978430502e97adae7c9fb1bad4 /main/views.py | |
| parent | 6f97020d6b56f19d37a0941b299e68b2e8837d68 (diff) | |
| download | Chimère-4f3c2faf2844c23167c6b79cc6536b7257356d7b.tar.bz2 Chimère-4f3c2faf2844c23167c6b79cc6536b7257356d7b.zip | |
Displaying details differently. Adding a news system.
git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@3 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864
Diffstat (limited to 'main/views.py')
| -rw-r--r-- | main/views.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/main/views.py b/main/views.py index c0503ad..2a1bc14 100644 --- a/main/views.py +++ b/main/views.py @@ -7,12 +7,13 @@ Views of the project import datetime from django.shortcuts import render_to_response +from django.template import loader from django.http import HttpResponseRedirect, HttpResponse from django.core import serializers from chimere import settings from chimere.main.actions import actions -from chimere.main.models import SubCategory, PropertyModel, Marker +from chimere.main.models import SubCategory, PropertyModel, Marker, News from chimere.main.widgets import getMapJS, PointChooserWidget, URL_OSM_JS from chimere.main.forms import MarkerForm @@ -28,11 +29,18 @@ def index(request): extra_js = "" for url in URL_OSM_JS + ["%smain_map.js" % settings.MEDIA_URL]: extra_js += '<script src="%s"></script>\n' % url + extra_js += '<script src="/chimere/jsi18n/"></script>\n' + # show the presentation page + detail_content = '' + if not 'visited' in request.session: + request.session['visited'] = '1' + detail_content = welcome(request) response_dct = {'actions':actions, 'action_selected':'view', 'error_message':'', 'sub_categories':subcategories, 'extra_head':extra_js + getMapJS(), 'media_path':settings.MEDIA_URL, + 'detail_content':detail_content, } return render_to_response('main_map.html', response_dct) @@ -69,6 +77,14 @@ def edit(request): response_dct['current_category'] = int(form.data['subcategory']) return render_to_response('edit.html', response_dct) +def welcome(request): + """ + Welcome string + """ + response_dct = {} + response_dct['news_lst'] = News.objects.filter(available=True) + return loader.render_to_string('welcome.html', response_dct) + def submited(request): """ Successful submission page |
