From d8c4db1d1bf42ad009f93b10fdb13705fa41f70a Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 12 Dec 2012 20:34:13 +0100
Subject: [PATCH] // New user assistance in the installer

---
 install-dev/langs/fr/install.php     | 1 +
 install-dev/theme/js/process.js      | 6 ++++++
 install-dev/theme/view.css           | 2 ++
 install-dev/theme/views/footer.phtml | 8 +++++++-
 install-dev/theme/views/header.phtml | 4 ++--
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index afc5ff3ca..35d13d91b 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -194,5 +194,6 @@ return array(
 		'Display' => 'Afficher',
 		'<b>Warning: You cannot use anymore this tool to upgrade your store.</b><br /><br />You already have <b>PrestaShop version %1$s installed</b>.<br /><br />If you want to upgrade to the latest version please read our documentation: <a href="%2$s">%2$s</a>' => '<b>Attention: Vous ne pouvez plus utiliser cet outil pour mettre à jour votre boutique.</b><br /><br />Vous avez déjà <b>PrestaShop version %1$s d\'installé.</b><br /><br />Si vous souhaitez utiliser la dernière version, merci de vous référer à notre documentation pour la mise à jour : <a href="%2$s">%2$s</a>',
 		'PrestaShop Wizard Installer' => 'Installation de PrestaShop',
+		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'PrestaShop peut vous assister si vous rencontrez un obstacle lors de l\'installation de votre boutique. Contactez notre équipe au %s et indiquez-nous l\'URL de votre boutique. Nous serons heureux de vous aider dans les dernières étapes de l\'installation !',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/theme/js/process.js b/install-dev/theme/js/process.js
index d468b9a29..2a92f07ed 100644
--- a/install-dev/theme/js/process.js
+++ b/install-dev/theme/js/process.js
@@ -156,11 +156,15 @@ function install_error(step, errors)
 		var display = '<ol>';
 		$.each(list_errors, function(k, v)
 		{
+			if (typeof psuser_assistance != 'undefined')
+				psuser_assistance.setStep('install_process_error', {'error':v});
 			display += '<li>'+v+'</li>';
 		});
 		display += '</ol>';
 		$('#process_step_'+step.key+' .error_log').html(display).show();
 	}
+	if (typeof psuser_assistance != 'undefined')
+		psuser_assistance.setStep('install_process_error');
 }
 
 function install_success()
@@ -171,4 +175,6 @@ function install_success()
 	$('#install_process_form').slideUp();
 	$('#install_process_success').slideDown();
 	$('.stepList li:last-child').addClass('ok');
+	if (typeof psuser_assistance != 'undefined')
+		psuser_assistance.setStep('install_process_success');
 }
\ No newline at end of file
diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css
index 6d74c9725..f5655dbcb 100644
--- a/install-dev/theme/view.css
+++ b/install-dev/theme/view.css
@@ -110,6 +110,8 @@ ul#footer{
 	color:#fff;
 }
 
+div#phone_help{margin:auto;text-align:center;padding:10px 5px}
+
 
 /* ****************************************************************************
       generics styles
diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml
index 1ede4d068..4107ab37a 100644
--- a/install-dev/theme/views/footer.phtml
+++ b/install-dev/theme/views/footer.phtml
@@ -15,7 +15,9 @@
 	<?php endif; ?>
 </div>
 </form>
-
+<div id="phone_help">
+	<?php echo $this->l('If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.', $this->getPhone()) ?>
+</div>
 </div><!-- div id="container" -->
 
 <ul id="footer">
@@ -26,5 +28,9 @@
 	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo $this->l('Contact us!'); ?>" target="_blank"><?php echo $this->l('Contact us!'); ?></a> | </li>
 	<li>&copy; 2005-<?php echo date('Y'); ?></li>
 </ul>
+<script type="text/javascript">
+	if (typeof psuser_assistance != 'undefined')
+		psuser_assistance.setStep('install_<?php echo addslashes($this->step) ?>');
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/install-dev/theme/views/header.phtml b/install-dev/theme/views/header.phtml
index 3d8aa5896..31ff38e01 100644
--- a/install-dev/theme/views/header.phtml
+++ b/install-dev/theme/views/header.phtml
@@ -17,6 +17,7 @@
 	<script type="text/javascript" src="theme/js/jquery.ajaxfileupload.js"></script>
 	<script type="text/javascript" src="theme/js/jquery.chosen/jquery.chosen.js"></script>
 	<script type="text/javascript" src="theme/js/install.js"></script>
+	<script type="text/javascript" src="//www.prestashop.com/js/user-assistance.js"></script>
 	<?php if (file_exists(_PS_INSTALL_PATH_.'theme/js/'.$this->step.'.js')): ?>
 		<script type="text/javascript" src="theme/js/<?php echo $this->step ?>.js"></script>
 	<?php endif; ?>
@@ -82,5 +83,4 @@
 				<li <?php if ($this->isStepFinished($step)): ?>class="ok"<?php endif; ?>><?php echo $this->l('menu_'.$this->step) ?></li>
 			<?php endforeach; ?>
 		</ul>
-	</div>
-
+	</div>
\ No newline at end of file