// yet another display fix for new display header/footer
This commit is contained in:
@@ -816,7 +816,7 @@ class AdminControllerCore extends Controller
|
|||||||
$this->context->smarty->assign('display_header', $this->display_header);
|
$this->context->smarty->assign('display_header', $this->display_header);
|
||||||
$this->context->smarty->assign('display_footer', $this->display_footer);
|
$this->context->smarty->assign('display_footer', $this->display_footer);
|
||||||
$this->context->smarty->assign('meta_title', $this->meta_title);
|
$this->context->smarty->assign('meta_title', $this->meta_title);
|
||||||
|
|
||||||
// Template override
|
// Template override
|
||||||
$tpl = $this->tpl_folder.'content.tpl';
|
$tpl = $this->tpl_folder.'content.tpl';
|
||||||
$tpl_action = $this->tpl_folder.$this->display.'.tpl';
|
$tpl_action = $this->tpl_folder.$this->display.'.tpl';
|
||||||
@@ -1074,6 +1074,7 @@ class AdminControllerCore extends Controller
|
|||||||
$this->content .= $this->initList();
|
$this->content .= $this->initList();
|
||||||
$this->content .= $this->initOptions();
|
$this->content .= $this->initOptions();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->context->smarty->assign(array(
|
$this->context->smarty->assign(array(
|
||||||
'table' => $this->table,
|
'table' => $this->table,
|
||||||
'current' => self::$currentIndex,
|
'current' => self::$currentIndex,
|
||||||
|
|||||||
@@ -147,11 +147,14 @@ abstract class ControllerCore
|
|||||||
elseif (method_exists($this, 'displayAjax'))
|
elseif (method_exists($this, 'displayAjax'))
|
||||||
$this->displayAjax();
|
$this->displayAjax();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
$this->display();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
$this->initCursedPage();
|
$this->initCursedPage();
|
||||||
|
$this->display();
|
||||||
$this->display();
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function displayHeader($display = true)
|
public function displayHeader($display = true)
|
||||||
|
|||||||
@@ -391,12 +391,9 @@ class AdminHomeControllerCore extends AdminController
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function displayAjax()
|
|
||||||
{
|
|
||||||
echo $this->content;
|
|
||||||
}
|
|
||||||
public function ajaxProcessGetAdminHomeElement()
|
public function ajaxProcessGetAdminHomeElement()
|
||||||
{
|
{
|
||||||
|
$this->content_only = true;
|
||||||
$result = array();
|
$result = array();
|
||||||
$content = '';
|
$content = '';
|
||||||
|
|
||||||
@@ -512,6 +509,7 @@ class AdminHomeControllerCore extends AdminController
|
|||||||
$upgrade = new Upgrader();
|
$upgrade = new Upgrader();
|
||||||
$upgrade->checkPSVersion();
|
$upgrade->checkPSVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
$smarty->assign('upgrade', $upgrade);
|
$smarty->assign('upgrade', $upgrade);
|
||||||
|
|
||||||
$smarty->assign('show_screencast', $this->context->employee->show_screencast);
|
$smarty->assign('show_screencast', $this->context->employee->show_screencast);
|
||||||
|
|||||||
Reference in New Issue
Block a user