diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index d5e4834c6..4e85b8a05 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -277,10 +277,6 @@ class FrontControllerCore extends Controller $page_name = (preg_match('/^[0-9]/', $page_name)) ? 'page_'.$page_name : $page_name; } - // If column left is not displayed, we rename page name - if ($this->display_column_left == false) - $page_name = 'order-opc'; - $this->context->smarty->assign(Meta::getMetaTags($this->context->language->id, $page_name)); $this->context->smarty->assign('request_uri', Tools::safeOutput(urldecode($_SERVER['REQUEST_URI']))); @@ -314,6 +310,8 @@ class FrontControllerCore extends Controller 'currency' => $currency, 'cookie' => $this->context->cookie, 'page_name' => $page_name, + 'hide_left_column' => !$this->display_column_left, + 'hide_right_column' => !$this->display_column_right, 'base_dir' => _PS_BASE_URL_.__PS_BASE_URI__, 'base_dir_ssl' => $protocol_link.Tools::getShopDomainSsl().__PS_BASE_URI__, 'content_dir' => $protocol_content.Tools::getHttpHost().__PS_BASE_URI__, diff --git a/themes/default/css/global.css b/themes/default/css/global.css index 51883234d..8fd3d8ff6 100644 --- a/themes/default/css/global.css +++ b/themes/default/css/global.css @@ -79,6 +79,9 @@ h4 { font-size:14px } +.hide-left-column #left_column {display:none} +.hide-left-column #center_column {width:757px} + /* text **************************************************************************************** */ p {padding-bottom:20px} diff --git a/themes/default/header.tpl b/themes/default/header.tpl index c6a98be45..6ac4f2afb 100644 --- a/themes/default/header.tpl +++ b/themes/default/header.tpl @@ -61,7 +61,7 @@ {$HOOK_HEADER} -
+ {if !$content_only} {if isset($restricted_country_mode) && $restricted_country_mode}