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

[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766

Browse Source
This commit is contained in:
gRoussac
2013-11-27 15:42:11 +01:00
parent 8f51fee67a
commit dd99d13dc4
6 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/footer.tpl
+1 -2
View File
@@ -25,8 +25,7 @@
{if !$content_only} {if !$content_only}
</div> </div>
{if isset($HOOK_RIGHT_COLUMN) && (str_replace(" ","",$HOOK_RIGHT_COLUMN)) !=''}{assign var='RightColumn' value=3}{/if} {if isset($right_column) && !empty($right_column)}
{if isset($RightColumn) && $RightColumn !=0}
<!-- Right --> <!-- Right -->
<div id="right_column" class="col-xs-12 col-sm-3 column"> <div id="right_column" class="col-xs-12 col-sm-3 column">
{$HOOK_RIGHT_COLUMN} {$HOOK_RIGHT_COLUMN}
themes/default-bootstrap/header.tpl
+13 -15
View File
@@ -94,8 +94,7 @@
<script src="{$js_dir}jquery/resonsive_utilites.js"></script> <script src="{$js_dir}jquery/resonsive_utilites.js"></script>
{$HOOK_HEADER} {$HOOK_HEADER}
</head> </head>
<body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if} lang_{$lang_iso}">
<body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if $hide_left_column}hide-left-column {/if} {if $hide_right_column}hide-right-column {/if} {if $content_only} content_only {/if}lang_{$lang_iso}">
{if !$content_only} {if !$content_only}
{if isset($restricted_country_mode) && $restricted_country_mode} {if isset($restricted_country_mode) && $restricted_country_mode}
<div id="restricted-country"> <div id="restricted-country">
@@ -209,16 +208,15 @@
{include file="$tpl_dir./breadcrumb.tpl"} {include file="$tpl_dir./breadcrumb.tpl"}
{/if} {/if}
<div class="row"> <div class="row">
{assign var='LeftColumn' value=0} {assign var='left_column' value=0}{assign var='right_column' value=0}
{assign var='RightColumn' value=0} {if isset($HOOK_LEFT_COLUMN) && $HOOK_LEFT_COLUMN|trim && !$hide_left_column}{$left_column = 3}{/if}
{if isset($HOOK_LEFT_COLUMN) && (str_replace(" ","",$HOOK_LEFT_COLUMN)) !=''}{assign var='LeftColumn' value=3}{/if} {if isset($HOOK_RIGHT_COLUMN) && $HOOK_RIGHT_COLUMN|trim && !$hide_right_column}{$right_column = 3}{/if}
{if isset($HOOK_RIGHT_COLUMN) && (str_replace(" ","",$HOOK_RIGHT_COLUMN)) !=''}{assign var='RightColumn' value=3}{/if} {if isset($left_column) && !empty($left_column)}
<!-- Left --> <!-- Left -->
{if isset($LeftColumn) && $LeftColumn !=0} <div id="left_column" class="column col-xs-12 col-sm-3">
<div id="left_column" class="column col-xs-12 col-sm-3"> {$HOOK_LEFT_COLUMN}
{$HOOK_LEFT_COLUMN} </div>
</div> {/if}
{/if} <!-- Center -->
<!-- Center --> <div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column - $right_column}">
<div id="center_column" class="center_column col-xs-12 col-sm-{12 - $LeftColumn - $RightColumn}"> {/if}
{/if}
themes/default/css/global.css
+2 -2
View File
@@ -85,8 +85,8 @@ h3 {
font-size:14px font-size:14px
} }
.hide-left-column #left_column {display:none} .hide-left-column #left_column, .hide-right-column #right_column {display:none}
.hide-left-column #center_column {width:757px} .hide-left-column #center_column, .hide-right-column #center_column {width:757px}
/* text **************************************************************************************** */ /* text **************************************************************************************** */
p {padding-bottom:20px} p {padding-bottom:20px}
themes/default/footer.tpl
+5 -5
View File
@@ -25,14 +25,14 @@
{if !$content_only} {if !$content_only}
</div> </div>
{if isset($right_column) && !empty($right_column)}
<!-- Right --> <!-- Right -->
<div id="right_column" class="column grid_2 omega"> <div id="right_column" class="column grid_2 omega">
{$HOOK_RIGHT_COLUMN} {$HOOK_RIGHT_COLUMN}
</div> </div>
{/if}
</div> </div>
<!-- Footer -->
<!-- Footer -->
<div id="footer" class="grid_9 alpha omega clearfix"> <div id="footer" class="grid_9 alpha omega clearfix">
{$HOOK_FOOTER} {$HOOK_FOOTER}
{if $PS_ALLOW_MOBILE_DEVICE} {if $PS_ALLOW_MOBILE_DEVICE}
@@ -40,6 +40,6 @@
{/if} {/if}
</div> </div>
</div> </div>
{/if} {/if}
</body> </body>
</html> </html>
themes/default/header.tpl
+6 -5
View File
@@ -64,7 +64,6 @@
{/if} {/if}
{$HOOK_HEADER} {$HOOK_HEADER}
</head> </head>
<body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if}"> <body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if}">
{if !$content_only} {if !$content_only}
{if isset($restricted_country_mode) && $restricted_country_mode} {if isset($restricted_country_mode) && $restricted_country_mode}
@@ -73,7 +72,6 @@
</div> </div>
{/if} {/if}
<div id="page" class="container_9 clearfix"> <div id="page" class="container_9 clearfix">
<!-- Header --> <!-- Header -->
<div id="header" class="grid_9 alpha omega"> <div id="header" class="grid_9 alpha omega">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}"> <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
@@ -83,13 +81,16 @@
{$HOOK_TOP} {$HOOK_TOP}
</div> </div>
</div> </div>
{assign var='left_column' value=false}{assign var='right_column' value=false}
{if isset($HOOK_LEFT_COLUMN) && $HOOK_LEFT_COLUMN|trim && !$hide_left_column}{$left_column = true}{/if}
{if isset($HOOK_RIGHT_COLUMN) && $HOOK_RIGHT_COLUMN|trim && !$hide_right_column}{$right_column = true}{/if}
<div id="columns" class="grid_9 alpha omega clearfix"> <div id="columns" class="grid_9 alpha omega clearfix">
{if isset($left_column) && !empty($left_column)}
<!-- Left --> <!-- Left -->
<div id="left_column" class="column grid_2 alpha"> <div id="left_column" class="column grid_2 alpha">
{$HOOK_LEFT_COLUMN} {$HOOK_LEFT_COLUMN}
</div> </div>
{/if}
<!-- Center --> <!-- Center -->
<div id="center_column" class=" grid_5"> <div id="center_column" class=" grid_5">
{/if} {/if}
themes/default/shopping-cart.tpl
-3
View File
@@ -392,9 +392,6 @@
{foreach from=$formattedAddresses key=k item=address} {foreach from=$formattedAddresses key=k item=address}
<ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if}"> <ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if}">
<li class="address_title">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)}&nbsp;<span class="address_alias">({$address.object.alias})</span>{/if}</li> <li class="address_title">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)}&nbsp;<span class="address_alias">({$address.object.alias})</span>{/if}</li>
{foreach $address.ordered as $pattern}
{assign var=addressKey value=" "|explode:$pattern}
<li>
{foreach $address.ordered as $pattern} {foreach $address.ordered as $pattern}
{assign var=addressKey value=" "|explode:$pattern} {assign var=addressKey value=" "|explode:$pattern}
{assign var=addedli value=false} {assign var=addedli value=false}