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

// update code on footer and header

Browse Source
This commit is contained in:
sLorenzini
2013-12-04 15:17:35 +01:00
parent f6fed64472
commit c127f9765a
2 changed files with 172 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/footer.tpl
+12 -12
View File
@@ -23,16 +23,16 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if !$content_only} {if !$content_only}
</div> </div> <!-- #center_column -->
{if isset($right_column_size) && !empty($right_column_size)} {if isset($right_column_size) && !empty($right_column_size)}
<!-- 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}
</div> </div>
{/if} {/if}
</div> </div> <!-- .row -->
</div> </div> <!-- #columns -->
</div> </div> <!-- .columns-container -->
<!-- Footer --> <!-- Footer -->
<div class="footer-container"> <div class="footer-container">
<div class="container"> <div class="container">
@@ -40,8 +40,8 @@
{$HOOK_FOOTER} {$HOOK_FOOTER}
</footer> </footer>
</div> </div>
</div> </div> <!-- .footer-container -->
</div> </div> <!-- #page -->
{/if} {/if}
</body> </body>
</html> </html>
themes/default-bootstrap/header.tpl
+158 -150
View File
@@ -27,22 +27,37 @@
<!--[if IE 7]><html class="no-js lt-ie9 lt-ie8 ie7" lang="{$lang_iso}"> <![endif]--> <!--[if IE 7]><html class="no-js lt-ie9 lt-ie8 ie7" lang="{$lang_iso}"> <![endif]-->
<!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}"> <![endif]--> <!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}"> <![endif]-->
<!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]--> <!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}"> <html lang="{$lang_iso}">
<head> <head>
<title>{$meta_title|escape:'html':'UTF-8'}</title> <title>{$meta_title|escape:'html':'UTF-8'}</title>
{if isset($meta_description) AND $meta_description} {if isset($meta_description) AND $meta_description}
<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" /> <meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
{/if} {/if}
{if isset($meta_keywords) AND $meta_keywords} {if isset($meta_keywords) AND $meta_keywords}
<meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" /> <meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
{/if} {/if}
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> <meta charset="utf-8" />
<meta http-equiv="content-language" content="{$meta_language}" />
<meta name="generator" content="PrestaShop" /> <meta name="generator" content="PrestaShop" />
<meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" /> <meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" />
<meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<script>
<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<link href="{$css_dir}bootstrap_lib/bootstrap.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}font-awesome.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
<link href="{$css_dir}jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
{if isset($css_files)}
{foreach from=$css_files key=css_uri item=media}
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
{/foreach}
{/if}
<script>
if (navigator.userAgent.match(/Android/i)) { if (navigator.userAgent.match(/Android/i)) {
var viewport = document.querySelector("meta[name=viewport]"); var viewport = document.querySelector("meta[name=viewport]");
viewport.setAttribute('content', 'initial-scale=1.0,maximum-scale=1.0,user-scalable=0,width=device-width,height=device-height'); viewport.setAttribute('content', 'initial-scale=1.0,maximum-scale=1.0,user-scalable=0,width=device-width,height=device-height');
@@ -51,8 +66,6 @@
window.scrollTo(0,1); window.scrollTo(0,1);
} }
</script> </script>
<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<script type="text/javascript"> <script type="text/javascript">
var baseDir = '{$content_dir|addslashes}'; var baseDir = '{$content_dir|addslashes}';
var baseUri = '{$base_uri|addslashes}'; var baseUri = '{$base_uri|addslashes}';
@@ -63,35 +76,23 @@
var roundMode = {$roundMode}; var roundMode = {$roundMode};
var isUserLogged = {if $logged}true{else}false{/if}; var isUserLogged = {if $logged}true{else}false{/if};
</script> </script>
<link href="{$css_dir}bootstrap_lib/bootstrap.css" rel="stylesheet" type="text/css" media="all" /> {if isset($js_files)}
<link href="{$css_dir}font-awesome.css" rel="stylesheet" type="text/css" media="all" /> {foreach from=$js_files item=js_uri}
<link href="{$css_dir}jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" /> <script type="text/javascript" src="{$js_uri}"></script>
<link href="{$css_dir}highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" /> {/foreach}
<link href="{$css_dir}jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" /> {/if}
<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" /> <script src="{$js_dir}tools/bootstrap.min.js"></script>
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' /> <!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
{if isset($css_files)} <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
{foreach from=$css_files key=css_uri item=media} <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" /> <![endif]-->
{/foreach} <script src="{$js_dir}tools/jquery.total-storage.min.js"></script>
{/if} <script src="{$js_dir}jquery/jquery.uniform-modify.js"></script>
{if isset($js_files)} <script src="{$js_dir}jquery/highdpi.js"></script>
{foreach from=$js_files item=js_uri} <script src="{$js_dir}jquery/jquery.bxslider.js"></script>
<script type="text/javascript" src="{$js_uri}"></script> <script src="{$js_dir}jquery/footable.js"></script>
{/foreach} <script src="{$js_dir}jquery/footable.sort.js"></script>
{/if} <script src="{$js_dir}jquery/resonsive_utilites.js"></script>
<script src="{$js_dir}tools/bootstrap.min.js"></script>
<!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<script src="{$js_dir}tools/jquery.total-storage.min.js"></script>
<script src="{$js_dir}jquery/jquery.uniform-modify.js"></script>
<script src="{$js_dir}jquery/highdpi.js"></script>
<script src="{$js_dir}jquery/jquery.bxslider.js"></script>
<script src="{$js_dir}jquery/footable.js"></script>
<script src="{$js_dir}jquery/footable.sort.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 isset($body_classes) && $body_classes|@count} {implode value=$body_classes separator=' '}{/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 isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if isset($body_classes) && $body_classes|@count} {implode value=$body_classes separator=' '}{/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}">
@@ -103,117 +104,124 @@
{/if} {/if}
<div id="page"> <div id="page">
<!-- Header --> <!-- Header -->
<div class="header-container"> <div class="header-container">
<header id="header"> <header id="header">
<div class="header-row"> <div class="header-row">
<div class="container clearfix"> <nav class="container clearfix">
<!-- User info -->
<div id="header_user_info">
{if $logged}
<a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a>
{else}
<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a>
{/if}
</div>
<!-- /User info -->
<!-- languages -->
{if count($languages) > 1}
<div id="languages-block-top">
<div id="countries">
{foreach from=$languages key=k item=language name="languages"}
{if $language.iso_code == $lang_iso}
<div class="current">
<span>{$language.name}</span>
</div>
{/if}
{/foreach}
<ul id="first-languages" class="countries_ul toogle_content">
{foreach from=$languages key=k item=language name="languages"}
<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
{if $language.iso_code != $lang_iso}
{assign var=indice_lang value=$language.id_lang}
{if isset($lang_rewrite_urls.$indice_lang)}
<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
{else}
<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
{/if} <div id="header_user_info">
{/if} {if $logged}
<span>{$language.name}</span> <a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a>
{if $language.iso_code != $lang_iso} {else}
</a> <a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a>
{/if} {/if}
</li> </div> <!-- #header_user_info -->
{/foreach}
</ul> {if count($languages) > 1}
</div> <div id="languages-block-top">
</div> <div id="countries">
<script type="text/javascript"> {foreach from=$languages key=k item=language name="languages"}
$(document).ready(function(){ {if $language.iso_code == $lang_iso}
$('#countries .current span, #countries .countries_ul li span').each(function() { <div class="current">
var h = $(this).html(); <span>{$language.name}</span>
var index = h.indexOf(' '); </div>
if(index == -1) { {/if}
index = h.length; {/foreach}
} <ul id="first-languages" class="countries_ul toogle_content">
$(this).html('<span class="firstWord">'+ h.substring(index, h.length) + '</span>' + h.substring(0, index)); {foreach from=$languages key=k item=language name="languages"}
<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
{if $language.iso_code != $lang_iso}
{assign var=indice_lang value=$language.id_lang}
{if isset($lang_rewrite_urls.$indice_lang)}
<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
{else}
<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
{/if}
{/if}
<span>{$language.name}</span>
{if $language.iso_code != $lang_iso}
</a>
{/if}
</li>
{/foreach}
</ul>
</div>
</div> <!-- #languages-block-top -->
<script type="text/javascript">
$(document).ready(function(){
$('#countries .current span, #countries .countries_ul li span').each(function() {
var h = $(this).html();
var index = h.indexOf(' ');
if(index == -1) {
index = h.length;
}
$(this).html('<span class="firstWord">'+ h.substring(index, h.length) + '</span>' + h.substring(0, index));
});
}); });
}); </script>
</script> {/if}
{/if}
<!-- /languages --> {if count($currencies) > 1}
<!-- Currencies --> <div id="currencies-block-top">
{if count($currencies) > 1} <form id="setCurrency" action="{$request_uri}" method="post">
<div id="currencies-block-top"> <div class="current">
<form id="setCurrency" action="{$request_uri}" method="post"> <input type="hidden" name="id_currency" id="id_currency" value=""/>
<div class="current"> <input type="hidden" name="SubmitCurrency" value="" />
<input type="hidden" name="id_currency" id="id_currency" value=""/> <span class="cur-label">{l s='Currency'} :</span>
<input type="hidden" name="SubmitCurrency" value="" /> {foreach from=$currencies key=k item=f_currency}
<span class="cur-label">{l s='Currency'} :</span> {if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
{foreach from=$currencies key=k item=f_currency} {/foreach}
{if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if} </div>
{/foreach} <ul id="first-currencies" class="currencies_ul toogle_content">
</div> {foreach from=$currencies key=k item=f_currency}
<ul id="first-currencies" class="currencies_ul toogle_content"> <li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
{foreach from=$currencies key=k item=f_currency} <a href="javascript:setCurrency({$f_currency.id_currency});" title="{$f_currency.name}" rel="nofollow">{$f_currency.name}</a>
<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}> </li>
<a href="javascript:setCurrency({$f_currency.id_currency});" title="{$f_currency.name}" rel="nofollow">{$f_currency.name}</a> {/foreach}
</li> </ul>
{/foreach} </form>
</ul> </div> <!-- #currencies-block-top -->
</form> {/if}
</div>
{/if} <div id="contact-link">
<!-- /Currencies --> <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
<!--Contact link--> </div> <!-- #contact-link -->
<div id="contact-link">
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a> {if $shop_phone}
</div> <span class="shop-phone">
{if $shop_phone}<span class="shop-phone"><i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong></span>{/if} <i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong>
</div> </span>
</div> {/if}
<div class="container header-row-2">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}"> </nav><!-- .container-row -->
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/> </div> <!-- .header-row -->
</a>
<div id="header_right"> <div class="container header-row-2">
{$HOOK_TOP} <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
</div> <img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
</div> </a>
</header> <div id="header_right">
</div> {$HOOK_TOP}
<div class="columns-container"> </div>
<div id="columns" class="container"> </div> <!-- .header-row-2 -->
{if $page_name !='index' && $page_name !='pagenotfound'}
{include file="$tpl_dir./breadcrumb.tpl"} </header> <!-- #header -->
{/if} </div> <!-- .header-container -->
<div class="row">
<div class="columns-container">
<div id="columns" class="container">
{if $page_name !='index' && $page_name !='pagenotfound'}
{include file="$tpl_dir./breadcrumb.tpl"}
{/if}
<div class="row">
{if isset($left_column_size) && !empty($left_column_size)} {if isset($left_column_size) && !empty($left_column_size)}
<!-- Left --> <!-- Left -->
<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_size - $right_column_size}"> <div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
{/if} {/if}