use normal popup for add diffusion form

diff --git a/emissions/templates/emissions/diffusion_form.html b/emissions/templates/emissions/diffusion_form.html
new file mode 100644 (file)
index 0000000..0f04087
--- /dev/null
+++ b/emissions/templates/emissions/diffusion_form.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+
+{% block appbar %}
+<h2>Ajouter une diffusion</h2>
+{% endblock %}
+
+{% block content %}
+    <form method="post">
+      <div id="form-content">
+        {% csrf_token %}
+        {{ form.as_p }}
+      </div>
+      {% block buttons %}
+      <div class="buttons">
+      <button class="enable-on-change">Ajouter cet horaire</button>
+      <a class="cancel" href=".">Annuler</a>
+      </div>
+      {% endblock %}
+    </form>
+{% endblock %}
+

diff --git a/emissions/templates/emissions/episode_detail.html b/emissions/templates/emissions/episode_detail.html
index 34bc25fe09159cb0b855b06f6a0639261fc56f1b..67fa083796b9403782057adffe8cf4d6132be78d 100644 (file)
--- a/emissions/templates/emissions/episode_detail.html
+++ b/emissions/templates/emissions/episode_detail.html
@@ -12,7 +12,7 @@
 <p>
 <a class="button" href="edit/">Modifier</a>
 {% if perms.emissions.add_diffusion %}
-<a class="button" id="add-diffusion-link" href="#">Ajouter une diffusion</a>
+<a class="button" href="add-diffusion" rel="popup">Ajouter une diffusion</a>
 {% endif %}
 <a class="button" id="add-soundfile-link" href="#">Ajouter un son</a>
 {% if episode.effective_start and episode.effective_end %}
@@ -70,15 +70,6 @@ Tags :
 {% endfor %}
 </ul>
 
-<form id="add-diffusion-form" action="add-diffusion" method="POST" style="display: none;">
-{% csrf_token %}
-{{ add_diffusion_form.as_p }}
-<input type="submit" value="Ajouter cet horaire"/>
-<button class="cancel">Annuler</button>
-</form>
-
-
-
 <h3>Sons</h3>
 
 <table id="soundfiles">
@@ -127,11 +118,6 @@ $(function() {
       $('#add-soundfile-form').dialog({modal: true, title: 'Son', width: 'auto'});
     });
 
-  $('#add-diffusion-link').click(
-    function() {
-      $('#add-diffusion-form').dialog({modal: true, title: 'Horaire', width: 'auto'});
-    });
-
   $('.image img').click(function() { $(this).toggleClass('large'); });
 
   $('#id_fragment').change(function() {

diff --git a/emissions/views.py b/emissions/views.py
index 460fd041b5974dfaa821262e7aace41c0145e0e9..69a9dd68e0632cb003aeb80d38bd2465740280d1 100644 (file)
--- a/emissions/views.py
+++ b/emissions/views.py
@@ -211,7 +211,6 @@ class EpisodeDetailView(DetailView):
             'episode': self.object,
             'title': _('Record'),
             'license': self.object.emission.default_license})
-        context['add_diffusion_form'] = DiffusionForm(initial={'episode': self.object})
 
         try:
             context['can_manage'] = self.request.user.can_manage(self.object.emission)
@@ -369,6 +368,13 @@ class EpisodeAddDiffusionView(CreateView):
     form_class = DiffusionForm
     model = Diffusion
 
+    def get_initial(self):
+        return {
+            'episode': Episode.objects.get(
+                slug=self.kwargs.get('slug'),
+                emission__slug=self.kwargs.get('emission_slug')),
+        }
+
     def get_form(self, *args, **kwargs):
         if not self.request.user.has_perm('emissions.add_diffusion'):
             raise PermissionDenied()