diff --git a/themes/default-bootstrap/footer.tpl b/themes/default-bootstrap/footer.tpl index 36aa99289..36dc90b44 100644 --- a/themes/default-bootstrap/footer.tpl +++ b/themes/default-bootstrap/footer.tpl @@ -25,8 +25,7 @@ {if !$content_only} - {if isset($HOOK_RIGHT_COLUMN) && (str_replace(" ","",$HOOK_RIGHT_COLUMN)) !=''}{assign var='RightColumn' value=3}{/if} - {if isset($RightColumn) && $RightColumn !=0} + {if isset($right_column) && !empty($right_column)}
{$HOOK_RIGHT_COLUMN} diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index 534b39605..e7a305004 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -94,8 +94,7 @@ {$HOOK_HEADER} - - + {if !$content_only} {if isset($restricted_country_mode) && $restricted_country_mode}
@@ -209,16 +208,15 @@ {include file="$tpl_dir./breadcrumb.tpl"} {/if}
- {assign var='LeftColumn' value=0} - {assign var='RightColumn' value=0} - {if isset($HOOK_LEFT_COLUMN) && (str_replace(" ","",$HOOK_LEFT_COLUMN)) !=''}{assign var='LeftColumn' value=3}{/if} - {if isset($HOOK_RIGHT_COLUMN) && (str_replace(" ","",$HOOK_RIGHT_COLUMN)) !=''}{assign var='RightColumn' value=3}{/if} - - {if isset($LeftColumn) && $LeftColumn !=0} -
- {$HOOK_LEFT_COLUMN} -
- {/if} - -
- {/if} + {assign var='left_column' value=0}{assign var='right_column' value=0} + {if isset($HOOK_LEFT_COLUMN) && $HOOK_LEFT_COLUMN|trim && !$hide_left_column}{$left_column = 3}{/if} + {if isset($HOOK_RIGHT_COLUMN) && $HOOK_RIGHT_COLUMN|trim && !$hide_right_column}{$right_column = 3}{/if} + {if isset($left_column) && !empty($left_column)} + +
+ {$HOOK_LEFT_COLUMN} +
+ {/if} + +
+ {/if} \ No newline at end of file diff --git a/themes/default/css/global.css b/themes/default/css/global.css index e92967740..43f4d73f7 100644 --- a/themes/default/css/global.css +++ b/themes/default/css/global.css @@ -85,8 +85,8 @@ h3 { font-size:14px } -.hide-left-column #left_column {display:none} -.hide-left-column #center_column {width:757px} +.hide-left-column #left_column, .hide-right-column #right_column {display:none} +.hide-left-column #center_column, .hide-right-column #center_column {width:757px} /* text **************************************************************************************** */ p {padding-bottom:20px} diff --git a/themes/default/footer.tpl b/themes/default/footer.tpl index 01fb10657..92fcdaa0a 100644 --- a/themes/default/footer.tpl +++ b/themes/default/footer.tpl @@ -25,14 +25,14 @@ {if !$content_only}
- - + {if isset($right_column) && !empty($right_column)} +
{$HOOK_RIGHT_COLUMN}
+ {/if}
- - +
- {/if} + {/if} diff --git a/themes/default/header.tpl b/themes/default/header.tpl index 1a2712f58..b5f925139 100644 --- a/themes/default/header.tpl +++ b/themes/default/header.tpl @@ -64,7 +64,6 @@ {/if} {$HOOK_HEADER} - {if !$content_only} {if isset($restricted_country_mode) && $restricted_country_mode} @@ -73,7 +72,6 @@
{/if}
-