//carrier wizard logo location fixed

admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl

@@ -45,6 +45,7 @@
 </script>
 
 <div class="row">
+	<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}
@@ -66,5 +67,9 @@
 				</div>
 			{/foreach}
 		</div>
+	</div>
+	<div class="col-lg-2">
+		{$logo_content}
+	</div>
 </div>
 {/block}

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)
+				'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();
+ 			
+ 		$this->context->smarty->assign(array(
+ 			'logo_content' => $this->createTemplate('logo.tpl')->fetch()
+ 		));
+ 		
 		$this->addjQueryPlugin(array('ajaxfileupload'));
 
 		return parent::renderView();