Merge commit 'origin/master' into fusionax

[platal.git] / templates / core / plwizard.tpl

diff --git a/templates/core/plwizard.tpl b/templates/core/plwizard.tpl
index 095765d..df409dd 100644 (file)
--- a/templates/core/plwizard.tpl
+++ b/templates/core/plwizard.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -19,7 +19,7 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-{javascript name="jquery"}
+
 <script type="text/javascript">//<![CDATA[
   {if ($stateless || $id gt $current) && $wiz_ajax}
   {literal}
@@ -33,12 +33,26 @@
                       document.location = myUrl;
                     },
              success: function(data) {
-                        $(".wiz_content").fadeOut('normal',
-                            function() {
-                              $(".wiz_tab").removeClass("active");
-                              $("#wiz_tab_" + id).addClass("active");
-                              $(".wiz_content").html(data).fadeIn('normal');
-                            });
+                        if (is_IE) {
+                          $(".wiz_tab").removeClass("active");
+                          $("#wiz_tab_" + id).addClass("active");
+                          $(".wiz_content").html(data);
+                          if (typeof wizPage_onLoad == 'function') {
+                              wizPage_onLoad(id);
+                          }
+                          auto_links();
+                        } else {
+                          $(".wiz_content").fadeOut('normal',
+                              function() {
+                                $(".wiz_tab").removeClass("active");
+                                $("#wiz_tab_" + id).addClass("active");
+                                $(".wiz_content").html(data).fadeIn('normal');
+                                if (typeof wizPage_onLoad == 'function') {
+                                  wizPage_onLoad(id);
+                                }
+                                auto_links();
+                              });
+                        }
                       }
           });
     return false;
@@ -76,11 +90,17 @@
     <div style="clear: both"></div>
   </div>
   <div class="wiz_content" style="clear: both">
-    {foreach from=$xorg_errors item=err}
-    <div class="erreur">{$err|smarty:nodefaults}</div>
-    {/foreach}
+    {include file="skin/common.triggers.tpl"}
     {include file=$wiz_page}
   </div>
 </div>
 
+<script type="text/javascript">
+{literal}
+if (typeof wizPage_onLoad == 'function') {
+    wizPage_onLoad({/literal}'{$lookup[$current]}'{literal});
+}
+{/literal}
+</script>
+
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}