From d934e4beec8d28e48f3627431a37a54ba03a6d6d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 13 Jun 2010 07:47:29 +0000
Subject: [PATCH] fixed wrong step name and readded content of onLoad body
 attribute via ajax, thought this still does NOT fix all problems (javascript
 errors etemplate.js seems not to be loaded)

---
 .../inc/class.importexport_definitions_ui.inc.php      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php
index ee6b6392fb..2ebefe9e8a 100644
--- a/importexport/inc/class.importexport_definitions_ui.inc.php
+++ b/importexport/inc/class.importexport_definitions_ui.inc.php
@@ -140,7 +140,7 @@ class importexport_definitions_ui
 	function wizard($content = null, $msg='')
 	{
 		$GLOBALS['egw_info']['flags']['java_script'] .=
-			"<script LANGUAGE='JavaScript'>
+			"<script type='text/javascript'>
 				function xajax_eT_wrapper_init() {
 					//window.resizeTo(document.documentElement.scrollWidth+20,document.documentElement.offsetHeight+40);
 					window.moveTo(screen.availWidth/2 - window.outerWidth/2,
@@ -184,8 +184,8 @@ class importexport_definitions_ui
 				$button = array_keys($content['button']);
 				$content['button'] = array($button[0] => 'pressed');
 			}
-			// Override next button on step 30
-			if($content['step'] == '30') {
+			// Override next button on step 21, to do a regular submit for the file upload
+			if($content['step'] == 'wizard_step21') {
 				$this->etpl->set_cell_attribute('button[next]', 'onclick', '');
 			}
 
@@ -247,6 +247,10 @@ class importexport_definitions_ui
 				$this->response->addAssign('exec[button][cancel]','style.display', 'none');
 			}
 			$this->response->addAssign('contentbox', 'innerHTML', $html);
+			if (($onload = $GLOBALS['egw']->js->set_onload(''))) 
+			{ 	 
+				$this->response->addScript($onload); 	 
+			}			
 			$this->response->addAssign('picturebox', 'style.display', 'none');
 			$this->response->addScript("set_style_by_class('div','popupManual','display','inline');");