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

// layout fix

Browse Source
This commit is contained in:
Rémi Gaillard
2013-10-25 17:30:10 +02:00
parent 50bc046671
commit c67e71ca59
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/layout.tpl
+2 -1
View File
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{$header}
{if isset($conf)} {if isset($conf)}
<div class="alert alert-success"> <div class="alert alert-success">
{$conf} {$conf}
@@ -91,3 +91,4 @@
{if !$bootstrap}<div id="nobootstrap">{/if} {if !$bootstrap}<div id="nobootstrap">{/if}
{$page} {$page}
{if !$bootstrap}</div>{/if} {if !$bootstrap}</div>{/if}
{$footer}
classes/controller/AdminController.php
+9 -6
View File
@@ -682,6 +682,7 @@ class AdminControllerCore extends Controller
'export_content' => $content 'export_content' => $content
) )
); );
$this->layout = 'layout-export.tpl'; $this->layout = 'layout-export.tpl';
} }
@@ -1372,12 +1373,14 @@ class AdminControllerCore extends Controller
foreach (array('errors', 'warnings', 'informations', 'confirmations') as $type) foreach (array('errors', 'warnings', 'informations', 'confirmations') as $type)
$this->context->smarty->assign($type, $this->json ? Tools::jsonEncode(array_unique($this->$type)) : array_unique($this->$type)); $this->context->smarty->assign($type, $this->json ? Tools::jsonEncode(array_unique($this->$type)) : array_unique($this->$type));
$this->context->smarty->assign('page', $this->json ? Tools::jsonEncode($page) : $page); $this->context->smarty->assign(array(
'page' => $this->json ? Tools::jsonEncode($page) : $page,
if (!$this->ajax) 'header' => $this->context->smarty->fetch($header_tpl),
$this->smartyOutputContent(array($header_tpl, $this->layout, $footer_tpl)); 'footer' => $this->context->smarty->fetch($footer_tpl)
else )
$this->smartyOutputContent($this->layout); );
$this->smartyOutputContent($this->layout);
} }
/** /**