diff options
Diffstat (limited to 'main/views.py')
| -rw-r--r-- | main/views.py | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/main/views.py b/main/views.py index 04b6919..4fd14f3 100644 --- a/main/views.py +++ b/main/views.py @@ -32,7 +32,7 @@ from chimere import settings from chimere.main.actions import actions from chimere.main.models import SubCategory, PropertyModel, Marker, Route, News from chimere.main.widgets import getMapJS, PointChooserWidget, \ - RouteChooserWidget, URL_OSM_JS + RouteChooserWidget, URL_OSM_JS, URL_OSM_CSS from chimere.main.forms import MarkerForm, RouteForm def index(request): @@ -50,11 +50,14 @@ def index(request): all_checked = False if all_checked: cat.selected = True - extra_js = "" + extra = "" + tab = " "*4 + for url in URL_OSM_CSS: + extra += tab + '<link rel="stylesheet" href="%s" />' % url for url in URL_OSM_JS + ["%sbase.js" % settings.MEDIA_URL, "%smain_map.js" % settings.MEDIA_URL,]: - extra_js += '<script src="%s"></script>\n' % url - extra_js += '<script src="/chimere/jsi18n/"></script>\n' + extra += tab + '<script src="%s"></script>\n' % url + extra += tab + '<script src="/chimere/jsi18n/"></script>\n' # show the welcome page today = datetime.date.today().strftime('%y-%m-%d') display_welcome = None @@ -65,10 +68,23 @@ def index(request): response_dct = {'actions':actions, 'action_selected':'view', 'error_message':'', 'sub_categories':subcategories, - 'extra_head':extra_js + getMapJS(), + 'extra_head':extra + getMapJS(), 'media_path':settings.MEDIA_URL, 'welcome':welcome(request, display_welcome), } + # manage permalink + if request.GET: + for key in ('zoom', 'lon', 'lat', 'display_submited'): + if key in request.GET and request.GET[key]: + response_dct['p_'+key] = request.GET[key] + else: + response_dct['p_'+key] = '""' + if 'checked_categories' in request.GET \ + and request.GET['checked_categories']: + cats = request.GET['checked_categories'].split('_') + response_dct['p_checked_categories'] = ",".join(cats) + else: + response_dct['p_checked_categories'] = ''; return render_to_response('main_map.html', response_dct) def edit(request): |