use normal popup for add sound form

diff --git a/panikdb/static/js/qommon.fileupload.js b/panikdb/static/js/qommon.fileupload.js
index 6e188dc3b18169a87d93ce62a3b4a300122f5b32..fc663c858d0d8143d717de8f3d693e0ee9e35b90 100644 (file)
--- a/panikdb/static/js/qommon.fileupload.js
+++ b/panikdb/static/js/qommon.fileupload.js
@@ -1,5 +1,5 @@
 $(function() {
-    $('.file-upload-widget').each(function() {
+    function upload_widget() {
         var base_widget = $(this);
         if ($(base_widget).find('input[type=hidden]').val()) {
             $(base_widget).find('input[type=file]').hide();
@@ -37,5 +37,9 @@ $(function() {
             $(base_widget).find('input[type=file]').click();
             return false;
         });
+    }
+    $('.file-upload-widget').each(upload_widget);
+    $(document).on('gadjo:dialog-loaded', function(ev, form) {
+        $(form).find('.file-upload-widget').each(upload_widget);
     });
 });

diff --git a/panikdb/templates/emissions/episode_detail.html b/panikdb/templates/emissions/episode_detail.html
index 32d0ba489a71d94377f67f0433b2b0ad8b710df4..4b9cce79792c0c5db454bf9017c99d476ecfbe47 100644 (file)
--- a/panikdb/templates/emissions/episode_detail.html
+++ b/panikdb/templates/emissions/episode_detail.html
@@ -13,7 +13,7 @@
 {% if perms.emissions.add_diffusion %}
 <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>
+<a class="button" href="add-soundfile" rel="popup">Ajouter un son</a>
 {% if episode.effective_start and episode.effective_end %}
   {% if internal_ip %}
   <a class="button" id="download-recording" download href="{{ episode.get_pige_download_url }}">Télécharger l'enregistrement</a>
@@ -120,25 +120,12 @@ Tags :
 </tbody>
 </table>
 
-<form id="add-soundfile-form" action="add-soundfile" method="POST" style="display: none;">
-{% csrf_token %}
-{{ add_soundfile_form.as_p }}
-<button>Ajouter ce son</button>
-<button class="cancel">Annuler</button>
-</form>
-
 {% endblock %}
 
 
 {% block page-end %}
 <script>
 $(function() {
-  $('#add-soundfile-link').click(
-    function() {
-      $('#id_title').parent().hide();
-      $('#add-soundfile-form').dialog({modal: true, title: 'Son', width: 'auto'});
-    });
-
   $('.image img').click(function() { $(this).toggleClass('large'); });
 
   $('#id_fragment').change(function() {
@@ -149,10 +136,6 @@ $(function() {
     }
   });
 
-  $('button.cancel').click(function() {
-    $(this).parent().dialog('close');
-    return false;
-  });
 });
 </script>
 {% endblock %}