From 5c22b69d98467499ab257826d73e16ce28be0f5a Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 17 Jul 2013 13:38:30 +0200
Subject: [PATCH] Fix #1338 : Fix notices display in admin

---
 templates/web/admin/collection/reorder.html.twig   | 14 ++++++++++----
 .../web/admin/collection/suggested_value.html.twig |  2 +-
 templates/web/common/templates.html.twig           |  2 +-
 templates/web/prod/Baskets/Reorder.html.twig       | 12 ++++++------
 templates/web/prod/Story/Reorder.html.twig         | 12 ++++++------
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/templates/web/admin/collection/reorder.html.twig b/templates/web/admin/collection/reorder.html.twig
index 960b98d6f8..ceeebb7845 100644
--- a/templates/web/admin/collection/reorder.html.twig
+++ b/templates/web/admin/collection/reorder.html.twig
@@ -19,7 +19,13 @@
         <td colspan="2" style="height:20px;" />
     </tr>
     <tr>
-        <td colspan="2" valign="center" align="left"><div class="form-actions"><button class="btn btn-primary" id="apply">{% trans 'boutton::valider' %}</button></div></td>
+        <td colspan="2" valign="center" align="left">
+            <div class="form-actions">
+                <button class="btn btn-primary" id="apply">
+                    {% trans 'boutton::valider' %}
+                </button>
+            </div>
+        </td>
     </tr>
 </table>
 
@@ -70,7 +76,7 @@
                     var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), {
                         content:datas.msg
                     });
-                    $('#table-order').insertBefore(html);
+                    $('#table-order').before(html);
                 },
                 complete : function() {
                     $this.attr('disabled', false);
@@ -81,13 +87,13 @@
 
     function moveUpItem(select){
         select.find('option:selected').each(function(){
-            $(this).insertBefore($(this).prev());
+            $(this).before($(this).prev());
         });
     }
 
     function moveDownItem(select){
         select.find('option:selected').each(function(){
-            $(this).insertAfter($(this).next());
+            $(this).after($(this).next());
         });
     }
 
diff --git a/templates/web/admin/collection/suggested_value.html.twig b/templates/web/admin/collection/suggested_value.html.twig
index a818939e5b..cf98cd37c9 100644
--- a/templates/web/admin/collection/suggested_value.html.twig
+++ b/templates/web/admin/collection/suggested_value.html.twig
@@ -655,7 +655,7 @@ function valid()
                 if(data.success) {
                     $('#tree li.selected a').trigger('click');
                 } else {
-                    $(".page-header").insertAfter(
+                    $(".page-header").after(
                     '<div class="alert alert-error">'
                     +'<button class="close" data-dismiss="alert">×</button>'
                     + data.msg
diff --git a/templates/web/common/templates.html.twig b/templates/web/common/templates.html.twig
index 2d1dda571a..d97f44fe01 100644
--- a/templates/web/common/templates.html.twig
+++ b/templates/web/common/templates.html.twig
@@ -6,7 +6,7 @@
 </script>
 
 <script type="text/template" id="alert_error_tpl">
-    <div class="alert alert-success">
+    <div class="alert alert-error">
         <button class="close" data-dismiss="alert">×</button>
         <%= content %>
     </div>
diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig
index 5cd862ceeb..38755b3287 100644
--- a/templates/web/prod/Baskets/Reorder.html.twig
+++ b/templates/web/prod/Baskets/Reorder.html.twig
@@ -91,7 +91,7 @@
             {
                 var elem = $('#ORDER_'+i);
                 if(last_moved) {
-                    elem.insertAfter(last_moved);
+                    elem.after(last_moved);
                 } else {
                     $('#reorder_box .elements').prepend(elem);
                 }
@@ -143,7 +143,7 @@
             elems.each(function(i,n){
                 var elem = $(n);
                 if(last_moved) {
-                    elem.insertBefore(last_moved);
+                    elem.before(last_moved);
                 } else {
                     $('#reorder_box .elements').append(elem);
                 }
@@ -175,7 +175,7 @@
                 $('.selected:visible', container).hide();
 
                 while(n > 0){
-                    $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
+                    $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
                     n--;
                 }
             },
@@ -212,9 +212,9 @@
                         before = false;
                     } else {
                         if(before){
-                            $(n).insertBefore($(ui.item[0]));
+                            $(n).before($(ui.item[0]));
                         } else{
-                            $(n).insertAfter($(last_moved));
+                            $(n).after($(last_moved));
                         }
 
                     }
@@ -227,7 +227,7 @@
 
                 var n = OrderSelection.length() - 1 ;
                 while(n > 0) {
-                    $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
+                    $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
                     n--;
                 }
             }
diff --git a/templates/web/prod/Story/Reorder.html.twig b/templates/web/prod/Story/Reorder.html.twig
index 4b460fb5ef..26f209627b 100644
--- a/templates/web/prod/Story/Reorder.html.twig
+++ b/templates/web/prod/Story/Reorder.html.twig
@@ -92,7 +92,7 @@
           var elem = $('#ORDER_'+i);
           if(last_moved)
           {
-            elem.insertAfter(last_moved);
+            elem.after(last_moved);
           }
           else
           {
@@ -146,7 +146,7 @@
           var elem = $(n);
           if(last_moved)
           {
-            elem.insertBefore(last_moved);
+            elem.before(last_moved);
           }
           else
           {
@@ -181,7 +181,7 @@
 
           while(n > 0)
           {
-            $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
+            $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
             n--;
           }
         },
@@ -223,9 +223,9 @@
             else
             {
               if(before)
-                $(n).insertBefore($(ui.item[0]));
+                $(n).before($(ui.item[0]));
               else
-                $(n).insertAfter($(last_moved));
+                $(n).after($(last_moved));
 
             }
             last_moved = sorter[i];
@@ -238,7 +238,7 @@
           var n = OrderSelection.length() - 1 ;
           while(n > 0)
           {
-            $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
+            $('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
             n--;
           }
         }