Remove old dialog

2 files changed, 7 insertions, 67 deletions

diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index a70e92f..4e48c34 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -1,33 +1,14 @@
-{% load i18n sanitize chimere_tags %}
-{% if news_lst or welcome_message %}
-<script type='text/javascript'>
-<!--
-$(function(){
-    /*
-    $('#welcome div.media-player').jmeEmbedControls();
-    $('#welcome video').each(function(index){$(this).pause()});
-    $('#welcome audio').each(function(index){$(this).pause()});*/
-    $("#welcome").dialog({width:826, height:410, dialogClass:'welcome-dialog'
-                          {% if not display %}, autoOpen:false{% endif %}});
-});
-// -->
-</script>
-<div id='welcome' style='display:none'>
-    <div class='title'>
-        <h2>{{title}}</h2>
-    </div>
-    <div id='welcome_message'>
-        <div id='welcome_content'>
-        {{welcome_message|safe}}
-        </div>
-    </div>
-</div>
+{% load i18n sanitize chimere_tags bootstrap %}{% if news_lst or welcome_message %}
+
+{% bootstrap_modal "welcome" title welcome_message|safe %}
+
 <script type='text/javascript'>
 <!--
 $(function(){
+    {% if display %}$('#welcome').modal('show');{%endif%}
     $('.get_more_information').click(function(){
-        $('#welcome').dialog('close');
-        $('#news').dialog('open');
+        $('#welcome').modal('hide');
+        $('#news').modal('show');
         return false;
     });
 });
diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html
index fccbc05..c8fc902 100644
--- a/templates/chimere/detail.html
+++ b/templates/chimere/detail.html
@@ -57,47 +57,6 @@ $(function(){
         social_tools: ''
     });
 
-    $("#gallery-{{marker.pk}}").dialog({title:"{{marker.name}}", autoOpen: false,
-                           height: "auto", width: "auto", dialogClass:'no-titlebar'});
-   /* $('div.media-player').jmeEmbedControls();
-    $('.tabs').tabs({
-        select: function(event, ui) {
-            //pause all medias
-            $('video').each(function(index){$(this).pause()});
-            $('audio').each(function(index){$(this).pause()});
-            //start current tabvideo
-            $('ui.panel video').each(function(index){
-                //prevents a Flash-Bug in IE with newest Flash-Player
-                $(this).reinitMedia({queue: true})
-                .play()
-            ;});
-            $('ui.panel audio').each(function(index){
-                //prevents a Flash-Bug in IE with newest Flash-Player
-                $(this).reinitMedia({queue: true})
-                .play()
-            ;});
-        }
-    });
-    $('.video div.media-player').bind('useractive', function(){
-        $('div.media-controls', this).stop().animate({opacity: 1});
-    }).bind('userinactive', function(){
-        $('div.media-controls', this).stop().animate({opacity: 0});
-    });
-    */
-});
-$("#gallery-{{marker.pk}}").bind( "dialogopen", function(event, ui) {
-    $("#gallery-{{marker.pk}}").dialog("option", "height", 'auto');
-    $("#gallery-{{marker.pk}}").dialog("option", "width", 'auto');
-    $("#gallery-{{marker.pk}}").dialog("option", "position", ['center', 'center']);
-});
-$("#gallery-{{marker.pk}}").bind( "dialogclose", function(event, ui) {
-    //pause all medias
-    $('video').each(function(index){$(this).pause()});
-    $('audio').each(function(index){$(this).pause()});
-});
-$('#show_gallery_link').click(function(){
-    $("#gallery-{{marker.pk}}").dialog('open');
-    return false;
 });
 // -->
 </script>