diff options
| -rw-r--r-- | chimere/forms.py | 8 | ||||
| -rw-r--r-- | chimere/models.py | 5 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/submited.html | 7 | ||||
| -rw-r--r-- | chimere/views.py | 15 | ||||
| -rw-r--r-- | chimere/widgets.py | 13 |
6 files changed, 27 insertions, 23 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 52e727c..c88b8df 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -30,7 +30,8 @@ from django.core.mail import EmailMessage, BadHeaderError from chimere.models import Marker, Route, PropertyModel, Property, Area,\ News, Category, SubCategory, RouteFile -from chimere.widgets import AreaField, PointField, TextareaWidget +from chimere.widgets import AreaField, PointField, TextareaWidget, \ + DatePickerWidget from datetime import timedelta, datetime, tzinfo @@ -123,8 +124,8 @@ class MarkerAdminFormBase(forms.ModelForm): keys['initial'] = property_dct super(MarkerAdminFormBase, self).__init__(*args, **keys) if settings.CHIMERE_DAYS_BEFORE_EVENT: - self.fields['start_date'].widget = AdminDateWidget() - self.fields['end_date'].widget = AdminDateWidget() + self.fields['start_date'].widget = DatePickerWidget() + self.fields['end_date'].widget = DatePickerWidget() def clean(self): ''' @@ -132,6 +133,7 @@ class MarkerAdminFormBase(forms.ModelForm): ''' if not settings.CHIMERE_DAYS_BEFORE_EVENT: return self.cleaned_data + print self.cleaned_data if self.cleaned_data['end_date'] and \ not self.cleaned_data['start_date']: msg = _(u"End date has been set with no start date") diff --git a/chimere/models.py b/chimere/models.py index d4d206a..149cc64 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -208,11 +208,10 @@ class Marker(models.Model): status = models.CharField(_(u"Status"), max_length=1, choices=STATUS) if settings.CHIMERE_DAYS_BEFORE_EVENT: start_date = models.DateField(_(u"Start date"), blank=True, null=True, - help_text=_(u"Not mandatory. Set it for dated item such as event. "\ - u"Format YYYY-MM-DD")) + help_text=_(u"Not mandatory. Set it for dated item such as event.")) end_date = models.DateField(_(u"End date"), blank=True, null=True, help_text=_(u"Not mandatory. Set it only if you have a multi-day "\ - u"event. Format YYYY-MM-DD")) + u"event.")) if 'chimere_rss' in settings.INSTALLED_APPS: available_date = models.DateTimeField(_(u"Available Date"), blank=True, null=True) diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index bd38a70..f75fa78 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2010 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +/* Copyright (C) 2008-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/chimere/templates/chimere/submited.html b/chimere/templates/chimere/submited.html index 8d9179b..7288b8d 100644 --- a/chimere/templates/chimere/submited.html +++ b/chimere/templates/chimere/submited.html @@ -1,5 +1,10 @@ {% extends "chimere/base.html" %} -{% load i18n %} +{% load i18n chimere_tags %} +{% block extra_head %} + {{ block.super }} + {{ form.media }} + {% head_jquery %} +{% endblock %} {% block message_map %}{% endblock %} {% block content %} {{ block.super }} diff --git a/chimere/views.py b/chimere/views.py index 6f71908..bb3e5b2 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -93,21 +93,6 @@ def index(request, area_name=None, default_area=None, simple=False): 'map_layer':settings.CHIMERE_MAP_LAYER, 'dynamic_categories':settings.CHIMERE_DYNAMIC_CATEGORIES, }) - # manage permalink - """" # à tester - if request.GET: - for key in ('zoom', 'lon', 'lat', 'display_submited', - 'current_feature'): - if key in request.GET and request.GET[key]: - response_dct['p_'+key] = request.GET[key] - else: - response_dct['p_'+key] = None - 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'] = ''""" tpl = 'chimere/main_map.html' if simple: tpl = 'chimere/main_map_simple.html' diff --git a/chimere/widgets.py b/chimere/widgets.py index b12ea97..551610a 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -63,6 +63,19 @@ class TextareaWidget(forms.Textarea): js = ["%stiny_mce.js" % settings.TINYMCE_URL, "%schimere/js/textareas.js" % settings.STATIC_URL,] +class DatePickerWidget(forms.TextInput): + """ + Manage the edition of dates. + JQuery and Jquery-UI are already loaded by default so don't include + them in Media files. + """ + def render(self, *args, **kwargs): + rendered = super(DatePickerWidget, self).render(*args, **kwargs) + rendered += u"\n<script type='text/javascript'>\n"\ + u" $('#%s').datepicker();\n"\ + u"</script>\n" % kwargs['attrs']['id'] + return mark_safe(rendered) + class PointChooserWidget(forms.TextInput): """ Manage the edition of point on a map |