From dde8540a86508f59bf3c430815d882f266cde249 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Thu, 28 Nov 2013 11:27:34 +0100
Subject: [PATCH] //carrier wizard logo location fixed

---
 .../carrier_wizard/helpers/view/view.tpl      | 45 ++++++++++---------
 .../admin/AdminCarrierWizardController.php    | 10 +++--
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
index b81b8ebf6..c479a5e41 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
@@ -45,26 +45,31 @@
 </script>
 
 <div class="row">
-	<div id="carrier_wizard" class="panel swMain">
-		<ul class="steps nbr_steps_{$wizard_steps.steps|count}">
-		{foreach from=$wizard_steps.steps key=step_nbr item=step}
-			<li>
-				<a href="#step-{$step_nbr + 1}">
-					<span class="stepNumber">{$step_nbr + 1}</span>
-					<span class="stepDesc">
-						{$step.title}<br />
-						{if isset($step.desc)}<small>{$step.desc}</small>{/if}
-					</span>
-					<span class="chevron"></span>
-				</a>
-			</li>
-		{/foreach}
-		</ul>
-		{foreach from=$wizard_contents.contents key=step_nbr item=content}
-			<div id="step-{$step_nbr + 1}" class="step_container"> 	
-				{$content}
-			</div>
-		{/foreach}
+	<div class="col-lg-10">
+		<div id="carrier_wizard" class="panel swMain">
+			<ul class="steps nbr_steps_{$wizard_steps.steps|count}">
+			{foreach from=$wizard_steps.steps key=step_nbr item=step}
+				<li>
+					<a href="#step-{$step_nbr + 1}">
+						<span class="stepNumber">{$step_nbr + 1}</span>
+						<span class="stepDesc">
+							{$step.title}<br />
+							{if isset($step.desc)}<small>{$step.desc}</small>{/if}
+						</span>
+						<span class="chevron"></span>
+					</a>
+				</li>
+			{/foreach}
+			</ul>
+			{foreach from=$wizard_contents.contents key=step_nbr item=content}
+				<div id="step-{$step_nbr + 1}" class="step_container"> 	
+					{$content}
+				</div>
+			{/foreach}
+		</div>
+	</div>
+	<div class="col-lg-2">
+		{$logo_content}
 	</div>
 </div>
 {/block}
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index d37dc4669..c00652b14 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -129,9 +129,13 @@ class AdminCarrierWizardControllerCore extends AdminController
 			array_splice($this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTwo($carrier)));
 
 		$this->context->smarty->assign(array(
-				'carrier_logo' => (Validate::isLoadedObject($carrier) && file_exists(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg') ? _THEME_SHIP_DIR_.$carrier->id.'.jpg' : false)
-			));
-		$this->content .= $this->createTemplate('logo.tpl')->fetch();
+				'carrier_logo' => (Validate::isLoadedObject($carrier) && file_exists(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg') ? _THEME_SHIP_DIR_.$carrier->id.'.jpg' : false),
+ 			));
+ 			
+ 		$this->context->smarty->assign(array(
+ 			'logo_content' => $this->createTemplate('logo.tpl')->fetch()
+ 		));
+ 		
 		$this->addjQueryPlugin(array('ajaxfileupload'));
 
 		return parent::renderView();