widget calendrier moins intrusif

diff --git a/auf_savoirs_en_partage/savoirs/forms.py b/auf_savoirs_en_partage/savoirs/forms.py
index 5568cea..8cc2bf3 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/forms.py
+++ b/auf_savoirs_en_partage/savoirs/forms.py
@@ -7,6 +7,7 @@ from datamaster_modeles.models import Thematique, Pays, Region
 from models import Evenement, Discipline, Record, Actualite
 from savoirs.lib.recherche import build_search_regexp
 from savoirs.admin import EvenementAdminForm
+import settings
 
 # Formulaires de recherche
 
@@ -112,8 +113,12 @@ class EvenementSearchForm(forms.Form):
 
 class FrontEndSplitDateTime(widgets.AdminSplitDateTime):
     class Media:
-        extends=True
-        js = ('js/calendrier.js', )
+        extend=False
+        js = ("/admin/jsi18n/",
+              settings.ADMIN_MEDIA_PREFIX + "js/core.js",
+              settings.ADMIN_MEDIA_PREFIX + "js/calendar.js",
+              settings.ADMIN_MEDIA_PREFIX + "js/admin/DateTimeShortcuts.js",
+              'js/calendrier.js', )
         css = {'all' : ('css/calendrier.css', )}
 
 class EvenementForm(EvenementAdminForm):

diff --git a/auf_savoirs_en_partage/templates/savoirs/evenement_ajout.html b/auf_savoirs_en_partage/templates/savoirs/evenement_ajout.html
index 8dc8ddf..11888ea 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/evenement_ajout.html
+++ b/auf_savoirs_en_partage/templates/savoirs/evenement_ajout.html
@@ -1,8 +1,6 @@
 {% extends "container_base.html" %}
 
 {% block extra-script %}
-    <script type="text/javascript" src="/admin/jsi18n/"></script>
-    <script type="text/javascript" src="/admin_media/js/core.js"></script>
     {{ form.media.js }}
 {% endblock %}