dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//carrier wizard logo location fixed

Browse Source
This commit is contained in:
Vincent Augagneur
2013-11-28 11:27:34 +01:00
parent 8370c18fe8
commit dde8540a86
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+25 -20
View File
@@ -45,26 +45,31 @@
</script> </script>
<div class="row"> <div class="row">
<div id="carrier_wizard" class="panel swMain"> <div class="col-lg-10">
<ul class="steps nbr_steps_{$wizard_steps.steps|count}"> <div id="carrier_wizard" class="panel swMain">
{foreach from=$wizard_steps.steps key=step_nbr item=step} <ul class="steps nbr_steps_{$wizard_steps.steps|count}">
<li> {foreach from=$wizard_steps.steps key=step_nbr item=step}
<a href="#step-{$step_nbr + 1}"> <li>
<span class="stepNumber">{$step_nbr + 1}</span> <a href="#step-{$step_nbr + 1}">
<span class="stepDesc"> <span class="stepNumber">{$step_nbr + 1}</span>
{$step.title}<br /> <span class="stepDesc">
{if isset($step.desc)}<small>{$step.desc}</small>{/if} {$step.title}<br />
</span> {if isset($step.desc)}<small>{$step.desc}</small>{/if}
<span class="chevron"></span> </span>
</a> <span class="chevron"></span>
</li> </a>
{/foreach} </li>
</ul> {/foreach}
{foreach from=$wizard_contents.contents key=step_nbr item=content} </ul>
<div id="step-{$step_nbr + 1}" class="step_container"> {foreach from=$wizard_contents.contents key=step_nbr item=content}
{$content} <div id="step-{$step_nbr + 1}" class="step_container">
</div> {$content}
{/foreach} </div>
{/foreach}
</div>
</div>
<div class="col-lg-2">
{$logo_content}
</div> </div>
</div> </div>
{/block} {/block}
controllers/admin/AdminCarrierWizardController.php
+7 -3
View File
@@ -129,9 +129,13 @@ class AdminCarrierWizardControllerCore extends AdminController
array_splice($this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTwo($carrier))); array_splice($this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTwo($carrier)));
$this->context->smarty->assign(array( $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')); $this->addjQueryPlugin(array('ajaxfileupload'));
return parent::renderView(); return parent::renderView();